You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
595 lines
18 KiB
Diff
595 lines
18 KiB
Diff
15 years ago
|
Not committed
|
||
|
|
--------------------------------------------------------------------------------
|
||
|
|
--- opcodes/avr-dis.c.orig 2007-08-06 13:58:38.000000000 -0600
|
||
|
|
+++ opcodes/avr-dis.c 2008-04-09 16:37:17.233737600 -0600
|
||
|
|
@@ -50,7 +50,7 @@ static const char * comment_start = "0x"
|
||
|
|
|
||
|
|
static int
|
||
|
|
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constraint,
|
||
|
|
- char *buf, char *comment, int regs, int *sym, bfd_vma *sym_addr)
|
||
|
|
+ char *opcode_str, char *buf, char *comment, int regs, int *sym, bfd_vma *sym_addr)
|
||
|
|
{
|
||
|
|
int ok = 1;
|
||
|
|
*sym = 0;
|
||
|
|
@@ -118,8 +118,18 @@ avr_operand (unsigned int insn, unsigned
|
||
|
|
|
||
|
|
case 'z':
|
||
|
|
*buf++ = 'Z';
|
||
|
|
- if (insn & 0x1)
|
||
|
|
- *buf++ = '+';
|
||
|
|
+
|
||
|
|
+ /* Check for post-increment. */
|
||
|
|
+ char *s;
|
||
|
|
+ for (s = opcode_str; *s; ++s)
|
||
|
|
+ {
|
||
|
|
+ if (*s == '+')
|
||
|
|
+ {
|
||
|
|
+ *buf++ = '+';
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
*buf = '\0';
|
||
|
|
if (AVR_UNDEF_P (insn))
|
||
|
|
sprintf (comment, _("undefined"));
|
||
|
|
@@ -226,6 +236,10 @@ avr_operand (unsigned int insn, unsigned
|
||
|
|
sprintf (comment, "%d", x);
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
+
|
||
|
|
+ case 'E':
|
||
|
|
+ sprintf (buf, "%d", (insn >> 4) & 15);
|
||
|
|
+ break;
|
||
|
|
|
||
|
|
case '?':
|
||
|
|
*buf = '\0';
|
||
|
|
@@ -331,7 +345,8 @@ print_insn_avr (bfd_vma addr, disassembl
|
||
|
|
|
||
|
|
if (opcode->name)
|
||
|
|
{
|
||
|
|
- char *op = opcode->constraints;
|
||
|
|
+ char *constraints = opcode->constraints;
|
||
|
|
+ char *opcode_str = opcode->opcode;
|
||
|
|
|
||
|
|
insn2 = 0;
|
||
|
|
ok = 1;
|
||
|
|
@@ -342,14 +357,14 @@ print_insn_avr (bfd_vma addr, disassembl
|
||
|
|
cmd_len = 4;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (*op && *op != '?')
|
||
|
|
+ if (*constraints && *constraints != '?')
|
||
|
|
{
|
||
|
|
- int regs = REGISTER_P (*op);
|
||
|
|
+ int regs = REGISTER_P (*constraints);
|
||
|
|
|
||
|
|
- ok = avr_operand (insn, insn2, addr, *op, op1, comment1, 0, &sym_op1, &sym_addr1);
|
||
|
|
+ ok = avr_operand (insn, insn2, addr, *constraints, opcode_str, op1, comment1, 0, &sym_op1, &sym_addr1);
|
||
|
|
|
||
|
|
- if (ok && *(++op) == ',')
|
||
|
|
- ok = avr_operand (insn, insn2, addr, *(++op), op2,
|
||
|
|
+ if (ok && *(++constraints) == ',')
|
||
|
|
+ ok = avr_operand (insn, insn2, addr, *(++constraints), opcode_str, op2,
|
||
|
|
*comment1 ? comment2 : comment1, regs, &sym_op2, &sym_addr2);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--- gas/config/tc-avr.c.orig 2008-08-29 10:58:02.000000000 -0600
|
||
|
|
+++ gas/config/tc-avr.c 2008-09-22 14:11:05.345349200 -0600
|
||
|
|
@@ -27,20 +27,21 @@
|
||
|
|
|
||
|
|
struct avr_opcodes_s
|
||
|
|
{
|
||
|
|
- char * name;
|
||
|
|
- char * constraints;
|
||
|
|
- int insn_size; /* In words. */
|
||
|
|
- int isa;
|
||
|
|
+ char *name;
|
||
|
|
+ char *constraints;
|
||
|
|
+ char *opcode;
|
||
|
|
+ int insn_size; /* In words. */
|
||
|
|
+ int isa;
|
||
|
|
unsigned int bin_opcode;
|
||
|
|
};
|
||
|
|
|
||
|
|
#define AVR_INSN(NAME, CONSTR, OPCODE, SIZE, ISA, BIN) \
|
||
|
|
-{#NAME, CONSTR, SIZE, ISA, BIN},
|
||
|
|
+{#NAME, CONSTR, OPCODE, SIZE, ISA, BIN},
|
||
|
|
|
||
|
|
struct avr_opcodes_s avr_opcodes[] =
|
||
|
|
{
|
||
|
|
#include "opcode/avr.h"
|
||
|
|
- {NULL, NULL, 0, 0, 0}
|
||
|
|
+ {NULL, NULL, NULL, 0, 0, 0}
|
||
|
|
};
|
||
|
|
|
||
|
|
const char comment_chars[] = ";";
|
||
|
|
@@ -79,6 +80,13 @@ static struct mcu_type_s mcu_types[] =
|
||
|
|
{"avr5", AVR_ISA_AVR51, bfd_mach_avr5},
|
||
|
|
{"avr51", AVR_ISA_AVR51, bfd_mach_avr51},
|
||
|
|
{"avr6", AVR_ISA_AVR6, bfd_mach_avr6},
|
||
|
|
+ {"avrxmega1", AVR_ISA_XMEGA, bfd_mach_avrxmega1},
|
||
|
|
+ {"avrxmega2", AVR_ISA_XMEGA, bfd_mach_avrxmega2},
|
||
|
|
+ {"avrxmega3", AVR_ISA_XMEGA, bfd_mach_avrxmega3},
|
||
|
|
+ {"avrxmega4", AVR_ISA_XMEGA, bfd_mach_avrxmega4},
|
||
|
|
+ {"avrxmega5", AVR_ISA_XMEGA, bfd_mach_avrxmega5},
|
||
|
|
+ {"avrxmega6", AVR_ISA_XMEGA, bfd_mach_avrxmega6},
|
||
|
|
+ {"avrxmega7", AVR_ISA_XMEGA, bfd_mach_avrxmega7},
|
||
|
|
{"at90s1200", AVR_ISA_1200, bfd_mach_avr1},
|
||
|
|
{"attiny11", AVR_ISA_AVR1, bfd_mach_avr1},
|
||
|
|
{"attiny12", AVR_ISA_AVR1, bfd_mach_avr1},
|
||
|
|
@@ -185,6 +193,8 @@ static struct mcu_type_s mcu_types[] =
|
||
|
|
{"at90usb1287",AVR_ISA_AVR51, bfd_mach_avr51},
|
||
|
|
{"atmega2560", AVR_ISA_AVR6, bfd_mach_avr6},
|
||
|
|
{"atmega2561", AVR_ISA_AVR6, bfd_mach_avr6},
|
||
|
|
+ {"atxmega64a1", AVR_ISA_XMEGA, bfd_mach_avrxmega5},
|
||
|
|
+ {"atxmega128a1", AVR_ISA_XMEGA, bfd_mach_avrxmega7},
|
||
|
|
{NULL, 0, 0}
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -789,7 +799,12 @@ avr_operand (struct avr_opcodes_s *opcod
|
||
|
|
if (*str == '+')
|
||
|
|
{
|
||
|
|
++str;
|
||
|
|
- op_mask |= 1;
|
||
|
|
+ char *s;
|
||
|
|
+ for (s = opcode->opcode; *s; ++s)
|
||
|
|
+ {
|
||
|
|
+ if (*s == '+')
|
||
|
|
+ op_mask |= (1 << (15 - (s - opcode->opcode)));
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
/* attiny26 can do "lpm" and "lpm r,Z" but not "lpm r,Z+". */
|
||
|
|
@@ -906,6 +921,16 @@ avr_operand (struct avr_opcodes_s *opcod
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
|
||
|
|
+ case 'E':
|
||
|
|
+ {
|
||
|
|
+ unsigned int x;
|
||
|
|
+
|
||
|
|
+ x = avr_get_constant (str, 15);
|
||
|
|
+ str = input_line_pointer;
|
||
|
|
+ op_mask |= (x << 4);
|
||
|
|
+ }
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
case '?':
|
||
|
|
break;
|
||
|
|
|
||
|
|
--- include/opcode/avr.h.orig 2008-04-09 14:03:00.411627300 -0600
|
||
|
|
+++ include/opcode/avr.h 2008-04-09 16:34:28.329060900 -0600
|
||
|
|
@@ -30,6 +30,8 @@
|
||
|
|
#define AVR_ISA_BRK 0x0400 /* device has BREAK (on-chip debug) */
|
||
|
|
#define AVR_ISA_EIND 0x0800 /* device has >128K program memory (none yet) */
|
||
|
|
#define AVR_ISA_MOVW 0x1000 /* device has MOVW */
|
||
|
|
+#define AVR_ISA_SPMX 0x2000 /* device has SPM Z[+] */
|
||
|
|
+#define AVR_ISA_DES 0x4000 /* device has DES */
|
||
|
|
|
||
|
|
#define AVR_ISA_TINY1 (AVR_ISA_1200 | AVR_ISA_LPM)
|
||
|
|
#define AVR_ISA_PWMx (AVR_ISA_M8 | AVR_ISA_BRK)
|
||
|
|
@@ -53,6 +55,8 @@
|
||
|
|
#define AVR_ISA_94K (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | AVR_ISA_LPMX)
|
||
|
|
#define AVR_ISA_M323 (AVR_ISA_M161 | AVR_ISA_BRK)
|
||
|
|
#define AVR_ISA_M128 (AVR_ISA_M323 | AVR_ISA_ELPM | AVR_ISA_ELPMX)
|
||
|
|
+#define AVR_ISA_M256 (AVR_ISA_M128 | AVR_ISA_EIND)
|
||
|
|
+#define AVR_ISA_XMEGA (AVR_ISA_M256 | AVR_ISA_SPMX | AVR_ISA_DES)
|
||
|
|
|
||
|
|
#define AVR_ISA_ALL 0xFFFF
|
||
|
|
|
||
|
|
@@ -98,6 +102,7 @@
|
||
|
|
L - signed pc relative offset from -2048 to 2047
|
||
|
|
h - absolute code address (call, jmp)
|
||
|
|
S - immediate value from 0 to 7 (S = s << 4)
|
||
|
|
+ E - immediate value from 0 to 15, shifted left by 4 (des)
|
||
|
|
? - use this opcode entry if no parameters, else use next opcode entry
|
||
|
|
|
||
|
|
Order is important - some binary opcodes have more than one name,
|
||
|
|
@@ -158,7 +163,8 @@ AVR_INSN (reti, "", "1001010100011000
|
||
|
|
AVR_INSN (sleep,"", "1001010110001000", 1, AVR_ISA_1200, 0x9588)
|
||
|
|
AVR_INSN (break,"", "1001010110011000", 1, AVR_ISA_BRK, 0x9598)
|
||
|
|
AVR_INSN (wdr, "", "1001010110101000", 1, AVR_ISA_1200, 0x95a8)
|
||
|
|
-AVR_INSN (spm, "", "1001010111101000", 1, AVR_ISA_SPM, 0x95e8)
|
||
|
|
+AVR_INSN (spm, "?", "1001010111101000", 1, AVR_ISA_SPM, 0x95e8)
|
||
|
|
+AVR_INSN (spm, "z", "10010101111+1000", 1, AVR_ISA_SPMX, 0x95e8)
|
||
|
|
|
||
|
|
AVR_INSN (adc, "r,r", "000111rdddddrrrr", 1, AVR_ISA_1200, 0x1c00)
|
||
|
|
AVR_INSN (add, "r,r", "000011rdddddrrrr", 1, AVR_ISA_1200, 0x0c00)
|
||
|
|
@@ -272,3 +278,6 @@ AVR_INSN (st, "e,r", "100!001rrrrree-+
|
||
|
|
AVR_INSN (eicall, "", "1001010100011001", 1, AVR_ISA_EIND, 0x9519)
|
||
|
|
AVR_INSN (eijmp, "", "1001010000011001", 1, AVR_ISA_EIND, 0x9419)
|
||
|
|
|
||
|
|
+/* DES instruction for encryption and decryption */
|
||
|
|
+AVR_INSN (des, "E", "10010100EEEE1011", 1, AVR_ISA_DES, 0x940B)
|
||
|
|
+
|
||
|
|
Index: bfd/archures.c
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/src/src/bfd/archures.c,v
|
||
|
|
retrieving revision 1.130
|
||
|
|
diff -a -u -p -r1.130 archures.c
|
||
|
|
--- bfd/archures.c 4 Feb 2008 19:15:50 -0000 1.130
|
||
|
|
+++ bfd/archures.c 14 Feb 2008 18:01:43 -0000
|
||
|
|
@@ -352,6 +352,13 @@ DESCRIPTION
|
||
|
|
.#define bfd_mach_avr4 4
|
||
|
|
.#define bfd_mach_avr5 5
|
||
|
|
.#define bfd_mach_avr6 6
|
||
|
|
+.#define bfd_mach_avrxmega1 101
|
||
|
|
+.#define bfd_mach_avrxmega2 102
|
||
|
|
+.#define bfd_mach_avrxmega3 103
|
||
|
|
+.#define bfd_mach_avrxmega4 104
|
||
|
|
+.#define bfd_mach_avrxmega5 105
|
||
|
|
+.#define bfd_mach_avrxmega6 106
|
||
|
|
+.#define bfd_mach_avrxmega7 107
|
||
|
|
. bfd_arch_bfin, {* ADI Blackfin *}
|
||
|
|
.#define bfd_mach_bfin 1
|
||
|
|
. bfd_arch_cr16, {* National Semiconductor CompactRISC (ie CR16). *}
|
||
|
|
--- bfd/cpu-avr.c.orig 2008-08-08 23:35:12.000000000 -0600
|
||
|
|
+++ bfd/cpu-avr.c 2008-09-22 14:14:33.969548200 -0600
|
||
|
|
@@ -126,7 +126,29 @@ static const bfd_arch_info_type arch_inf
|
||
|
|
N (22, bfd_mach_avr51, "avr:51", FALSE, & arch_info_struct[9]),
|
||
|
|
|
||
|
|
/* 3-Byte PC. */
|
||
|
|
- N (22, bfd_mach_avr6, "avr:6", FALSE, NULL)
|
||
|
|
+ N (22, bfd_mach_avr6, "avr:6", FALSE, & arch_info_struct[10]),
|
||
|
|
+
|
||
|
|
+ /* Xmega 1 */
|
||
|
|
+ N (24, bfd_mach_avrxmega1, "avr:101", FALSE, & arch_info_struct[11]),
|
||
|
|
+
|
||
|
|
+ /* Xmega 2 */
|
||
|
|
+ N (24, bfd_mach_avrxmega2, "avr:102", FALSE, & arch_info_struct[12]),
|
||
|
|
+
|
||
|
|
+ /* Xmega 3 */
|
||
|
|
+ N (24, bfd_mach_avrxmega3, "avr:103", FALSE, & arch_info_struct[13]),
|
||
|
|
+
|
||
|
|
+ /* Xmega 4 */
|
||
|
|
+ N (24, bfd_mach_avrxmega4, "avr:104", FALSE, & arch_info_struct[14]),
|
||
|
|
+
|
||
|
|
+ /* Xmega 5 */
|
||
|
|
+ N (24, bfd_mach_avrxmega5, "avr:105", FALSE, & arch_info_struct[15]),
|
||
|
|
+
|
||
|
|
+ /* Xmega 6 */
|
||
|
|
+ N (24, bfd_mach_avrxmega6, "avr:106", FALSE, & arch_info_struct[16]),
|
||
|
|
+
|
||
|
|
+ /* Xmega 7 */
|
||
|
|
+ N (24, bfd_mach_avrxmega7, "avr:107", FALSE, NULL)
|
||
|
|
+
|
||
|
|
};
|
||
|
|
|
||
|
|
const bfd_arch_info_type bfd_avr_arch =
|
||
|
|
--- include/elf/avr.h.orig 2008-08-08 23:35:13.000000000 -0600
|
||
|
|
+++ include/elf/avr.h 2008-09-22 14:16:17.550944200 -0600
|
||
|
|
@@ -40,6 +40,13 @@
|
||
|
|
#define E_AVR_MACH_AVR5 5
|
||
|
|
#define E_AVR_MACH_AVR51 51
|
||
|
|
#define E_AVR_MACH_AVR6 6
|
||
|
|
+#define E_AVR_MACH_XMEGA1 101
|
||
|
|
+#define E_AVR_MACH_XMEGA2 102
|
||
|
|
+#define E_AVR_MACH_XMEGA3 103
|
||
|
|
+#define E_AVR_MACH_XMEGA4 104
|
||
|
|
+#define E_AVR_MACH_XMEGA5 105
|
||
|
|
+#define E_AVR_MACH_XMEGA6 106
|
||
|
|
+#define E_AVR_MACH_XMEGA7 107
|
||
|
|
|
||
|
|
/* Relocations. */
|
||
|
|
START_RELOC_NUMBERS (elf_avr_reloc_type)
|
||
|
|
Index: ld/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/src/src/ld/Makefile.am,v
|
||
|
|
retrieving revision 1.244
|
||
|
|
diff -a -u -p -r1.244 Makefile.am
|
||
|
|
--- ld/Makefile.am 24 Oct 2007 04:56:47 -0000 1.244
|
||
|
|
+++ ld/Makefile.am 14 Feb 2008 18:01:45 -0000
|
||
|
|
@@ -138,6 +138,13 @@ ALL_EMULATIONS = \
|
||
|
|
eavr4.o \
|
||
|
|
eavr5.o \
|
||
|
|
eavr6.o \
|
||
|
|
+ eavrxmega1.o \
|
||
|
|
+ eavrxmega2.o \
|
||
|
|
+ eavrxmega3.o \
|
||
|
|
+ eavrxmega4.o \
|
||
|
|
+ eavrxmega5.o \
|
||
|
|
+ eavrxmega6.o \
|
||
|
|
+ eavrxmega7.o \
|
||
|
|
ecoff_i860.o \
|
||
|
|
ecoff_sparc.o \
|
||
|
|
eelf32_spu.o \
|
||
|
|
@@ -622,6 +629,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
|
||
|
|
$(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
${GEN_DEPENDS}
|
||
|
|
${GENSCRIPTS} avr6 "$(tdir_avr2)"
|
||
|
|
+eavrxmega1.c: $(srcdir)/emulparams/avrxmega1.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega1 "$(tdir_avr2)"
|
||
|
|
+eavrxmega2.c: $(srcdir)/emulparams/avrxmega2.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega2 "$(tdir_avr2)"
|
||
|
|
+eavrxmega3.c: $(srcdir)/emulparams/avrxmega3.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega3 "$(tdir_avr2)"
|
||
|
|
+eavrxmega4.c: $(srcdir)/emulparams/avrxmega4.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega4 "$(tdir_avr2)"
|
||
|
|
+eavrxmega5.c: $(srcdir)/emulparams/avrxmega5.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega5 "$(tdir_avr2)"
|
||
|
|
+eavrxmega6.c: $(srcdir)/emulparams/avrxmega6.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega6 "$(tdir_avr2)"
|
||
|
|
+eavrxmega7.c: $(srcdir)/emulparams/avrxmega7.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega7 "$(tdir_avr2)"
|
||
|
|
ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
|
||
|
|
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
|
||
|
|
${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
|
||
|
|
Index: ld/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/src/src/ld/Makefile.in,v
|
||
|
|
retrieving revision 1.262
|
||
|
|
diff -a -u -p -r1.262 Makefile.in
|
||
|
|
--- ld/Makefile.in 24 Oct 2007 04:56:47 -0000 1.262
|
||
|
|
+++ ld/Makefile.in 14 Feb 2008 18:01:45 -0000
|
||
|
|
@@ -385,6 +385,13 @@ ALL_EMULATIONS = \
|
||
|
|
eavr4.o \
|
||
|
|
eavr5.o \
|
||
|
|
eavr6.o \
|
||
|
|
+ eavrxmega1.o \
|
||
|
|
+ eavrxmega2.o \
|
||
|
|
+ eavrxmega3.o \
|
||
|
|
+ eavrxmega4.o \
|
||
|
|
+ eavrxmega5.o \
|
||
|
|
+ eavrxmega6.o \
|
||
|
|
+ eavrxmega7.o \
|
||
|
|
ecoff_i860.o \
|
||
|
|
ecoff_sparc.o \
|
||
|
|
eelf32_spu.o \
|
||
|
|
@@ -1448,6 +1455,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
|
||
|
|
$(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
${GEN_DEPENDS}
|
||
|
|
${GENSCRIPTS} avr6 "$(tdir_avr2)"
|
||
|
|
+eavrxmega1.c: $(srcdir)/emulparams/avrxmega1.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega1 "$(tdir_avr2)"
|
||
|
|
+eavrxmega2.c: $(srcdir)/emulparams/avrxmega2.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega2 "$(tdir_avr2)"
|
||
|
|
+eavrxmega3.c: $(srcdir)/emulparams/avrxmega3.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega3 "$(tdir_avr2)"
|
||
|
|
+eavrxmega4.c: $(srcdir)/emulparams/avrxmega4.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega4 "$(tdir_avr2)"
|
||
|
|
+eavrxmega5.c: $(srcdir)/emulparams/avrxmega5.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega5 "$(tdir_avr2)"
|
||
|
|
+eavrxmega6.c: $(srcdir)/emulparams/avrxmega6.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega6 "$(tdir_avr2)"
|
||
|
|
+eavrxmega7.c: $(srcdir)/emulparams/avrxmega7.sh \
|
||
|
|
+ $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
|
||
|
|
+ ${GEN_DEPENDS}
|
||
|
|
+ ${GENSCRIPTS} avrxmega7 "$(tdir_avr2)"
|
||
|
|
ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
|
||
|
|
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
|
||
|
|
${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
|
||
|
|
--- ld/configure.tgt.orig 2008-08-08 23:35:13.000000000 -0600
|
||
|
|
+++ ld/configure.tgt 2008-09-22 14:17:42.272546800 -0600
|
||
|
|
@@ -107,7 +107,7 @@ xscale-*-coff) targ_emul=armcoff ;;
|
||
|
|
xscale-*-elf) targ_emul=armelf
|
||
|
|
;;
|
||
|
|
avr-*-*) targ_emul=avr2
|
||
|
|
- targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6"
|
||
|
|
+ targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6 avrxmega1 avrxmega2 avrxmega3 avrxmega4 avrxmega5 avrxmega6 avrxmega7"
|
||
|
|
;;
|
||
|
|
bfin-*-elf) targ_emul=elf32bfin;
|
||
|
|
targ_extra_emuls="elf32bfinfd"
|
||
|
|
Index: ld/emultempl/avrelf.em
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvs/src/src/ld/emultempl/avrelf.em,v
|
||
|
|
retrieving revision 1.5
|
||
|
|
diff -a -u -p -r1.5 avrelf.em
|
||
|
|
--- ld/emultempl/avrelf.em 17 Aug 2007 13:50:48 -0000 1.5
|
||
|
|
+++ ld/emultempl/avrelf.em 14 Feb 2008 18:01:45 -0000
|
||
|
|
@@ -71,8 +71,10 @@ avr_elf_${EMULATION_NAME}_before_allocat
|
||
|
|
|
||
|
|
gld${EMULATION_NAME}_before_allocation ();
|
||
|
|
|
||
|
|
- /* We only need stubs for the avr6 family. */
|
||
|
|
- if (strcmp ("${EMULATION_NAME}","avr6"))
|
||
|
|
+ /* We only need stubs for avr6, avrxmega6, and avrxmega7. */
|
||
|
|
+ if (strcmp ("${EMULATION_NAME}","avr6")
|
||
|
|
+ && strcmp ("${EMULATION_NAME}","avrxmega6")
|
||
|
|
+ && strcmp ("${EMULATION_NAME}","avrxmega7") )
|
||
|
|
avr_no_stubs = TRUE;
|
||
|
|
|
||
|
|
avr_elf_set_global_bfd_parameters ();
|
||
|
|
--- /dev/null 2008-02-14 11:03:14.488602600 -0700
|
||
|
|
+++ ld/emulparams/avrxmega1.sh 2008-02-14 09:08:29.531250000 -0700
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+ARCH=avr:101
|
||
|
|
+MACHINE=
|
||
|
|
+SCRIPT_NAME=avr
|
||
|
|
+OUTPUT_FORMAT="elf32-avr"
|
||
|
|
+MAXPAGESIZE=1
|
||
|
|
+EMBEDDED=yes
|
||
|
|
+TEMPLATE_NAME=elf32
|
||
|
|
+
|
||
|
|
+TEXT_LENGTH=1024K
|
||
|
|
+DATA_ORIGIN=0x802000
|
||
|
|
+DATA_LENGTH=0xffa0
|
||
|
|
+EXTRA_EM_FILE=avrelf
|
||
|
|
--- /dev/null 2008-02-14 11:03:18.394502600 -0700
|
||
|
|
+++ ld/emulparams/avrxmega2.sh 2008-02-14 09:08:29.546875000 -0700
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+ARCH=avr:102
|
||
|
|
+MACHINE=
|
||
|
|
+SCRIPT_NAME=avr
|
||
|
|
+OUTPUT_FORMAT="elf32-avr"
|
||
|
|
+MAXPAGESIZE=1
|
||
|
|
+EMBEDDED=yes
|
||
|
|
+TEMPLATE_NAME=elf32
|
||
|
|
+
|
||
|
|
+TEXT_LENGTH=1024K
|
||
|
|
+DATA_ORIGIN=0x802000
|
||
|
|
+DATA_LENGTH=0xffa0
|
||
|
|
+EXTRA_EM_FILE=avrelf
|
||
|
|
--- /dev/null 2008-02-14 11:03:22.050425000 -0700
|
||
|
|
+++ ld/emulparams/avrxmega3.sh 2008-02-14 09:08:29.546875000 -0700
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+ARCH=avr:103
|
||
|
|
+MACHINE=
|
||
|
|
+SCRIPT_NAME=avr
|
||
|
|
+OUTPUT_FORMAT="elf32-avr"
|
||
|
|
+MAXPAGESIZE=1
|
||
|
|
+EMBEDDED=yes
|
||
|
|
+TEMPLATE_NAME=elf32
|
||
|
|
+
|
||
|
|
+TEXT_LENGTH=1024K
|
||
|
|
+DATA_ORIGIN=0x802000
|
||
|
|
+DATA_LENGTH=0xffa0
|
||
|
|
+EXTRA_EM_FILE=avrelf
|
||
|
|
--- /dev/null 2008-02-14 11:03:25.784465400 -0700
|
||
|
|
+++ ld/emulparams/avrxmega4.sh 2008-02-14 09:08:29.546875000 -0700
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+ARCH=avr:104
|
||
|
|
+MACHINE=
|
||
|
|
+SCRIPT_NAME=avr
|
||
|
|
+OUTPUT_FORMAT="elf32-avr"
|
||
|
|
+MAXPAGESIZE=1
|
||
|
|
+EMBEDDED=yes
|
||
|
|
+TEMPLATE_NAME=elf32
|
||
|
|
+
|
||
|
|
+TEXT_LENGTH=1024K
|
||
|
|
+DATA_ORIGIN=0x802000
|
||
|
|
+DATA_LENGTH=0xffa0
|
||
|
|
+EXTRA_EM_FILE=avrelf
|
||
|
|
--- /dev/null 2008-02-14 11:03:25.784465400 -0700
|
||
|
|
+++ ld/emulparams/avrxmega5.sh 2008-02-14 09:08:29.546875000 -0700
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+ARCH=avr:105
|
||
|
|
+MACHINE=
|
||
|
|
+SCRIPT_NAME=avr
|
||
|
|
+OUTPUT_FORMAT="elf32-avr"
|
||
|
|
+MAXPAGESIZE=1
|
||
|
|
+EMBEDDED=yes
|
||
|
|
+TEMPLATE_NAME=elf32
|
||
|
|
+
|
||
|
|
+TEXT_LENGTH=1024K
|
||
|
|
+DATA_ORIGIN=0x802000
|
||
|
|
+DATA_LENGTH=0xffa0
|
||
|
|
+EXTRA_EM_FILE=avrelf
|
||
|
|
--- /dev/null 2008-02-14 11:03:25.784465400 -0700
|
||
|
|
+++ ld/emulparams/avrxmega6.sh 2008-02-14 09:08:29.546875000 -0700
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+ARCH=avr:106
|
||
|
|
+MACHINE=
|
||
|
|
+SCRIPT_NAME=avr
|
||
|
|
+OUTPUT_FORMAT="elf32-avr"
|
||
|
|
+MAXPAGESIZE=1
|
||
|
|
+EMBEDDED=yes
|
||
|
|
+TEMPLATE_NAME=elf32
|
||
|
|
+
|
||
|
|
+TEXT_LENGTH=1024K
|
||
|
|
+DATA_ORIGIN=0x802000
|
||
|
|
+DATA_LENGTH=0xffa0
|
||
|
|
+EXTRA_EM_FILE=avrelf
|
||
|
|
--- /dev/null 2008-02-14 11:03:25.784465400 -0700
|
||
|
|
+++ ld/emulparams/avrxmega7.sh 2008-02-14 09:08:29.546875000 -0700
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+ARCH=avr:107
|
||
|
|
+MACHINE=
|
||
|
|
+SCRIPT_NAME=avr
|
||
|
|
+OUTPUT_FORMAT="elf32-avr"
|
||
|
|
+MAXPAGESIZE=1
|
||
|
|
+EMBEDDED=yes
|
||
|
|
+TEMPLATE_NAME=elf32
|
||
|
|
+
|
||
|
|
+TEXT_LENGTH=1024K
|
||
|
|
+DATA_ORIGIN=0x802000
|
||
|
|
+DATA_LENGTH=0xffa0
|
||
|
|
+EXTRA_EM_FILE=avrelf
|
||
|
|
--- bfd/elf32-avr.c.old 2008-10-14 11:27:16.515625000 -0600
|
||
|
|
+++ bfd/elf32-avr.c 2008-10-14 11:46:35.453125000 -0600
|
||
|
|
@@ -1324,6 +1324,34 @@ bfd_elf_avr_final_write_processing (bfd
|
||
|
|
case bfd_mach_avr6:
|
||
|
|
val = E_AVR_MACH_AVR6;
|
||
|
|
break;
|
||
|
|
+
|
||
|
|
+ case bfd_mach_avrxmega1:
|
||
|
|
+ val = E_AVR_MACH_XMEGA1;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case bfd_mach_avrxmega2:
|
||
|
|
+ val = E_AVR_MACH_XMEGA2;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case bfd_mach_avrxmega3:
|
||
|
|
+ val = E_AVR_MACH_XMEGA3;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case bfd_mach_avrxmega4:
|
||
|
|
+ val = E_AVR_MACH_XMEGA4;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case bfd_mach_avrxmega5:
|
||
|
|
+ val = E_AVR_MACH_XMEGA5;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case bfd_mach_avrxmega6:
|
||
|
|
+ val = E_AVR_MACH_XMEGA6;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case bfd_mach_avrxmega7:
|
||
|
|
+ val = E_AVR_MACH_XMEGA7;
|
||
|
|
+ break;
|
||
|
|
}
|
||
|
|
|
||
|
|
elf_elfheader (abfd)->e_machine = EM_AVR;
|
||
|
|
@@ -1386,6 +1414,34 @@ elf32_avr_object_p (bfd *abfd)
|
||
|
|
case E_AVR_MACH_AVR6:
|
||
|
|
e_set = bfd_mach_avr6;
|
||
|
|
break;
|
||
|
|
+
|
||
|
|
+ case E_AVR_MACH_XMEGA1:
|
||
|
|
+ e_set = bfd_mach_avrxmega1;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case E_AVR_MACH_XMEGA2:
|
||
|
|
+ e_set = bfd_mach_avrxmega2;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case E_AVR_MACH_XMEGA3:
|
||
|
|
+ e_set = bfd_mach_avrxmega3;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case E_AVR_MACH_XMEGA4:
|
||
|
|
+ e_set = bfd_mach_avrxmega4;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case E_AVR_MACH_XMEGA5:
|
||
|
|
+ e_set = bfd_mach_avrxmega5;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case E_AVR_MACH_XMEGA6:
|
||
|
|
+ e_set = bfd_mach_avrxmega6;
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case E_AVR_MACH_XMEGA7:
|
||
|
|
+ e_set = bfd_mach_avrxmega7;
|
||
|
|
+ break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
return bfd_default_set_arch_mach (abfd, bfd_arch_avr,
|