* Device specific ISA support in AVR
@ 2014-02-25 12:05 S, Pitchumani
0 siblings, 0 replies; only message in thread
From: S, Pitchumani @ 2014-02-25 12:05 UTC (permalink / raw)
To: avr-gcc-list, binutils
[-- Attachment #1: Type: text/plain, Size: 2557 bytes --]
Hi,
Few AVR Xmega devices have specific instruction support than the architecture
it belongs to. For example atxmega128b1 device has RMW instructions (XCH,LAC,
LAS and LAT) support, but not all avrxmega6 devices have.
Now, avr-gcc passes architecture name to assembler instead of device name. So,
RMW instructions are not recognized (illegal opcode error) by assembler.
To address this issue, we could add device specific ISA to device details
in GCC. Driver can pass additional option based on specific ISA that a device
has. Assembler can add device specific ISA to architecture ISA based on the
option it receives.
I have attached patches for avr-gcc and avr-as to address this issue.
device-specific-isa-avr-gcc.patch:
* Device specific ISA information is added to device details.
* avr-gcc passes -mrmw option to assembler if the selected device
has RMW instruction support.
device-specific-isa-avr-as.patch:
* Add option -mrmw.
* Add AVR_ISA_RMW to current architecture ISA if -mrmw option specified.
Please review the patches and comment.
Thanks,
Pitchumani
gcc/ChangeLog
2014-02-25 Pitchumani Sivanupandi <pitchumani.s@atmel.com>
* config/avr/avr-arch.h: Add avr_additional_isa enum to have device
specific ISA information.
(avr_mcu_t): Add additional_isa field for device specific ISA.
* config/avr/avr-devices.c (avr_mcu_types): Update AVR_MCU macro to
include additional isa field.
* config/avr/avr-mcus.def: Update device details with corresponding
additional isa info.
* config/avr/driver-avr.c (avr_device_to_as): Pass -mrmw option to
assembler if RMW isa supported by current device.
* config/avr/genmultilib.awk: Update as device info structure changed.
gcc/testsuite/ChangeLog
2014-02-25 Pitchumani Sivanupandi <pitchumani.s@atmel.com>
* gcc.target/avr/additional-isa.c: New test.
gas/ChangeLog
2014-02-25 Pitchumani Sivanupandi <pitchumani.s@atmel.com>
* config/tc-avr.c: Add specified_mcu variable for selected mcu.
(enum options): add OPTION_RMW_ISA for -mrmw option.
(struct option md_longopts): Add mrmw option.
(md_show_usage): add -mrmw option description.
(md_parse_option): Update isa details if -mrmw option specified.
* doc/c-avr.texi: Add doc for new option -mrmw.
gas/testsuite/ChangeLog
2014-02-25 Pitchumani Sivanupandi <pitchumani.s@atmel.com>
* gas/avr/avr.exp: Run new tests.
* gas/avr/rmw.d: Add test for additional ISA support.
* gas/avr/rmw.s: Ditto.
[-- Attachment #2: device-specific-isa-avr-gcc.patch --]
[-- Type: application/octet-stream, Size: 57257 bytes --]
diff --git a/gcc/config/avr/avr-arch.h b/gcc/config/avr/avr-arch.h
index 6357e99..8932798 100644
--- a/gcc/config/avr/avr-arch.h
+++ b/gcc/config/avr/avr-arch.h
@@ -42,6 +42,12 @@ enum avr_arch
ARCH_AVRXMEGA7
};
+/* Additional ISA specific to few devices. */
+enum avr_additional_isa
+{
+ ADD_ISA_NONE,
+ ADD_RMW_ISA = 0x1 /* device has RMW instructions XCH,LAC,LAS,LAT */
+};
/* Architecture-specific properties. */
@@ -100,6 +106,9 @@ typedef struct
/* Index in avr_arch_types[]. */
enum avr_arch arch;
+ /* additional isa */
+ int additional_isa;
+
/* Must lie outside user's namespace. NULL == no macro. */
const char *const macro;
diff --git a/gcc/config/avr/avr-devices.c b/gcc/config/avr/avr-devices.c
index 177f196..4ce4af3 100644
--- a/gcc/config/avr/avr-devices.c
+++ b/gcc/config/avr/avr-devices.c
@@ -104,11 +104,11 @@ avr_texinfo[] =
const avr_mcu_t
avr_mcu_types[] =
{
-#define AVR_MCU(NAME, ARCH, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME)\
- { NAME, ARCH, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME },
+#define AVR_MCU(NAME, ARCH, ADD_ISA, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME)\
+ { NAME, ARCH, ADD_ISA, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME },
#include "avr-mcus.def"
#undef AVR_MCU
/* End of list. */
- { NULL, ARCH_UNKNOWN, NULL, 0, 0, 0, 0, NULL }
+ { NULL, ARCH_UNKNOWN, ADD_ISA_NONE, NULL, 0, 0, 0, 0, NULL }
};
diff --git a/gcc/config/avr/avr-mcus.def b/gcc/config/avr/avr-mcus.def
index affd9f3..0a2b82c 100644
--- a/gcc/config/avr/avr-mcus.def
+++ b/gcc/config/avr/avr-mcus.def
@@ -42,6 +42,8 @@
ARCH Specifies the multilib variant together with SHORT_SP
+ ADD_ISA Specifies the additional ISA available
+
MACRO If NULL, this is a core and not a device. If non-NULL,
supply respective built-in macro.
@@ -60,265 +62,265 @@
"avr2" must be first for the "0" default to work as intended. */
/* Classic, <= 8K. */
-AVR_MCU ("avr2", ARCH_AVR2, NULL, 0, 1, 0x0060, 6, "s8515")
-AVR_MCU ("at90s2313", ARCH_AVR2, "__AVR_AT90S2313__", 1, 0, 0x0060, 1, "s2313")
-AVR_MCU ("at90s2323", ARCH_AVR2, "__AVR_AT90S2323__", 1, 0, 0x0060, 1, "s2323")
-AVR_MCU ("at90s2333", ARCH_AVR2, "__AVR_AT90S2333__", 1, 0, 0x0060, 1, "s2333")
-AVR_MCU ("at90s2343", ARCH_AVR2, "__AVR_AT90S2343__", 1, 0, 0x0060, 1, "s2343")
-AVR_MCU ("attiny22", ARCH_AVR2, "__AVR_ATtiny22__", 1, 0, 0x0060, 1, "tn22")
-AVR_MCU ("attiny26", ARCH_AVR2, "__AVR_ATtiny26__", 1, 0, 0x0060, 1, "tn26")
-AVR_MCU ("at90s4414", ARCH_AVR2, "__AVR_AT90S4414__", 0, 0, 0x0060, 1, "s4414")
-AVR_MCU ("at90s4433", ARCH_AVR2, "__AVR_AT90S4433__", 1, 0, 0x0060, 1, "s4433")
-AVR_MCU ("at90s4434", ARCH_AVR2, "__AVR_AT90S4434__", 0, 0, 0x0060, 1, "s4434")
-AVR_MCU ("at90s8515", ARCH_AVR2, "__AVR_AT90S8515__", 0, 1, 0x0060, 1, "s8515")
-AVR_MCU ("at90c8534", ARCH_AVR2, "__AVR_AT90C8534__", 0, 0, 0x0060, 1, "c8534")
-AVR_MCU ("at90s8535", ARCH_AVR2, "__AVR_AT90S8535__", 0, 0, 0x0060, 1, "s8535")
+AVR_MCU ("avr2", ARCH_AVR2, ADD_ISA_NONE, NULL, 0, 1, 0x0060, 6, "s8515")
+AVR_MCU ("at90s2313", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S2313__", 1, 0, 0x0060, 1, "s2313")
+AVR_MCU ("at90s2323", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S2323__", 1, 0, 0x0060, 1, "s2323")
+AVR_MCU ("at90s2333", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S2333__", 1, 0, 0x0060, 1, "s2333")
+AVR_MCU ("at90s2343", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S2343__", 1, 0, 0x0060, 1, "s2343")
+AVR_MCU ("attiny22", ARCH_AVR2, ADD_ISA_NONE, "__AVR_ATtiny22__", 1, 0, 0x0060, 1, "tn22")
+AVR_MCU ("attiny26", ARCH_AVR2, ADD_ISA_NONE, "__AVR_ATtiny26__", 1, 0, 0x0060, 1, "tn26")
+AVR_MCU ("at90s4414", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S4414__", 0, 0, 0x0060, 1, "s4414")
+AVR_MCU ("at90s4433", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S4433__", 1, 0, 0x0060, 1, "s4433")
+AVR_MCU ("at90s4434", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S4434__", 0, 0, 0x0060, 1, "s4434")
+AVR_MCU ("at90s8515", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S8515__", 0, 1, 0x0060, 1, "s8515")
+AVR_MCU ("at90c8534", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90C8534__", 0, 0, 0x0060, 1, "c8534")
+AVR_MCU ("at90s8535", ARCH_AVR2, ADD_ISA_NONE, "__AVR_AT90S8535__", 0, 0, 0x0060, 1, "s8535")
/* Classic + MOVW, <= 8K. */
-AVR_MCU ("avr25", ARCH_AVR25, NULL, 0, 0, 0x0060, 1, "tn85")
-AVR_MCU ("ata6289", ARCH_AVR25, "__AVR_ATA6289__", 0, 0, 0x0100, 1, "a6289")
-AVR_MCU ("ata5272", ARCH_AVR25, "__AVR_ATA5272__", 0, 0, 0x0100, 1, "a5272")
-AVR_MCU ("attiny13", ARCH_AVR25, "__AVR_ATtiny13__", 1, 0, 0x0060, 1, "tn13")
-AVR_MCU ("attiny13a", ARCH_AVR25, "__AVR_ATtiny13A__", 1, 0, 0x0060, 1, "tn13a")
-AVR_MCU ("attiny2313", ARCH_AVR25, "__AVR_ATtiny2313__", 1, 0, 0x0060, 1, "tn2313")
-AVR_MCU ("attiny2313a", ARCH_AVR25, "__AVR_ATtiny2313A__", 1, 0, 0x0060, 1, "tn2313a")
-AVR_MCU ("attiny24", ARCH_AVR25, "__AVR_ATtiny24__", 1, 0, 0x0060, 1, "tn24")
-AVR_MCU ("attiny24a", ARCH_AVR25, "__AVR_ATtiny24A__", 1, 0, 0x0060, 1, "tn24a")
-AVR_MCU ("attiny4313", ARCH_AVR25, "__AVR_ATtiny4313__", 0, 0, 0x0060, 1, "tn4313")
-AVR_MCU ("attiny44", ARCH_AVR25, "__AVR_ATtiny44__", 0, 0, 0x0060, 1, "tn44")
-AVR_MCU ("attiny44a", ARCH_AVR25, "__AVR_ATtiny44A__", 0, 0, 0x0060, 1, "tn44a")
-AVR_MCU ("attiny84", ARCH_AVR25, "__AVR_ATtiny84__", 0, 0, 0x0060, 1, "tn84")
-AVR_MCU ("attiny84a", ARCH_AVR25, "__AVR_ATtiny84A__", 0, 0, 0x0060, 1, "tn84")
-AVR_MCU ("attiny25", ARCH_AVR25, "__AVR_ATtiny25__", 1, 0, 0x0060, 1, "tn25")
-AVR_MCU ("attiny45", ARCH_AVR25, "__AVR_ATtiny45__", 0, 0, 0x0060, 1, "tn45")
-AVR_MCU ("attiny85", ARCH_AVR25, "__AVR_ATtiny85__", 0, 0, 0x0060, 1, "tn85")
-AVR_MCU ("attiny261", ARCH_AVR25, "__AVR_ATtiny261__", 1, 0, 0x0060, 1, "tn261")
-AVR_MCU ("attiny261a", ARCH_AVR25, "__AVR_ATtiny261A__", 1, 0, 0x0060, 1, "tn261a")
-AVR_MCU ("attiny461", ARCH_AVR25, "__AVR_ATtiny461__", 0, 0, 0x0060, 1, "tn461")
-AVR_MCU ("attiny461a", ARCH_AVR25, "__AVR_ATtiny461A__", 0, 0, 0x0060, 1, "tn461a")
-AVR_MCU ("attiny861", ARCH_AVR25, "__AVR_ATtiny861__", 0, 0, 0x0060, 1, "tn861")
-AVR_MCU ("attiny861a", ARCH_AVR25, "__AVR_ATtiny861A__", 0, 0, 0x0060, 1, "tn861a")
-AVR_MCU ("attiny43u", ARCH_AVR25, "__AVR_ATtiny43U__", 0, 0, 0x0060, 1, "tn43u")
-AVR_MCU ("attiny87", ARCH_AVR25, "__AVR_ATtiny87__", 0, 0, 0x0100, 1, "tn87")
-AVR_MCU ("attiny48", ARCH_AVR25, "__AVR_ATtiny48__", 0, 0, 0x0100, 1, "tn48")
-AVR_MCU ("attiny88", ARCH_AVR25, "__AVR_ATtiny88__", 0, 0, 0x0100, 1, "tn88")
-AVR_MCU ("at86rf401", ARCH_AVR25, "__AVR_AT86RF401__", 0, 0, 0x0060, 1, "86401")
+AVR_MCU ("avr25", ARCH_AVR25, ADD_ISA_NONE, NULL, 0, 0, 0x0060, 1, "tn85")
+AVR_MCU ("ata6289", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATA6289__", 0, 0, 0x0100, 1, "a6289")
+AVR_MCU ("ata5272", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATA5272__", 0, 0, 0x0100, 1, "a5272")
+AVR_MCU ("attiny13", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny13__", 1, 0, 0x0060, 1, "tn13")
+AVR_MCU ("attiny13a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny13A__", 1, 0, 0x0060, 1, "tn13a")
+AVR_MCU ("attiny2313", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny2313__", 1, 0, 0x0060, 1, "tn2313")
+AVR_MCU ("attiny2313a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny2313A__", 1, 0, 0x0060, 1, "tn2313a")
+AVR_MCU ("attiny24", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny24__", 1, 0, 0x0060, 1, "tn24")
+AVR_MCU ("attiny24a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny24A__", 1, 0, 0x0060, 1, "tn24a")
+AVR_MCU ("attiny4313", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny4313__", 0, 0, 0x0060, 1, "tn4313")
+AVR_MCU ("attiny44", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny44__", 0, 0, 0x0060, 1, "tn44")
+AVR_MCU ("attiny44a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny44A__", 0, 0, 0x0060, 1, "tn44a")
+AVR_MCU ("attiny84", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny84__", 0, 0, 0x0060, 1, "tn84")
+AVR_MCU ("attiny84a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny84A__", 0, 0, 0x0060, 1, "tn84")
+AVR_MCU ("attiny25", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny25__", 1, 0, 0x0060, 1, "tn25")
+AVR_MCU ("attiny45", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny45__", 0, 0, 0x0060, 1, "tn45")
+AVR_MCU ("attiny85", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny85__", 0, 0, 0x0060, 1, "tn85")
+AVR_MCU ("attiny261", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny261__", 1, 0, 0x0060, 1, "tn261")
+AVR_MCU ("attiny261a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny261A__", 1, 0, 0x0060, 1, "tn261a")
+AVR_MCU ("attiny461", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny461__", 0, 0, 0x0060, 1, "tn461")
+AVR_MCU ("attiny461a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny461A__", 0, 0, 0x0060, 1, "tn461a")
+AVR_MCU ("attiny861", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny861__", 0, 0, 0x0060, 1, "tn861")
+AVR_MCU ("attiny861a", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny861A__", 0, 0, 0x0060, 1, "tn861a")
+AVR_MCU ("attiny43u", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny43U__", 0, 0, 0x0060, 1, "tn43u")
+AVR_MCU ("attiny87", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny87__", 0, 0, 0x0100, 1, "tn87")
+AVR_MCU ("attiny48", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny48__", 0, 0, 0x0100, 1, "tn48")
+AVR_MCU ("attiny88", ARCH_AVR25, ADD_ISA_NONE, "__AVR_ATtiny88__", 0, 0, 0x0100, 1, "tn88")
+AVR_MCU ("at86rf401", ARCH_AVR25, ADD_ISA_NONE, "__AVR_AT86RF401__", 0, 0, 0x0060, 1, "86401")
/* Classic, > 8K, <= 64K. */
-AVR_MCU ("avr3", ARCH_AVR3, NULL, 0, 0, 0x0060, 1, "43355")
-AVR_MCU ("at43usb355", ARCH_AVR3, "__AVR_AT43USB355__", 0, 0, 0x0060, 1, "43355")
-AVR_MCU ("at76c711", ARCH_AVR3, "__AVR_AT76C711__", 0, 0, 0x0060, 1, "76711")
+AVR_MCU ("avr3", ARCH_AVR3, ADD_ISA_NONE, NULL, 0, 0, 0x0060, 1, "43355")
+AVR_MCU ("at43usb355", ARCH_AVR3, ADD_ISA_NONE, "__AVR_AT43USB355__", 0, 0, 0x0060, 1, "43355")
+AVR_MCU ("at76c711", ARCH_AVR3, ADD_ISA_NONE, "__AVR_AT76C711__", 0, 0, 0x0060, 1, "76711")
/* Classic, == 128K. */
-AVR_MCU ("avr31", ARCH_AVR31, NULL, 0, 1, 0x0060, 2, "m103")
-AVR_MCU ("atmega103", ARCH_AVR31, "__AVR_ATmega103__", 0, 1, 0x0060, 2, "m103")
-AVR_MCU ("at43usb320", ARCH_AVR31, "__AVR_AT43USB320__", 0, 0, 0x0060, 2, "43320")
+AVR_MCU ("avr31", ARCH_AVR31, ADD_ISA_NONE, NULL, 0, 1, 0x0060, 2, "m103")
+AVR_MCU ("atmega103", ARCH_AVR31, ADD_ISA_NONE, "__AVR_ATmega103__", 0, 1, 0x0060, 2, "m103")
+AVR_MCU ("at43usb320", ARCH_AVR31, ADD_ISA_NONE, "__AVR_AT43USB320__", 0, 0, 0x0060, 2, "43320")
/* Classic + MOVW + JMP/CALL. */
-AVR_MCU ("avr35", ARCH_AVR35, NULL, 0, 0, 0x0100, 1, "usb162")
-AVR_MCU ("ata5505", ARCH_AVR35, "__AVR_ATA5505__", 0, 0, 0x0100, 1, "a5505")
-AVR_MCU ("at90usb82", ARCH_AVR35, "__AVR_AT90USB82__", 0, 0, 0x0100, 1, "usb82")
-AVR_MCU ("at90usb162", ARCH_AVR35, "__AVR_AT90USB162__", 0, 0, 0x0100, 1, "usb162")
-AVR_MCU ("atmega8u2", ARCH_AVR35, "__AVR_ATmega8U2__", 0, 0, 0x0100, 1, "m8u2")
-AVR_MCU ("atmega16u2", ARCH_AVR35, "__AVR_ATmega16U2__", 0, 0, 0x0100, 1, "m16u2")
-AVR_MCU ("atmega32u2", ARCH_AVR35, "__AVR_ATmega32U2__", 0, 0, 0x0100, 1, "m32u2")
-AVR_MCU ("attiny167", ARCH_AVR35, "__AVR_ATtiny167__", 0, 0, 0x0100, 1, "tn167")
-AVR_MCU ("attiny1634", ARCH_AVR35, "__AVR_ATtiny1634__", 0, 0, 0x0100, 1, "tn1634")
+AVR_MCU ("avr35", ARCH_AVR35, ADD_ISA_NONE, NULL, 0, 0, 0x0100, 1, "usb162")
+AVR_MCU ("ata5505", ARCH_AVR35, ADD_ISA_NONE, "__AVR_ATA5505__", 0, 0, 0x0100, 1, "a5505")
+AVR_MCU ("at90usb82", ARCH_AVR35, ADD_ISA_NONE, "__AVR_AT90USB82__", 0, 0, 0x0100, 1, "usb82")
+AVR_MCU ("at90usb162", ARCH_AVR35, ADD_ISA_NONE, "__AVR_AT90USB162__", 0, 0, 0x0100, 1, "usb162")
+AVR_MCU ("atmega8u2", ARCH_AVR35, ADD_ISA_NONE, "__AVR_ATmega8U2__", 0, 0, 0x0100, 1, "m8u2")
+AVR_MCU ("atmega16u2", ARCH_AVR35, ADD_ISA_NONE, "__AVR_ATmega16U2__", 0, 0, 0x0100, 1, "m16u2")
+AVR_MCU ("atmega32u2", ARCH_AVR35, ADD_ISA_NONE, "__AVR_ATmega32U2__", 0, 0, 0x0100, 1, "m32u2")
+AVR_MCU ("attiny167", ARCH_AVR35, ADD_ISA_NONE, "__AVR_ATtiny167__", 0, 0, 0x0100, 1, "tn167")
+AVR_MCU ("attiny1634", ARCH_AVR35, ADD_ISA_NONE, "__AVR_ATtiny1634__", 0, 0, 0x0100, 1, "tn1634")
/* Enhanced, <= 8K. */
-AVR_MCU ("avr4", ARCH_AVR4, NULL, 0, 0, 0x0060, 1, "m8")
-AVR_MCU ("ata6285", ARCH_AVR4, "__AVR_ATA6285__", 0, 0, 0x0100, 1, "a6285")
-AVR_MCU ("ata6286", ARCH_AVR4, "__AVR_ATA6286__", 0, 0, 0x0100, 1, "a6286")
-AVR_MCU ("atmega8", ARCH_AVR4, "__AVR_ATmega8__", 0, 0, 0x0060, 1, "m8")
-AVR_MCU ("atmega8a", ARCH_AVR4, "__AVR_ATmega8A__", 0, 0, 0x0060, 1, "m8a")
-AVR_MCU ("atmega48", ARCH_AVR4, "__AVR_ATmega48__", 0, 0, 0x0100, 1, "m48")
-AVR_MCU ("atmega48a", ARCH_AVR4, "__AVR_ATmega48A__", 0, 0, 0x0100, 1, "m48a")
-AVR_MCU ("atmega48p", ARCH_AVR4, "__AVR_ATmega48P__", 0, 0, 0x0100, 1, "m48p")
-AVR_MCU ("atmega48pa", ARCH_AVR4, "__AVR_ATmega48PA__", 0, 0, 0x0100, 1, "m48pa")
-AVR_MCU ("atmega88", ARCH_AVR4, "__AVR_ATmega88__", 0, 0, 0x0100, 1, "m88")
-AVR_MCU ("atmega88a", ARCH_AVR4, "__AVR_ATmega88A__", 0, 0, 0x0100, 1, "m88a")
-AVR_MCU ("atmega88p", ARCH_AVR4, "__AVR_ATmega88P__", 0, 0, 0x0100, 1, "m88p")
-AVR_MCU ("atmega88pa", ARCH_AVR4, "__AVR_ATmega88PA__", 0, 0, 0x0100, 1, "m88pa")
-AVR_MCU ("atmega8515", ARCH_AVR4, "__AVR_ATmega8515__", 0, 0, 0x0060, 1, "m8515")
-AVR_MCU ("atmega8535", ARCH_AVR4, "__AVR_ATmega8535__", 0, 0, 0x0060, 1, "m8535")
-AVR_MCU ("atmega8hva", ARCH_AVR4, "__AVR_ATmega8HVA__", 0, 0, 0x0100, 1, "m8hva")
-AVR_MCU ("at90pwm1", ARCH_AVR4, "__AVR_AT90PWM1__", 0, 0, 0x0100, 1, "90pwm1")
-AVR_MCU ("at90pwm2", ARCH_AVR4, "__AVR_AT90PWM2__", 0, 0, 0x0100, 1, "90pwm2")
-AVR_MCU ("at90pwm2b", ARCH_AVR4, "__AVR_AT90PWM2B__", 0, 0, 0x0100, 1, "90pwm2b")
-AVR_MCU ("at90pwm3", ARCH_AVR4, "__AVR_AT90PWM3__", 0, 0, 0x0100, 1, "90pwm3")
-AVR_MCU ("at90pwm3b", ARCH_AVR4, "__AVR_AT90PWM3B__", 0, 0, 0x0100, 1, "90pwm3b")
-AVR_MCU ("at90pwm81", ARCH_AVR4, "__AVR_AT90PWM81__", 0, 0, 0x0100, 1, "90pwm81")
+AVR_MCU ("avr4", ARCH_AVR4, ADD_ISA_NONE, NULL, 0, 0, 0x0060, 1, "m8")
+AVR_MCU ("ata6285", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATA6285__", 0, 0, 0x0100, 1, "a6285")
+AVR_MCU ("ata6286", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATA6286__", 0, 0, 0x0100, 1, "a6286")
+AVR_MCU ("atmega8", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega8__", 0, 0, 0x0060, 1, "m8")
+AVR_MCU ("atmega8a", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega8A__", 0, 0, 0x0060, 1, "m8a")
+AVR_MCU ("atmega48", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega48__", 0, 0, 0x0100, 1, "m48")
+AVR_MCU ("atmega48a", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega48A__", 0, 0, 0x0100, 1, "m48a")
+AVR_MCU ("atmega48p", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega48P__", 0, 0, 0x0100, 1, "m48p")
+AVR_MCU ("atmega48pa", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega48PA__", 0, 0, 0x0100, 1, "m48pa")
+AVR_MCU ("atmega88", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega88__", 0, 0, 0x0100, 1, "m88")
+AVR_MCU ("atmega88a", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega88A__", 0, 0, 0x0100, 1, "m88a")
+AVR_MCU ("atmega88p", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega88P__", 0, 0, 0x0100, 1, "m88p")
+AVR_MCU ("atmega88pa", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega88PA__", 0, 0, 0x0100, 1, "m88pa")
+AVR_MCU ("atmega8515", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega8515__", 0, 0, 0x0060, 1, "m8515")
+AVR_MCU ("atmega8535", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega8535__", 0, 0, 0x0060, 1, "m8535")
+AVR_MCU ("atmega8hva", ARCH_AVR4, ADD_ISA_NONE, "__AVR_ATmega8HVA__", 0, 0, 0x0100, 1, "m8hva")
+AVR_MCU ("at90pwm1", ARCH_AVR4, ADD_ISA_NONE, "__AVR_AT90PWM1__", 0, 0, 0x0100, 1, "90pwm1")
+AVR_MCU ("at90pwm2", ARCH_AVR4, ADD_ISA_NONE, "__AVR_AT90PWM2__", 0, 0, 0x0100, 1, "90pwm2")
+AVR_MCU ("at90pwm2b", ARCH_AVR4, ADD_ISA_NONE, "__AVR_AT90PWM2B__", 0, 0, 0x0100, 1, "90pwm2b")
+AVR_MCU ("at90pwm3", ARCH_AVR4, ADD_ISA_NONE, "__AVR_AT90PWM3__", 0, 0, 0x0100, 1, "90pwm3")
+AVR_MCU ("at90pwm3b", ARCH_AVR4, ADD_ISA_NONE, "__AVR_AT90PWM3B__", 0, 0, 0x0100, 1, "90pwm3b")
+AVR_MCU ("at90pwm81", ARCH_AVR4, ADD_ISA_NONE, "__AVR_AT90PWM81__", 0, 0, 0x0100, 1, "90pwm81")
/* Enhanced, > 8K, <= 64K. */
-AVR_MCU ("avr5", ARCH_AVR5, NULL, 0, 0, 0x0060, 1, "m16")
-AVR_MCU ("ata5790", ARCH_AVR5, "__AVR_ATA5790__", 0, 0, 0x0100, 1, "a5790")
-AVR_MCU ("ata5790n", ARCH_AVR5, "__AVR_ATA5790N__", 0, 0, 0x0100, 1, "a5790n")
-AVR_MCU ("ata5795", ARCH_AVR5, "__AVR_ATA5795__", 0, 0, 0x0100, 1, "a5795")
-AVR_MCU ("atmega16", ARCH_AVR5, "__AVR_ATmega16__", 0, 0, 0x0060, 1, "m16")
-AVR_MCU ("atmega16a", ARCH_AVR5, "__AVR_ATmega16A__", 0, 0, 0x0060, 1, "m16a")
-AVR_MCU ("atmega161", ARCH_AVR5, "__AVR_ATmega161__", 0, 0, 0x0060, 1, "m161")
-AVR_MCU ("atmega162", ARCH_AVR5, "__AVR_ATmega162__", 0, 0, 0x0100, 1, "m162")
-AVR_MCU ("atmega163", ARCH_AVR5, "__AVR_ATmega163__", 0, 0, 0x0060, 1, "m163")
-AVR_MCU ("atmega164a", ARCH_AVR5, "__AVR_ATmega164A__", 0, 0, 0x0100, 1, "m164a")
-AVR_MCU ("atmega164p", ARCH_AVR5, "__AVR_ATmega164P__", 0, 0, 0x0100, 1, "m164p")
-AVR_MCU ("atmega164pa", ARCH_AVR5, "__AVR_ATmega164PA__", 0, 0, 0x0100, 1, "m164pa")
-AVR_MCU ("atmega165", ARCH_AVR5, "__AVR_ATmega165__", 0, 0, 0x0100, 1, "m165")
-AVR_MCU ("atmega165a", ARCH_AVR5, "__AVR_ATmega165A__", 0, 0, 0x0100, 1, "m165a")
-AVR_MCU ("atmega165p", ARCH_AVR5, "__AVR_ATmega165P__", 0, 0, 0x0100, 1, "m165p")
-AVR_MCU ("atmega165pa", ARCH_AVR5, "__AVR_ATmega165PA__", 0, 0, 0x0100, 1, "m165pa")
-AVR_MCU ("atmega168", ARCH_AVR5, "__AVR_ATmega168__", 0, 0, 0x0100, 1, "m168")
-AVR_MCU ("atmega168a", ARCH_AVR5, "__AVR_ATmega168A__", 0, 0, 0x0100, 1, "m168a")
-AVR_MCU ("atmega168p", ARCH_AVR5, "__AVR_ATmega168P__", 0, 0, 0x0100, 1, "m168p")
-AVR_MCU ("atmega168pa", ARCH_AVR5, "__AVR_ATmega168PA__", 0, 0, 0x0100, 1, "m168pa")
-AVR_MCU ("atmega169", ARCH_AVR5, "__AVR_ATmega169__", 0, 0, 0x0100, 1, "m169")
-AVR_MCU ("atmega169a", ARCH_AVR5, "__AVR_ATmega169A__", 0, 0, 0x0100, 1, "m169a")
-AVR_MCU ("atmega169p", ARCH_AVR5, "__AVR_ATmega169P__", 0, 0, 0x0100, 1, "m169p")
-AVR_MCU ("atmega169pa", ARCH_AVR5, "__AVR_ATmega169PA__", 0, 0, 0x0100, 1, "m169pa")
-AVR_MCU ("atmega16hvb", ARCH_AVR5, "__AVR_ATmega16HVB__", 0, 0, 0x0100, 1, "m16hvb")
-AVR_MCU ("atmega16hvbrevb", ARCH_AVR5, "__AVR_ATmega16HVBREVB__", 0, 0, 0x0100, 1, "m16hvbrevb")
-AVR_MCU ("atmega16m1", ARCH_AVR5, "__AVR_ATmega16M1__", 0, 0, 0x0100, 1, "m16m1")
-AVR_MCU ("atmega16u4", ARCH_AVR5, "__AVR_ATmega16U4__", 0, 0, 0x0100, 1, "m16u4")
-AVR_MCU ("atmega26hvg", ARCH_AVR5, "__AVR_ATmega26HVG__", 0, 0, 0x0100, 1, "m26hvg")
-AVR_MCU ("atmega32a", ARCH_AVR5, "__AVR_ATmega32A__", 0, 0, 0x0060, 1, "m32a")
-AVR_MCU ("atmega32", ARCH_AVR5, "__AVR_ATmega32__", 0, 0, 0x0060, 1, "m32")
-AVR_MCU ("atmega323", ARCH_AVR5, "__AVR_ATmega323__", 0, 0, 0x0060, 1, "m323")
-AVR_MCU ("atmega324a", ARCH_AVR5, "__AVR_ATmega324A__", 0, 0, 0x0100, 1, "m324a")
-AVR_MCU ("atmega324p", ARCH_AVR5, "__AVR_ATmega324P__", 0, 0, 0x0100, 1, "m324p")
-AVR_MCU ("atmega324pa", ARCH_AVR5, "__AVR_ATmega324PA__", 0, 0, 0x0100, 1, "m324pa")
-AVR_MCU ("atmega325", ARCH_AVR5, "__AVR_ATmega325__", 0, 0, 0x0100, 1, "m325")
-AVR_MCU ("atmega325a", ARCH_AVR5, "__AVR_ATmega325A__", 0, 0, 0x0100, 1, "m325a")
-AVR_MCU ("atmega325p", ARCH_AVR5, "__AVR_ATmega325P__", 0, 0, 0x0100, 1, "m325p")
-AVR_MCU ("atmega3250", ARCH_AVR5, "__AVR_ATmega3250__", 0, 0, 0x0100, 1, "m3250")
-AVR_MCU ("atmega3250a", ARCH_AVR5, "__AVR_ATmega3250A__", 0, 0, 0x0100, 1, "m3250a")
-AVR_MCU ("atmega3250p", ARCH_AVR5, "__AVR_ATmega3250P__", 0, 0, 0x0100, 1, "m3250p")
-AVR_MCU ("atmega3250pa", ARCH_AVR5, "__AVR_ATmega3250PA__", 0, 0, 0x0100, 1, "m3250pa")
-AVR_MCU ("atmega328", ARCH_AVR5, "__AVR_ATmega328__", 0, 0, 0x0100, 1, "m328")
-AVR_MCU ("atmega328p", ARCH_AVR5, "__AVR_ATmega328P__", 0, 0, 0x0100, 1, "m328p")
-AVR_MCU ("atmega329", ARCH_AVR5, "__AVR_ATmega329__", 0, 0, 0x0100, 1, "m329")
-AVR_MCU ("atmega329a", ARCH_AVR5, "__AVR_ATmega329A__", 0, 0, 0x0100, 1, "m329a")
-AVR_MCU ("atmega329p", ARCH_AVR5, "__AVR_ATmega329P__", 0, 0, 0x0100, 1, "m329p")
-AVR_MCU ("atmega329pa", ARCH_AVR5, "__AVR_ATmega329PA__", 0, 0, 0x0100, 1, "m329pa")
-AVR_MCU ("atmega3290", ARCH_AVR5, "__AVR_ATmega3290__", 0, 0, 0x0100, 1, "m3290")
-AVR_MCU ("atmega3290a", ARCH_AVR5, "__AVR_ATmega3290A__", 0, 0, 0x0100, 1, "m3290a")
-AVR_MCU ("atmega3290p", ARCH_AVR5, "__AVR_ATmega3290P__", 0, 0, 0x0100, 1, "m3290p")
-AVR_MCU ("atmega3290pa", ARCH_AVR5, "__AVR_ATmega3290PA__", 0, 0, 0x0100, 1, "m3290pa")
-AVR_MCU ("atmega32c1", ARCH_AVR5, "__AVR_ATmega32C1__", 0, 0, 0x0100, 1, "m32c1")
-AVR_MCU ("atmega32m1", ARCH_AVR5, "__AVR_ATmega32M1__", 0, 0, 0x0100, 1, "m32m1")
-AVR_MCU ("atmega32u4", ARCH_AVR5, "__AVR_ATmega32U4__", 0, 0, 0x0100, 1, "m32u4")
-AVR_MCU ("atmega32u6", ARCH_AVR5, "__AVR_ATmega32U6__", 0, 0, 0x0100, 1, "m32u6")
-AVR_MCU ("atmega406", ARCH_AVR5, "__AVR_ATmega406__", 0, 0, 0x0100, 1, "m406")
-AVR_MCU ("atmega64", ARCH_AVR5, "__AVR_ATmega64__", 0, 0, 0x0100, 1, "m64")
-AVR_MCU ("atmega64a", ARCH_AVR5, "__AVR_ATmega64A__", 0, 0, 0x0100, 1, "m64a")
-AVR_MCU ("atmega640", ARCH_AVR5, "__AVR_ATmega640__", 0, 0, 0x0200, 1, "m640")
-AVR_MCU ("atmega644", ARCH_AVR5, "__AVR_ATmega644__", 0, 0, 0x0100, 1, "m644")
-AVR_MCU ("atmega644a", ARCH_AVR5, "__AVR_ATmega644A__", 0, 0, 0x0100, 1, "m644a")
-AVR_MCU ("atmega644p", ARCH_AVR5, "__AVR_ATmega644P__", 0, 0, 0x0100, 1, "m644p")
-AVR_MCU ("atmega644pa", ARCH_AVR5, "__AVR_ATmega644PA__", 0, 0, 0x0100, 1, "m644pa")
-AVR_MCU ("atmega645", ARCH_AVR5, "__AVR_ATmega645__", 0, 0, 0x0100, 1, "m645")
-AVR_MCU ("atmega645a", ARCH_AVR5, "__AVR_ATmega645A__", 0, 0, 0x0100, 1, "m645a")
-AVR_MCU ("atmega645p", ARCH_AVR5, "__AVR_ATmega645P__", 0, 0, 0x0100, 1, "m645p")
-AVR_MCU ("atmega6450", ARCH_AVR5, "__AVR_ATmega6450__", 0, 0, 0x0100, 1, "m6450")
-AVR_MCU ("atmega6450a", ARCH_AVR5, "__AVR_ATmega6450A__", 0, 0, 0x0100, 1, "m6450a")
-AVR_MCU ("atmega6450p", ARCH_AVR5, "__AVR_ATmega6450P__", 0, 0, 0x0100, 1, "m6450p")
-AVR_MCU ("atmega649", ARCH_AVR5, "__AVR_ATmega649__", 0, 0, 0x0100, 1, "m649")
-AVR_MCU ("atmega649a", ARCH_AVR5, "__AVR_ATmega649A__", 0, 0, 0x0100, 1, "m649a")
-AVR_MCU ("atmega649p", ARCH_AVR5, "__AVR_ATmega649P__", 0, 0, 0x0100, 1, "m649p")
-AVR_MCU ("atmega6490", ARCH_AVR5, "__AVR_ATmega6490__", 0, 0, 0x0100, 1, "m6490")
-AVR_MCU ("atmega16hva", ARCH_AVR5, "__AVR_ATmega16HVA__", 0, 0, 0x0100, 1, "m16hva")
-AVR_MCU ("atmega16hva2", ARCH_AVR5, "__AVR_ATmega16HVA2__", 0, 0, 0x0100, 1, "m16hva2")
-AVR_MCU ("atmega32hvb", ARCH_AVR5, "__AVR_ATmega32HVB__", 0, 0, 0x0100, 1, "m32hvb")
-AVR_MCU ("atmega6490a", ARCH_AVR5, "__AVR_ATmega6490A__", 0, 0, 0x0100, 1, "m6490a")
-AVR_MCU ("atmega6490p", ARCH_AVR5, "__AVR_ATmega6490P__", 0, 0, 0x0100, 1, "m6490p")
-AVR_MCU ("atmega64c1", ARCH_AVR5, "__AVR_ATmega64C1__", 0, 0, 0x0100, 1, "m64c1")
-AVR_MCU ("atmega64m1", ARCH_AVR5, "__AVR_ATmega64M1__", 0, 0, 0x0100, 1, "m64m1")
-AVR_MCU ("atmega64hve", ARCH_AVR5, "__AVR_ATmega64HVE__", 0, 0, 0x0100, 1, "m64hve")
-AVR_MCU ("atmega64rfa2", ARCH_AVR5, "__AVR_ATmega64RFA2__", 0, 0, 0x0200, 1, "m64rfa2")
-AVR_MCU ("atmega64rfr2", ARCH_AVR5, "__AVR_ATmega64RFR2__", 0, 0, 0x0200, 1, "m64rfr2")
-AVR_MCU ("atmega32hvbrevb", ARCH_AVR5, "__AVR_ATmega32HVBREVB__", 0, 0, 0x0100, 1, "m32hvbrevb")
-AVR_MCU ("atmega48hvf", ARCH_AVR5, "__AVR_ATmega48HVF__", 0, 0, 0x0100, 1, "m48hvf")
-AVR_MCU ("at90can32", ARCH_AVR5, "__AVR_AT90CAN32__", 0, 0, 0x0100, 1, "can32")
-AVR_MCU ("at90can64", ARCH_AVR5, "__AVR_AT90CAN64__", 0, 0, 0x0100, 1, "can64")
-AVR_MCU ("at90pwm161", ARCH_AVR5, "__AVR_AT90PWM161__", 0, 0, 0x0100, 1, "90pwm161")
-AVR_MCU ("at90pwm216", ARCH_AVR5, "__AVR_AT90PWM216__", 0, 0, 0x0100, 1, "90pwm216")
-AVR_MCU ("at90pwm316", ARCH_AVR5, "__AVR_AT90PWM316__", 0, 0, 0x0100, 1, "90pwm316")
-AVR_MCU ("at90scr100", ARCH_AVR5, "__AVR_AT90SCR100__", 0, 0, 0x0100, 1, "90scr100")
-AVR_MCU ("at90usb646", ARCH_AVR5, "__AVR_AT90USB646__", 0, 0, 0x0100, 1, "usb646")
-AVR_MCU ("at90usb647", ARCH_AVR5, "__AVR_AT90USB647__", 0, 0, 0x0100, 1, "usb647")
-AVR_MCU ("at94k", ARCH_AVR5, "__AVR_AT94K__", 0, 0, 0x0060, 1, "at94k")
-AVR_MCU ("m3000", ARCH_AVR5, "__AVR_M3000__", 0, 0, 0x1000, 1, "m3000")
+AVR_MCU ("avr5", ARCH_AVR5, ADD_ISA_NONE, NULL, 0, 0, 0x0060, 1, "m16")
+AVR_MCU ("ata5790", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATA5790__", 0, 0, 0x0100, 1, "a5790")
+AVR_MCU ("ata5790n", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATA5790N__", 0, 0, 0x0100, 1, "a5790n")
+AVR_MCU ("ata5795", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATA5795__", 0, 0, 0x0100, 1, "a5795")
+AVR_MCU ("atmega16", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16__", 0, 0, 0x0060, 1, "m16")
+AVR_MCU ("atmega16a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16A__", 0, 0, 0x0060, 1, "m16a")
+AVR_MCU ("atmega161", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega161__", 0, 0, 0x0060, 1, "m161")
+AVR_MCU ("atmega162", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega162__", 0, 0, 0x0100, 1, "m162")
+AVR_MCU ("atmega163", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega163__", 0, 0, 0x0060, 1, "m163")
+AVR_MCU ("atmega164a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega164A__", 0, 0, 0x0100, 1, "m164a")
+AVR_MCU ("atmega164p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega164P__", 0, 0, 0x0100, 1, "m164p")
+AVR_MCU ("atmega164pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega164PA__", 0, 0, 0x0100, 1, "m164pa")
+AVR_MCU ("atmega165", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega165__", 0, 0, 0x0100, 1, "m165")
+AVR_MCU ("atmega165a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega165A__", 0, 0, 0x0100, 1, "m165a")
+AVR_MCU ("atmega165p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega165P__", 0, 0, 0x0100, 1, "m165p")
+AVR_MCU ("atmega165pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega165PA__", 0, 0, 0x0100, 1, "m165pa")
+AVR_MCU ("atmega168", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega168__", 0, 0, 0x0100, 1, "m168")
+AVR_MCU ("atmega168a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega168A__", 0, 0, 0x0100, 1, "m168a")
+AVR_MCU ("atmega168p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega168P__", 0, 0, 0x0100, 1, "m168p")
+AVR_MCU ("atmega168pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega168PA__", 0, 0, 0x0100, 1, "m168pa")
+AVR_MCU ("atmega169", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega169__", 0, 0, 0x0100, 1, "m169")
+AVR_MCU ("atmega169a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega169A__", 0, 0, 0x0100, 1, "m169a")
+AVR_MCU ("atmega169p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega169P__", 0, 0, 0x0100, 1, "m169p")
+AVR_MCU ("atmega169pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega169PA__", 0, 0, 0x0100, 1, "m169pa")
+AVR_MCU ("atmega16hvb", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16HVB__", 0, 0, 0x0100, 1, "m16hvb")
+AVR_MCU ("atmega16hvbrevb", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16HVBREVB__", 0, 0, 0x0100, 1, "m16hvbrevb")
+AVR_MCU ("atmega16m1", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16M1__", 0, 0, 0x0100, 1, "m16m1")
+AVR_MCU ("atmega16u4", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16U4__", 0, 0, 0x0100, 1, "m16u4")
+AVR_MCU ("atmega26hvg", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega26HVG__", 0, 0, 0x0100, 1, "m26hvg")
+AVR_MCU ("atmega32a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32A__", 0, 0, 0x0060, 1, "m32a")
+AVR_MCU ("atmega32", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32__", 0, 0, 0x0060, 1, "m32")
+AVR_MCU ("atmega323", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega323__", 0, 0, 0x0060, 1, "m323")
+AVR_MCU ("atmega324a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega324A__", 0, 0, 0x0100, 1, "m324a")
+AVR_MCU ("atmega324p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega324P__", 0, 0, 0x0100, 1, "m324p")
+AVR_MCU ("atmega324pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega324PA__", 0, 0, 0x0100, 1, "m324pa")
+AVR_MCU ("atmega325", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega325__", 0, 0, 0x0100, 1, "m325")
+AVR_MCU ("atmega325a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega325A__", 0, 0, 0x0100, 1, "m325a")
+AVR_MCU ("atmega325p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega325P__", 0, 0, 0x0100, 1, "m325p")
+AVR_MCU ("atmega3250", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3250__", 0, 0, 0x0100, 1, "m3250")
+AVR_MCU ("atmega3250a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3250A__", 0, 0, 0x0100, 1, "m3250a")
+AVR_MCU ("atmega3250p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3250P__", 0, 0, 0x0100, 1, "m3250p")
+AVR_MCU ("atmega3250pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3250PA__", 0, 0, 0x0100, 1, "m3250pa")
+AVR_MCU ("atmega328", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega328__", 0, 0, 0x0100, 1, "m328")
+AVR_MCU ("atmega328p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega328P__", 0, 0, 0x0100, 1, "m328p")
+AVR_MCU ("atmega329", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega329__", 0, 0, 0x0100, 1, "m329")
+AVR_MCU ("atmega329a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega329A__", 0, 0, 0x0100, 1, "m329a")
+AVR_MCU ("atmega329p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega329P__", 0, 0, 0x0100, 1, "m329p")
+AVR_MCU ("atmega329pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega329PA__", 0, 0, 0x0100, 1, "m329pa")
+AVR_MCU ("atmega3290", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3290__", 0, 0, 0x0100, 1, "m3290")
+AVR_MCU ("atmega3290a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3290A__", 0, 0, 0x0100, 1, "m3290a")
+AVR_MCU ("atmega3290p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3290P__", 0, 0, 0x0100, 1, "m3290p")
+AVR_MCU ("atmega3290pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega3290PA__", 0, 0, 0x0100, 1, "m3290pa")
+AVR_MCU ("atmega32c1", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32C1__", 0, 0, 0x0100, 1, "m32c1")
+AVR_MCU ("atmega32m1", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32M1__", 0, 0, 0x0100, 1, "m32m1")
+AVR_MCU ("atmega32u4", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32U4__", 0, 0, 0x0100, 1, "m32u4")
+AVR_MCU ("atmega32u6", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32U6__", 0, 0, 0x0100, 1, "m32u6")
+AVR_MCU ("atmega406", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega406__", 0, 0, 0x0100, 1, "m406")
+AVR_MCU ("atmega64", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega64__", 0, 0, 0x0100, 1, "m64")
+AVR_MCU ("atmega64a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega64A__", 0, 0, 0x0100, 1, "m64a")
+AVR_MCU ("atmega640", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega640__", 0, 0, 0x0200, 1, "m640")
+AVR_MCU ("atmega644", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega644__", 0, 0, 0x0100, 1, "m644")
+AVR_MCU ("atmega644a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega644A__", 0, 0, 0x0100, 1, "m644a")
+AVR_MCU ("atmega644p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega644P__", 0, 0, 0x0100, 1, "m644p")
+AVR_MCU ("atmega644pa", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega644PA__", 0, 0, 0x0100, 1, "m644pa")
+AVR_MCU ("atmega645", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega645__", 0, 0, 0x0100, 1, "m645")
+AVR_MCU ("atmega645a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega645A__", 0, 0, 0x0100, 1, "m645a")
+AVR_MCU ("atmega645p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega645P__", 0, 0, 0x0100, 1, "m645p")
+AVR_MCU ("atmega6450", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega6450__", 0, 0, 0x0100, 1, "m6450")
+AVR_MCU ("atmega6450a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega6450A__", 0, 0, 0x0100, 1, "m6450a")
+AVR_MCU ("atmega6450p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega6450P__", 0, 0, 0x0100, 1, "m6450p")
+AVR_MCU ("atmega649", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega649__", 0, 0, 0x0100, 1, "m649")
+AVR_MCU ("atmega649a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega649A__", 0, 0, 0x0100, 1, "m649a")
+AVR_MCU ("atmega649p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega649P__", 0, 0, 0x0100, 1, "m649p")
+AVR_MCU ("atmega6490", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega6490__", 0, 0, 0x0100, 1, "m6490")
+AVR_MCU ("atmega16hva", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16HVA__", 0, 0, 0x0100, 1, "m16hva")
+AVR_MCU ("atmega16hva2", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega16HVA2__", 0, 0, 0x0100, 1, "m16hva2")
+AVR_MCU ("atmega32hvb", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32HVB__", 0, 0, 0x0100, 1, "m32hvb")
+AVR_MCU ("atmega6490a", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega6490A__", 0, 0, 0x0100, 1, "m6490a")
+AVR_MCU ("atmega6490p", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega6490P__", 0, 0, 0x0100, 1, "m6490p")
+AVR_MCU ("atmega64c1", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega64C1__", 0, 0, 0x0100, 1, "m64c1")
+AVR_MCU ("atmega64m1", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega64M1__", 0, 0, 0x0100, 1, "m64m1")
+AVR_MCU ("atmega64hve", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega64HVE__", 0, 0, 0x0100, 1, "m64hve")
+AVR_MCU ("atmega64rfa2", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega64RFA2__", 0, 0, 0x0200, 1, "m64rfa2")
+AVR_MCU ("atmega64rfr2", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega64RFR2__", 0, 0, 0x0200, 1, "m64rfr2")
+AVR_MCU ("atmega32hvbrevb", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega32HVBREVB__", 0, 0, 0x0100, 1, "m32hvbrevb")
+AVR_MCU ("atmega48hvf", ARCH_AVR5, ADD_ISA_NONE, "__AVR_ATmega48HVF__", 0, 0, 0x0100, 1, "m48hvf")
+AVR_MCU ("at90can32", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90CAN32__", 0, 0, 0x0100, 1, "can32")
+AVR_MCU ("at90can64", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90CAN64__", 0, 0, 0x0100, 1, "can64")
+AVR_MCU ("at90pwm161", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90PWM161__", 0, 0, 0x0100, 1, "90pwm161")
+AVR_MCU ("at90pwm216", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90PWM216__", 0, 0, 0x0100, 1, "90pwm216")
+AVR_MCU ("at90pwm316", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90PWM316__", 0, 0, 0x0100, 1, "90pwm316")
+AVR_MCU ("at90scr100", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90SCR100__", 0, 0, 0x0100, 1, "90scr100")
+AVR_MCU ("at90usb646", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90USB646__", 0, 0, 0x0100, 1, "usb646")
+AVR_MCU ("at90usb647", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT90USB647__", 0, 0, 0x0100, 1, "usb647")
+AVR_MCU ("at94k", ARCH_AVR5, ADD_ISA_NONE, "__AVR_AT94K__", 0, 0, 0x0060, 1, "at94k")
+AVR_MCU ("m3000", ARCH_AVR5, ADD_ISA_NONE, "__AVR_M3000__", 0, 0, 0x1000, 1, "m3000")
/* Enhanced, == 128K. */
-AVR_MCU ("avr51", ARCH_AVR51, NULL, 0, 0, 0x0100, 2, "m128")
-AVR_MCU ("atmega128", ARCH_AVR51, "__AVR_ATmega128__", 0, 0, 0x0100, 2, "m128")
-AVR_MCU ("atmega128a", ARCH_AVR51, "__AVR_ATmega128A__", 0, 0, 0x0100, 2, "m128a")
-AVR_MCU ("atmega1280", ARCH_AVR51, "__AVR_ATmega1280__", 0, 0, 0x0200, 2, "m1280")
-AVR_MCU ("atmega1281", ARCH_AVR51, "__AVR_ATmega1281__", 0, 0, 0x0200, 2, "m1281")
-AVR_MCU ("atmega1284", ARCH_AVR51, "__AVR_ATmega1284__", 0, 0, 0x0100, 2, "m1284")
-AVR_MCU ("atmega1284p", ARCH_AVR51, "__AVR_ATmega1284P__", 0, 0, 0x0100, 2, "m1284p")
-AVR_MCU ("atmega128rfa1", ARCH_AVR51, "__AVR_ATmega128RFA1__", 0, 0, 0x0200, 2, "m128rfa1")
-AVR_MCU ("at90can128", ARCH_AVR51, "__AVR_AT90CAN128__", 0, 0, 0x0100, 2, "can128")
-AVR_MCU ("at90usb1286", ARCH_AVR51, "__AVR_AT90USB1286__", 0, 0, 0x0100, 2, "usb1286")
-AVR_MCU ("at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__", 0, 0, 0x0100, 2, "usb1287")
+AVR_MCU ("avr51", ARCH_AVR51, ADD_ISA_NONE, NULL, 0, 0, 0x0100, 2, "m128")
+AVR_MCU ("atmega128", ARCH_AVR51, ADD_ISA_NONE, "__AVR_ATmega128__", 0, 0, 0x0100, 2, "m128")
+AVR_MCU ("atmega128a", ARCH_AVR51, ADD_ISA_NONE, "__AVR_ATmega128A__", 0, 0, 0x0100, 2, "m128a")
+AVR_MCU ("atmega1280", ARCH_AVR51, ADD_ISA_NONE, "__AVR_ATmega1280__", 0, 0, 0x0200, 2, "m1280")
+AVR_MCU ("atmega1281", ARCH_AVR51, ADD_ISA_NONE, "__AVR_ATmega1281__", 0, 0, 0x0200, 2, "m1281")
+AVR_MCU ("atmega1284", ARCH_AVR51, ADD_ISA_NONE, "__AVR_ATmega1284__", 0, 0, 0x0100, 2, "m1284")
+AVR_MCU ("atmega1284p", ARCH_AVR51, ADD_ISA_NONE, "__AVR_ATmega1284P__", 0, 0, 0x0100, 2, "m1284p")
+AVR_MCU ("atmega128rfa1", ARCH_AVR51, ADD_ISA_NONE, "__AVR_ATmega128RFA1__", 0, 0, 0x0200, 2, "m128rfa1")
+AVR_MCU ("at90can128", ARCH_AVR51, ADD_ISA_NONE, "__AVR_AT90CAN128__", 0, 0, 0x0100, 2, "can128")
+AVR_MCU ("at90usb1286", ARCH_AVR51, ADD_ISA_NONE, "__AVR_AT90USB1286__", 0, 0, 0x0100, 2, "usb1286")
+AVR_MCU ("at90usb1287", ARCH_AVR51, ADD_ISA_NONE, "__AVR_AT90USB1287__", 0, 0, 0x0100, 2, "usb1287")
/* 3-Byte PC. */
-AVR_MCU ("avr6", ARCH_AVR6, NULL, 0, 0, 0x0200, 4, "m2561")
-AVR_MCU ("atmega2560", ARCH_AVR6, "__AVR_ATmega2560__", 0, 0, 0x0200, 4, "m2560")
-AVR_MCU ("atmega2561", ARCH_AVR6, "__AVR_ATmega2561__", 0, 0, 0x0200, 4, "m2561")
+AVR_MCU ("avr6", ARCH_AVR6, ADD_ISA_NONE, NULL, 0, 0, 0x0200, 4, "m2561")
+AVR_MCU ("atmega2560", ARCH_AVR6, ADD_ISA_NONE, "__AVR_ATmega2560__", 0, 0, 0x0200, 4, "m2560")
+AVR_MCU ("atmega2561", ARCH_AVR6, ADD_ISA_NONE, "__AVR_ATmega2561__", 0, 0, 0x0200, 4, "m2561")
/* Xmega, 16K <= Flash < 64K, RAM <= 64K */
-AVR_MCU ("avrxmega2", ARCH_AVRXMEGA2, NULL, 0, 0, 0x2000, 1, "x32a4")
-AVR_MCU ("atxmega16a4", ARCH_AVRXMEGA2, "__AVR_ATxmega16A4__", 0, 0, 0x2000, 1, "x16a4")
-AVR_MCU ("atxmega16d4", ARCH_AVRXMEGA2, "__AVR_ATxmega16D4__", 0, 0, 0x2000, 1, "x16d4")
-AVR_MCU ("atxmega16x1", ARCH_AVRXMEGA2, "__AVR_ATxmega16X1__", 0, 0, 0x2000, 1, "x16x1")
-AVR_MCU ("atxmega32a4", ARCH_AVRXMEGA2, "__AVR_ATxmega32A4__", 0, 0, 0x2000, 1, "x32a4")
-AVR_MCU ("atxmega32d4", ARCH_AVRXMEGA2, "__AVR_ATxmega32D4__", 0, 0, 0x2000, 1, "x32d4")
-AVR_MCU ("atxmega32x1", ARCH_AVRXMEGA2, "__AVR_ATxmega32X1__", 0, 0, 0x2000, 1, "x32x1")
-AVR_MCU ("atmxt112sl", ARCH_AVRXMEGA2, "__AVR_ATMXT112SL__", 0, 0, 0x2000, 1, "mxt112sl")
-AVR_MCU ("atmxt224", ARCH_AVRXMEGA2, "__AVR_ATMXT224__", 0, 0, 0x2000, 1, "mxt224")
-AVR_MCU ("atmxt224e", ARCH_AVRXMEGA2, "__AVR_ATMXT224E__", 0, 0, 0x2000, 1, "mxt224e")
-AVR_MCU ("atmxt336s", ARCH_AVRXMEGA2, "__AVR_ATMXT336S__", 0, 0, 0x2000, 1, "mxt336s")
-AVR_MCU ("atxmega16a4u", ARCH_AVRXMEGA2, "__AVR_ATxmega16A4U__", 0, 0, 0x2000, 1, "x16a4u")
-AVR_MCU ("atxmega16c4", ARCH_AVRXMEGA2, "__AVR_ATxmega16C4__", 0, 0, 0x2000, 1, "x16c4")
-AVR_MCU ("atxmega32a4u", ARCH_AVRXMEGA2, "__AVR_ATxmega32A4U__", 0, 0, 0x2000, 1, "x32a4u")
-AVR_MCU ("atxmega32c4", ARCH_AVRXMEGA2, "__AVR_ATxmega32C4__", 0, 0, 0x2000, 1, "x32c4")
-AVR_MCU ("atxmega32e5", ARCH_AVRXMEGA2, "__AVR_ATxmega32E5__", 0, 0, 0x2000, 1, "x32e5")
+AVR_MCU ("avrxmega2", ARCH_AVRXMEGA2, ADD_ISA_NONE, NULL, 0, 0, 0x2000, 1, "x32a4")
+AVR_MCU ("atxmega16a4", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATxmega16A4__", 0, 0, 0x2000, 1, "x16a4")
+AVR_MCU ("atxmega16d4", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATxmega16D4__", 0, 0, 0x2000, 1, "x16d4")
+AVR_MCU ("atxmega16x1", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATxmega16X1__", 0, 0, 0x2000, 1, "x16x1")
+AVR_MCU ("atxmega32a4", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATxmega32A4__", 0, 0, 0x2000, 1, "x32a4")
+AVR_MCU ("atxmega32d4", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATxmega32D4__", 0, 0, 0x2000, 1, "x32d4")
+AVR_MCU ("atxmega32x1", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATxmega32X1__", 0, 0, 0x2000, 1, "x32x1")
+AVR_MCU ("atmxt112sl", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATMXT112SL__", 0, 0, 0x2000, 1, "mxt112sl")
+AVR_MCU ("atmxt224", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATMXT224__", 0, 0, 0x2000, 1, "mxt224")
+AVR_MCU ("atmxt224e", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATMXT224E__", 0, 0, 0x2000, 1, "mxt224e")
+AVR_MCU ("atmxt336s", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATMXT336S__", 0, 0, 0x2000, 1, "mxt336s")
+AVR_MCU ("atxmega16a4u", ARCH_AVRXMEGA2, ADD_RMW_ISA, "__AVR_ATxmega16A4U__", 0, 0, 0x2000, 1, "x16a4u")
+AVR_MCU ("atxmega16c4", ARCH_AVRXMEGA2, ADD_RMW_ISA, "__AVR_ATxmega16C4__", 0, 0, 0x2000, 1, "x16c4")
+AVR_MCU ("atxmega32a4u", ARCH_AVRXMEGA2, ADD_RMW_ISA, "__AVR_ATxmega32A4U__", 0, 0, 0x2000, 1, "x32a4u")
+AVR_MCU ("atxmega32c4", ARCH_AVRXMEGA2, ADD_RMW_ISA, "__AVR_ATxmega32C4__", 0, 0, 0x2000, 1, "x32c4")
+AVR_MCU ("atxmega32e5", ARCH_AVRXMEGA2, ADD_ISA_NONE, "__AVR_ATxmega32E5__", 0, 0, 0x2000, 1, "x32e5")
/* Xmega, 64K < Flash <= 128K, RAM <= 64K */
-AVR_MCU ("avrxmega4", ARCH_AVRXMEGA4, NULL, 0, 0, 0x2000, 2, "x64a4")
-AVR_MCU ("atxmega64a3", ARCH_AVRXMEGA4, "__AVR_ATxmega64A3__", 0, 0, 0x2000, 2, "x64a3")
-AVR_MCU ("atxmega64d3", ARCH_AVRXMEGA4, "__AVR_ATxmega64D3__", 0, 0, 0x2000, 2, "x64d3")
-AVR_MCU ("atxmega64a3u", ARCH_AVRXMEGA4, "__AVR_ATxmega64A3U__", 0, 0, 0x2000, 2, "x64a3u")
-AVR_MCU ("atxmega64a4u", ARCH_AVRXMEGA4, "__AVR_ATxmega64A4U__", 0, 0, 0x2000, 2, "x64a4u")
-AVR_MCU ("atxmega64b1", ARCH_AVRXMEGA4, "__AVR_ATxmega64B1__", 0, 0, 0x2000, 2, "x64b1")
-AVR_MCU ("atxmega64b3", ARCH_AVRXMEGA4, "__AVR_ATxmega64B3__", 0, 0, 0x2000, 2, "x64b3")
-AVR_MCU ("atxmega64c3", ARCH_AVRXMEGA4, "__AVR_ATxmega64C3__", 0, 0, 0x2000, 2, "x64c3")
-AVR_MCU ("atxmega64d4", ARCH_AVRXMEGA4, "__AVR_ATxmega64D4__", 0, 0, 0x2000, 2, "x64d4")
+AVR_MCU ("avrxmega4", ARCH_AVRXMEGA4, ADD_ISA_NONE, NULL, 0, 0, 0x2000, 2, "x64a4")
+AVR_MCU ("atxmega64a3", ARCH_AVRXMEGA4, ADD_ISA_NONE, "__AVR_ATxmega64A3__", 0, 0, 0x2000, 2, "x64a3")
+AVR_MCU ("atxmega64d3", ARCH_AVRXMEGA4, ADD_ISA_NONE, "__AVR_ATxmega64D3__", 0, 0, 0x2000, 2, "x64d3")
+AVR_MCU ("atxmega64a3u", ARCH_AVRXMEGA4, ADD_RMW_ISA, "__AVR_ATxmega64A3U__", 0, 0, 0x2000, 2, "x64a3u")
+AVR_MCU ("atxmega64a4u", ARCH_AVRXMEGA4, ADD_RMW_ISA, "__AVR_ATxmega64A4U__", 0, 0, 0x2000, 2, "x64a4u")
+AVR_MCU ("atxmega64b1", ARCH_AVRXMEGA4, ADD_RMW_ISA, "__AVR_ATxmega64B1__", 0, 0, 0x2000, 2, "x64b1")
+AVR_MCU ("atxmega64b3", ARCH_AVRXMEGA4, ADD_RMW_ISA, "__AVR_ATxmega64B3__", 0, 0, 0x2000, 2, "x64b3")
+AVR_MCU ("atxmega64c3", ARCH_AVRXMEGA4, ADD_RMW_ISA, "__AVR_ATxmega64C3__", 0, 0, 0x2000, 2, "x64c3")
+AVR_MCU ("atxmega64d4", ARCH_AVRXMEGA4, ADD_ISA_NONE, "__AVR_ATxmega64D4__", 0, 0, 0x2000, 2, "x64d4")
/* Xmega, 64K < Flash <= 128K, RAM > 64K */
-AVR_MCU ("avrxmega5", ARCH_AVRXMEGA5, NULL, 0, 0, 0x2000, 2, "x64a1")
-AVR_MCU ("atxmega64a1", ARCH_AVRXMEGA5, "__AVR_ATxmega64A1__", 0, 0, 0x2000, 2, "x64a1")
-AVR_MCU ("atxmega64a1u", ARCH_AVRXMEGA5, "__AVR_ATxmega64A1U__", 0, 0, 0x2000, 2, "x64a1u")
+AVR_MCU ("avrxmega5", ARCH_AVRXMEGA5, ADD_ISA_NONE, NULL, 0, 0, 0x2000, 2, "x64a1")
+AVR_MCU ("atxmega64a1", ARCH_AVRXMEGA5, ADD_ISA_NONE, "__AVR_ATxmega64A1__", 0, 0, 0x2000, 2, "x64a1")
+AVR_MCU ("atxmega64a1u", ARCH_AVRXMEGA5, ADD_RMW_ISA, "__AVR_ATxmega64A1U__", 0, 0, 0x2000, 2, "x64a1u")
/* Xmega, 128K < Flash, RAM <= 64K */
-AVR_MCU ("avrxmega6", ARCH_AVRXMEGA6, NULL, 0, 0, 0x2000, 6, "x128a3")
-AVR_MCU ("atxmega128a3", ARCH_AVRXMEGA6, "__AVR_ATxmega128A3__", 0, 0, 0x2000, 3, "x128a3")
-AVR_MCU ("atxmega128d3", ARCH_AVRXMEGA6, "__AVR_ATxmega128D3__", 0, 0, 0x2000, 3, "x128d3")
-AVR_MCU ("atxmega192a3", ARCH_AVRXMEGA6, "__AVR_ATxmega192A3__", 0, 0, 0x2000, 4, "x192a3")
-AVR_MCU ("atxmega192d3", ARCH_AVRXMEGA6, "__AVR_ATxmega192D3__", 0, 0, 0x2000, 4, "x192d3")
-AVR_MCU ("atxmega256a3", ARCH_AVRXMEGA6, "__AVR_ATxmega256A3__", 0, 0, 0x2000, 5, "x256a3")
-AVR_MCU ("atxmega256a3b", ARCH_AVRXMEGA6, "__AVR_ATxmega256A3B__", 0, 0, 0x2000, 5, "x256a3b")
-AVR_MCU ("atxmega256a3bu", ARCH_AVRXMEGA6, "__AVR_ATxmega256A3BU__", 0, 0, 0x2000, 5, "x256a3bu")
-AVR_MCU ("atxmega256d3", ARCH_AVRXMEGA6, "__AVR_ATxmega256D3__", 0, 0, 0x2000, 5, "x256d3")
-AVR_MCU ("atxmega128a3u", ARCH_AVRXMEGA6, "__AVR_ATxmega128A3U__", 0, 0, 0x2000, 3, "x128a3u")
-AVR_MCU ("atxmega128b1", ARCH_AVRXMEGA6, "__AVR_ATxmega128B1__", 0, 0, 0x2000, 3, "x128b1")
-AVR_MCU ("atxmega128b3", ARCH_AVRXMEGA6, "__AVR_ATxmega128B3__", 0, 0, 0x2000, 3, "x128b3")
-AVR_MCU ("atxmega128c3", ARCH_AVRXMEGA6, "__AVR_ATxmega128C3__", 0, 0, 0x2000, 3, "x128c3")
-AVR_MCU ("atxmega128d4", ARCH_AVRXMEGA6, "__AVR_ATxmega128D4__", 0, 0, 0x2000, 3, "x128d4")
-AVR_MCU ("atmxt540s", ARCH_AVRXMEGA6, "__AVR_ATMXT540S__", 0, 0, 0x2000, 2, "mxt540s")
-AVR_MCU ("atmxt540sreva", ARCH_AVRXMEGA6, "__AVR_ATMXT540SREVA__", 0, 0, 0x2000, 2, "mxt540sreva")
-AVR_MCU ("atxmega192a3u", ARCH_AVRXMEGA6, "__AVR_ATxmega192A3U__", 0, 0, 0x2000, 4, "x192a3u")
-AVR_MCU ("atxmega192c3", ARCH_AVRXMEGA6, "__AVR_ATxmega192C3__", 0, 0, 0x2000, 4, "x192c3")
-AVR_MCU ("atxmega256a3u", ARCH_AVRXMEGA6, "__AVR_ATxmega256A3U__", 0, 0, 0x2000, 5, "x256a3u")
-AVR_MCU ("atxmega256c3", ARCH_AVRXMEGA6, "__AVR_ATxmega256C3__", 0, 0, 0x2000, 5, "x256c3")
-AVR_MCU ("atxmega384c3", ARCH_AVRXMEGA6, "__AVR_ATxmega384C3__", 0, 0, 0x2000, 6, "x384c3")
-AVR_MCU ("atxmega384d3", ARCH_AVRXMEGA6, "__AVR_ATxmega384D3__", 0, 0, 0x2000, 6, "x384d3")
+AVR_MCU ("avrxmega6", ARCH_AVRXMEGA6, ADD_ISA_NONE, NULL, 0, 0, 0x2000, 6, "x128a3")
+AVR_MCU ("atxmega128a3", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega128A3__", 0, 0, 0x2000, 3, "x128a3")
+AVR_MCU ("atxmega128d3", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega128D3__", 0, 0, 0x2000, 3, "x128d3")
+AVR_MCU ("atxmega192a3", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega192A3__", 0, 0, 0x2000, 4, "x192a3")
+AVR_MCU ("atxmega192d3", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega192D3__", 0, 0, 0x2000, 4, "x192d3")
+AVR_MCU ("atxmega256a3", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega256A3__", 0, 0, 0x2000, 5, "x256a3")
+AVR_MCU ("atxmega256a3b", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega256A3B__", 0, 0, 0x2000, 5, "x256a3b")
+AVR_MCU ("atxmega256a3bu", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega256A3BU__", 0, 0, 0x2000, 5, "x256a3bu")
+AVR_MCU ("atxmega256d3", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega256D3__", 0, 0, 0x2000, 5, "x256d3")
+AVR_MCU ("atxmega128a3u", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega128A3U__", 0, 0, 0x2000, 3, "x128a3u")
+AVR_MCU ("atxmega128b1", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega128B1__", 0, 0, 0x2000, 3, "x128b1")
+AVR_MCU ("atxmega128b3", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega128B3__", 0, 0, 0x2000, 3, "x128b3")
+AVR_MCU ("atxmega128c3", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega128C3__", 0, 0, 0x2000, 3, "x128c3")
+AVR_MCU ("atxmega128d4", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega128D4__", 0, 0, 0x2000, 3, "x128d4")
+AVR_MCU ("atmxt540s", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATMXT540S__", 0, 0, 0x2000, 2, "mxt540s")
+AVR_MCU ("atmxt540sreva", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATMXT540SREVA__", 0, 0, 0x2000, 2, "mxt540sreva")
+AVR_MCU ("atxmega192a3u", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega192A3U__", 0, 0, 0x2000, 4, "x192a3u")
+AVR_MCU ("atxmega192c3", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega192C3__", 0, 0, 0x2000, 4, "x192c3")
+AVR_MCU ("atxmega256a3u", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega256A3U__", 0, 0, 0x2000, 5, "x256a3u")
+AVR_MCU ("atxmega256c3", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega256C3__", 0, 0, 0x2000, 5, "x256c3")
+AVR_MCU ("atxmega384c3", ARCH_AVRXMEGA6, ADD_RMW_ISA, "__AVR_ATxmega384C3__", 0, 0, 0x2000, 6, "x384c3")
+AVR_MCU ("atxmega384d3", ARCH_AVRXMEGA6, ADD_ISA_NONE, "__AVR_ATxmega384D3__", 0, 0, 0x2000, 6, "x384d3")
/* Xmega, 128K < Flash, RAM > 64K RAM. */
-AVR_MCU ("avrxmega7", ARCH_AVRXMEGA7, NULL, 0, 0, 0x2000, 3, "x128a1")
-AVR_MCU ("atxmega128a1", ARCH_AVRXMEGA7, "__AVR_ATxmega128A1__", 0, 0, 0x2000, 3, "x128a1")
-AVR_MCU ("atxmega128a1u", ARCH_AVRXMEGA7, "__AVR_ATxmega128A1U__", 0, 0, 0x2000, 3, "x128a1u")
-AVR_MCU ("atxmega128a4u", ARCH_AVRXMEGA7, "__AVR_ATxmega128A4U__", 0, 0, 0x2000, 3, "x128a4u")
+AVR_MCU ("avrxmega7", ARCH_AVRXMEGA7, ADD_ISA_NONE, NULL, 0, 0, 0x2000, 3, "x128a1")
+AVR_MCU ("atxmega128a1", ARCH_AVRXMEGA7, ADD_ISA_NONE, "__AVR_ATxmega128A1__", 0, 0, 0x2000, 3, "x128a1")
+AVR_MCU ("atxmega128a1u", ARCH_AVRXMEGA7, ADD_RMW_ISA, "__AVR_ATxmega128A1U__", 0, 0, 0x2000, 3, "x128a1u")
+AVR_MCU ("atxmega128a4u", ARCH_AVRXMEGA7, ADD_RMW_ISA, "__AVR_ATxmega128A4U__", 0, 0, 0x2000, 3, "x128a4u")
/* Assembler only. */
-AVR_MCU ("avr1", ARCH_AVR1, NULL, 0, 0, 0x0060, 1, "s1200")
-AVR_MCU ("at90s1200", ARCH_AVR1, "__AVR_AT90S1200__", 0, 0, 0x0060, 1, "s1200")
-AVR_MCU ("attiny11", ARCH_AVR1, "__AVR_ATtiny11__", 0, 0, 0x0060, 1, "tn11")
-AVR_MCU ("attiny12", ARCH_AVR1, "__AVR_ATtiny12__", 0, 0, 0x0060, 1, "tn12")
-AVR_MCU ("attiny15", ARCH_AVR1, "__AVR_ATtiny15__", 0, 0, 0x0060, 1, "tn15")
-AVR_MCU ("attiny28", ARCH_AVR1, "__AVR_ATtiny28__", 0, 0, 0x0060, 1, "tn28")
+AVR_MCU ("avr1", ARCH_AVR1, ADD_ISA_NONE, NULL, 0, 0, 0x0060, 1, "s1200")
+AVR_MCU ("at90s1200", ARCH_AVR1, ADD_ISA_NONE, "__AVR_AT90S1200__", 0, 0, 0x0060, 1, "s1200")
+AVR_MCU ("attiny11", ARCH_AVR1, ADD_ISA_NONE, "__AVR_ATtiny11__", 0, 0, 0x0060, 1, "tn11")
+AVR_MCU ("attiny12", ARCH_AVR1, ADD_ISA_NONE, "__AVR_ATtiny12__", 0, 0, 0x0060, 1, "tn12")
+AVR_MCU ("attiny15", ARCH_AVR1, ADD_ISA_NONE, "__AVR_ATtiny15__", 0, 0, 0x0060, 1, "tn15")
+AVR_MCU ("attiny28", ARCH_AVR1, ADD_ISA_NONE, "__AVR_ATtiny28__", 0, 0, 0x0060, 1, "tn28")
diff --git a/gcc/config/avr/driver-avr.c b/gcc/config/avr/driver-avr.c
index cb5dd1d..da47204 100644
--- a/gcc/config/avr/driver-avr.c
+++ b/gcc/config/avr/driver-avr.c
@@ -60,6 +60,7 @@ avr_device_to_as (int argc, const char **argv)
return concat ("-mmcu=", avr_current_arch->arch_name,
avr_current_device->errata_skip ? "" : " -mno-skip-bug",
+ avr_current_device->additional_isa & ADD_RMW_ISA ? " -mrmw" : "",
NULL);
}
diff --git a/gcc/config/avr/genmultilib.awk b/gcc/config/avr/genmultilib.awk
index 90e5e5c..4875574 100644
--- a/gcc/config/avr/genmultilib.awk
+++ b/gcc/config/avr/genmultilib.awk
@@ -86,7 +86,7 @@ BEGIN {
name = $2
gsub ("\"", "", name)
- if ($4 == "NULL")
+ if ($5 == "NULL")
{
core = name
@@ -106,7 +106,7 @@ BEGIN {
if (core == "avr1")
next
- tiny_stack[name] = $5
+ tiny_stack[name] = $6
mcu[n_mcu] = name
n_mcu++
option[name] = "mmcu=" name
diff --git a/gcc/testsuite/gcc.target/avr/additional-isa.c b/gcc/testsuite/gcc.target/avr/additional-isa.c
new file mode 100644
index 0000000..9dee385
--- /dev/null
+++ b/gcc/testsuite/gcc.target/avr/additional-isa.c
@@ -0,0 +1,13 @@
+/* Verify that additional isa options are passed */
+/* { dg-do assemble } */
+/* { dg-options "-mmcu=atxmega32a4u" } */
+/* { dg-skip-if "Only for Xmega" { "avr-*-*" } { "*" } { "-mmcu=atxmega32a4u" } } */
+
+int main()
+{
+ __asm("xch Z, r12");
+ __asm("las Z, r12");
+ __asm("lac Z, r12");
+ __asm("lat Z, r12");
+ return 0;
+}
[-- Attachment #3: device-specific-isa-avr-as.patch --]
[-- Type: application/octet-stream, Size: 5248 bytes --]
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index 332aa2d..bc57a31 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -283,8 +283,10 @@ static struct mcu_type_s mcu_types[] =
{NULL, 0, 0}
};
+
/* Current MCU type. */
static struct mcu_type_s default_mcu = {"avr2", AVR_ISA_AVR2, bfd_mach_avr2};
+static struct mcu_type_s specified_mcu;
static struct mcu_type_s * avr_mcu = & default_mcu;
/* AVR target-specific switches. */
@@ -355,7 +357,8 @@ enum options
{
OPTION_ALL_OPCODES = OPTION_MD_BASE + 1,
OPTION_NO_SKIP_BUG,
- OPTION_NO_WRAP
+ OPTION_NO_WRAP,
+ OPTION_RMW_ISA
};
struct option md_longopts[] =
@@ -364,6 +367,7 @@ struct option md_longopts[] =
{ "mall-opcodes", no_argument, NULL, OPTION_ALL_OPCODES },
{ "mno-skip-bug", no_argument, NULL, OPTION_NO_SKIP_BUG },
{ "mno-wrap", no_argument, NULL, OPTION_NO_WRAP },
+ { "mrmw", no_argument, NULL, OPTION_RMW_ISA },
{ NULL, no_argument, NULL, 0 }
};
@@ -468,7 +472,9 @@ md_show_usage (FILE *stream)
" -mno-skip-bug disable warnings for skipping two-word instructions\n"
" (default for avr4, avr5)\n"
" -mno-wrap reject rjmp/rcall instructions with 8K wrap-around\n"
- " (default for avr3, avr5)\n"));
+ " (default for avr3, avr5)\n"
+ " -mrmw accept RMW instructions\n"
+ ));
show_mcu_list (stream);
}
@@ -515,7 +521,12 @@ md_parse_option (int c, char *arg)
type - this for allows passing -mmcu=... via gcc ASM_SPEC as well
as .arch ... in the asm output at the same time. */
if (avr_mcu == &default_mcu || avr_mcu->mach == mcu_types[i].mach)
- avr_mcu = &mcu_types[i];
+ {
+ specified_mcu.name = mcu_types[i].name;
+ specified_mcu.isa |= mcu_types[i].isa;
+ specified_mcu.mach = mcu_types[i].mach;
+ avr_mcu = &specified_mcu;
+ }
else
as_fatal (_("redefinition of mcu type `%s' to `%s'"),
avr_mcu->name, mcu_types[i].name);
@@ -530,6 +541,9 @@ md_parse_option (int c, char *arg)
case OPTION_NO_WRAP:
avr_opt.no_wrap = 1;
return 1;
+ case OPTION_RMW_ISA:
+ specified_mcu.isa |= AVR_ISA_RMW;
+ return 1;
}
return 0;
diff --git a/gas/doc/c-avr.texi b/gas/doc/c-avr.texi
index 213e82c..603d755 100644
--- a/gas/doc/c-avr.texi
+++ b/gas/doc/c-avr.texi
@@ -125,6 +125,10 @@ This option disable warnings for skipping two-word instructions.
@item -mno-wrap
This option reject @code{rjmp/rcall} instructions with 8K wrap-around.
+@cindex @code{-mrmw} command line option, AVR
+@item -mrmw
+Accept RMW (@code{XCH,LAC,LAS,LAT}) instructions.
+
@end table
diff --git a/gas/testsuite/gas/avr/avr.exp b/gas/testsuite/gas/avr/avr.exp
new file mode 100644
index 0000000..fc90f9f
--- /dev/null
+++ b/gas/testsuite/gas/avr/avr.exp
@@ -0,0 +1,24 @@
+# Copyright 2014
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+#
+# Some AVR tests
+#
+
+if {[istarget avr-*-*]} {
+ run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
+}
diff --git a/gas/testsuite/gas/avr/rmw.d b/gas/testsuite/gas/avr/rmw.d
new file mode 100644
index 0000000..48554e1
--- /dev/null
+++ b/gas/testsuite/gas/avr/rmw.d
@@ -0,0 +1,23 @@
+#name: AVR RMW instructions
+#as: -mmcu=avrxmega2 -mrmw
+#objdump: -dr --show-raw-insn
+#target: avr-*-*
+
+.*: +file format elf32-avr
+
+Disassembly of section .text:
+
+00000000 <main>:
+ 0: cf 93 push r28
+ 2: df 93 push r29
+ 4: cd b7 in r28, 0x3d ; 61
+ 6: de b7 in r29, 0x3e ; 62
+ 8: c4 92 xch Z, r12
+ a: c5 92 las Z, r12
+ c: c6 92 lac Z, r12
+ e: c7 92 lat Z, r12
+ 10: 80 e0 ldi r24, 0x00 ; 0
+ 12: 90 e0 ldi r25, 0x00 ; 0
+ 14: df 91 pop r29
+ 16: cf 91 pop r28
+ 18: 08 95 ret
diff --git a/gas/testsuite/gas/avr/rmw.s b/gas/testsuite/gas/avr/rmw.s
new file mode 100644
index 0000000..fca39c9
--- /dev/null
+++ b/gas/testsuite/gas/avr/rmw.s
@@ -0,0 +1,32 @@
+ .file "rmw.s"
+__SP_H__ = 0x3e
+__SP_L__ = 0x3d
+__SREG__ = 0x3f
+__CCP__ = 0x34
+__tmp_reg__ = 0
+__zero_reg__ = 1
+ .text
+.global main
+ .type main, @function
+main:
+ push r28
+ push r29
+ in r28,__SP_L__
+ in r29,__SP_H__
+/* prologue: function */
+/* frame size = 0 */
+/* stack size = 2 */
+.L__stack_usage = 2
+/* #APP */
+ xch Z, r12
+ las Z, r12
+ lac Z, r12
+ lat Z, r12
+/* #NOAPP */
+ ldi r24,0
+ ldi r25,0
+/* epilogue start */
+ pop r29
+ pop r28
+ ret
+ .size main, .-main
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-02-25 12:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-25 12:05 Device specific ISA support in AVR S, Pitchumani
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).