aboutsummaryrefslogtreecommitdiff
path: root/bfd/cpu-avr.c
diff options
context:
space:
mode:
authorEric B. Weddington <eric.weddington@atmel.com>2008-08-09 05:35:13 +0000
committerEric B. Weddington <eric.weddington@atmel.com>2008-08-09 05:35:13 +0000
commit7b21ac3f455e1854e5ca5c82cc64006d3fbdf923 (patch)
tree6352c107cda6ef9aaa126851229b506391945a04 /bfd/cpu-avr.c
parent4baacaa877c3acd90bbed78c04524b104f9f8bdf (diff)
downloadgdb-7b21ac3f455e1854e5ca5c82cc64006d3fbdf923.zip
gdb-7b21ac3f455e1854e5ca5c82cc64006d3fbdf923.tar.gz
gdb-7b21ac3f455e1854e5ca5c82cc64006d3fbdf923.tar.bz2
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/ * archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35, bfd_mach_avr51): New. * bfd-in2.h: Regenerate. * cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51 architectures. Change comments to match architecture comments in GCC. (compatible): Add test for new AVR architectures. * elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51. (elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31, E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51. gas/ * config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51 architectures. Reorganize list to put mcu types in correct architectures and to order list same as in GCC. Use new ISA definitions in include/opcode/avr.h. * doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture descriptions. Reorganize descriptions to put mcu types in correct architectures and to order lists same as in GCC. include/ * elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31, E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define. (EF_AVR_MACH): Redefine to 0x7F. * opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove. (AVR_ISA_AVR3): Redefine. (AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35, AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51, AVR_ISA_AVR6): Define. ld/ * Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o, and eavr51.o. Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c. * Makefile.in: Regenerate. * configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35 and avr51. * emulparams/avr25.sh: New file. * emulparams/avr31.sh: New file. * emulparams/avr35.sh: New file. * emulparams/avr51.sh: New file.
Diffstat (limited to 'bfd/cpu-avr.c')
-rw-r--r--bfd/cpu-avr.c76
1 files changed, 58 insertions, 18 deletions
diff --git a/bfd/cpu-avr.c b/bfd/cpu-avr.c
index 51472a3..364f64e 100644
--- a/bfd/cpu-avr.c
+++ b/bfd/cpu-avr.c
@@ -35,20 +35,44 @@ compatible (const bfd_arch_info_type * a,
if (a->arch != b->arch)
return NULL;
- /* Special case for ATmega[16]03 (avr:3) and ATmega83 (avr:4). */
- if ((a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr4)
- || (a->mach == bfd_mach_avr4 && b->mach == bfd_mach_avr3))
- return NULL;
+ if (a->mach == b->mach)
+ return a;
- /* So far all newer AVR architecture cores are supersets of previous
- cores. */
- if (a->mach <= b->mach)
+ if (a->mach <= bfd_mach_avr6 && b->mach <= bfd_mach_avr6)
+ {
+ /* Special case for ATmega[16]03 (avr:3) and ATmega83 (avr:4). */
+ if ((a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr4)
+ || (a->mach == bfd_mach_avr4 && b->mach == bfd_mach_avr3))
+ return NULL;
+
+ if (a->mach <= b->mach)
+ return b;
+
+ if (a->mach >= b->mach)
+ return a;
+ }
+
+ if (a->mach == bfd_mach_avr2 && b->mach == bfd_mach_avr25)
+ return a;
+ if (a->mach == bfd_mach_avr25 && b->mach == bfd_mach_avr2)
+ return b;
+
+ if (a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr31)
+ return a;
+ if (a->mach == bfd_mach_avr31 && b->mach == bfd_mach_avr3)
return b;
- if (a->mach >= b->mach)
+ if (a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr35)
return a;
+ if (a->mach == bfd_mach_avr35 && b->mach == bfd_mach_avr3)
+ return b;
+
+ if (a->mach == bfd_mach_avr5 && b->mach == bfd_mach_avr51)
+ return a;
+ if (a->mach == bfd_mach_avr51 && b->mach == bfd_mach_avr5)
+ return b;
+
- /* Never reached! */
return NULL;
}
@@ -70,22 +94,38 @@ compatible (const bfd_arch_info_type * a,
static const bfd_arch_info_type arch_info_struct[] =
{
- /* AT90S1200, ATtiny1x, ATtiny28. */
+ /* Assembler only. */
N (16, bfd_mach_avr1, "avr:1", FALSE, & arch_info_struct[1]),
- /* AT90S2xxx, AT90S4xxx, AT90S8xxx, ATtiny22. */
+ /* Classic, <= 8K. */
N (16, bfd_mach_avr2, "avr:2", FALSE, & arch_info_struct[2]),
- /* ATmega103, ATmega603. */
- N (22, bfd_mach_avr3, "avr:3", FALSE, & arch_info_struct[3]),
+ /* Classic + MOVW, <= 8K. */
+ N (16, bfd_mach_avr25, "avr:25", FALSE, & arch_info_struct[3]),
+
+ /* Classic, > 8K, <= 64K. */
+ /* TODO: addr_bits should be 16, but set to 22 for some following
+ version of GCC (from 4.3) for backward compatibility. */
+ N (22, bfd_mach_avr3, "avr:3", FALSE, & arch_info_struct[4]),
+
+ /* Classic, == 128K. */
+ N (22, bfd_mach_avr31, "avr:31", FALSE, & arch_info_struct[5]),
+
+ /* Classic + MOVW + JMP/CALL, > 8K, <= 64K. */
+ N (16, bfd_mach_avr35, "avr:35", FALSE, & arch_info_struct[6]),
- /* ATmega83, ATmega85. */
- N (16, bfd_mach_avr4, "avr:4", FALSE, & arch_info_struct[4]),
+ /* Enhanced, <= 8K. */
+ N (16, bfd_mach_avr4, "avr:4", FALSE, & arch_info_struct[7]),
- /* ATmega161, ATmega163, ATmega32, AT94K. */
- N (22, bfd_mach_avr5, "avr:5", FALSE, & arch_info_struct[5]),
+ /* Enhanced, > 8K, <= 64K. */
+ /* TODO: addr_bits should be 16, but set to 22 for some following
+ version of GCC (from 4.3) for backward compatibility. */
+ N (22, bfd_mach_avr5, "avr:5", FALSE, & arch_info_struct[8]),
+
+ /* Enhanced, == 128K. */
+ N (22, bfd_mach_avr51, "avr:51", FALSE, & arch_info_struct[9]),
- /* ATmega256x. */
+ /* 3-Byte PC. */
N (22, bfd_mach_avr6, "avr:6", FALSE, NULL)
};