From: Nick Clifton Date: Mon, 26 Jul 2004 12:29:02 +0000 (+0000) Subject: Add new subtargets: msp430x1610, msp430x1611, msp430x1612, msp430x415, X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c05e9f04ff9e967a5833cd6780759710cb3c3036;p=binutils-gdb.git Add new subtargets: msp430x1610, msp430x1611, msp430x1612, msp430x415, msp430x417, msp430xG437, msp430xG438, msp430xG439. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index b9c6e8f25a9..cd6a5338382 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2004-07-26 Dmitry Diky + + * config/tc-msp430.c: Add new subtargets: msp430x1610, + msp430x1611, msp430x1612, msp430x415, msp430x417, msp430xG437, + msp430xG438, msp430xG439. + 2004-07-25 Daniel Jacobowitz * doc/as.texinfo (Section, PushSection): Correct documentation diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c index 082a9164599..2c3d81efbab 100644 --- a/gas/config/tc-msp430.c +++ b/gas/config/tc-msp430.c @@ -1,6 +1,6 @@ /* tc-msp430.c -- Assembler code for the Texas Instruments MSP430 - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by Dmitry Diky This file is part of GAS, the GNU Assembler. @@ -119,6 +119,9 @@ static struct mcu_type_s mcu_types[] = {"msp430x167", MSP430_ISA_16, bfd_mach_msp16}, {"msp430x168", MSP430_ISA_16, bfd_mach_msp16}, {"msp430x169", MSP430_ISA_16, bfd_mach_msp16}, + {"msp430x1610", MSP430_ISA_16, bfd_mach_msp16}, + {"msp430x1611", MSP430_ISA_16, bfd_mach_msp16}, + {"msp430x1612", MSP430_ISA_16, bfd_mach_msp16}, {"msp430x311", MSP430_ISA_31, bfd_mach_msp31}, {"msp430x312", MSP430_ISA_31, bfd_mach_msp31}, @@ -132,14 +135,21 @@ static struct mcu_type_s mcu_types[] = {"msp430x412", MSP430_ISA_41, bfd_mach_msp41}, {"msp430x413", MSP430_ISA_41, bfd_mach_msp41}, + {"msp430x415", MSP430_ISA_41, bfd_mach_msp41}, + {"msp430x417", MSP430_ISA_41, bfd_mach_msp41}, {"msp430xE423", MSP430_ISA_42, bfd_mach_msp42}, {"msp430xE425", MSP430_ISA_42, bfd_mach_msp42}, {"msp430xE427", MSP430_ISA_42, bfd_mach_msp42}, + {"msp430xW423", MSP430_ISA_42, bfd_mach_msp42}, {"msp430xW425", MSP430_ISA_42, bfd_mach_msp42}, {"msp430xW427", MSP430_ISA_42, bfd_mach_msp42}, + {"msp430xG437", MSP430_ISA_43, bfd_mach_msp43}, + {"msp430xG438", MSP430_ISA_43, bfd_mach_msp43}, + {"msp430xG439", MSP430_ISA_43, bfd_mach_msp43}, + {"msp430x435", MSP430_ISA_43, bfd_mach_msp43}, {"msp430x436", MSP430_ISA_43, bfd_mach_msp43}, {"msp430x437", MSP430_ISA_43, bfd_mach_msp43}, @@ -189,8 +199,7 @@ show_mcu_list (stream) } void -md_show_usage (stream) - FILE *stream; +md_show_usage (FILE *stream) { fprintf (stream, _("MSP430 options:\n" @@ -205,12 +214,14 @@ md_show_usage (stream) " msp430x147 msp430x148 msp430x149\n" " msp430x155 msp430x156 msp430x157\n" " msp430x167 msp430x168 msp430x169\n" + " msp430x1610 msp430x1611 msp430x1612\n" " msp430x311 msp430x312 msp430x313 msp430x314 msp430x315\n" " msp430x323 msp430x325\n" " msp430x336 msp430x337\n" - " msp430x412 msp430x413\n" + " msp430x412 msp430x413 msp430x415 msp430x417\n" " msp430xE423 msp430xE425 msp430E427\n" " msp430xW423 msp430xW425 msp430W427\n" + " msp430xG437 msp430xG438 msp430G439\n" " msp430x435 msp430x436 msp430x437\n" " msp430x447 msp430x448 msp430x449\n")); diff --git a/ld/ChangeLog b/ld/ChangeLog index 16ff5a6ec06..0759c576532 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2004-07-26 Dmitry Diky + + * Makefile.am: Add new subtargets: msp430x1610, msp430x1611, + msp430x1612, msp430x415, msp430x417, msp430xG437, msp430xG438, + msp430xG439. + * configure.tgt: Likewise. + * emulparams/msp430all.sh: Likewise. + * Makefile.in: Regenerate. + 2004-07-23 Nick Clifton * emultempl/elf32.em (_place_orphan): Use an already existing diff --git a/ld/Makefile.am b/ld/Makefile.am index 989203c99ac..359ab95e190 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -282,6 +282,9 @@ ALL_EMULATIONS = \ emsp430x167.o \ emsp430x168.o \ emsp430x169.o \ + emsp430x1610.o \ + emsp430x1611.o \ + emsp430x1612.o \ emsp430x311.o \ emsp430x312.o \ emsp430x313.o \ @@ -293,12 +296,17 @@ ALL_EMULATIONS = \ emsp430x337.o \ emsp430x412.o \ emsp430x413.o \ + emsp430x415.o \ + emsp430x417.o \ emsp430xE423.o \ emsp430xE425.o \ emsp430xE427.o \ emsp430xW423.o \ emsp430xW425.o \ emsp430xW427.o \ + emsp430xG437.o \ + emsp430xG438.o \ + emsp430xG439.o \ emsp430x435.o \ emsp430x436.o \ emsp430x437.o \ @@ -1155,6 +1163,18 @@ emsp430x169.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)" msp430all +emsp430x1610.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x1610 "$(tdir_msp430x1610)" msp430all +emsp430x1611.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x1611 "$(tdir_msp430x1611)" msp430all +emsp430x1612.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x1612 "$(tdir_msp430x1612)" msp430all emsp430x311.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \ ${GEN_DEPENDS} @@ -1199,6 +1219,14 @@ emsp430x413.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)" msp430all +emsp430x415.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x415 "$(tdir_msp430x415)" msp430all +emsp430x417.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x417 "$(tdir_msp430x417)" msp430all emsp430xE423.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} @@ -1223,6 +1251,18 @@ emsp430xW427.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} msp430xW427 "$(tdir_msp430xW427)" msp430all +emsp430xG437.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430xG437 "$(tdir_msp430xG437)" msp430all +emsp430xG438.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430xG438 "$(tdir_msp430xG438)" msp430all +emsp430xG439.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430xG439 "$(tdir_msp430xG439)" msp430all emsp430x435.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 4b0bf628661..f93664cc889 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -396,6 +396,9 @@ ALL_EMULATIONS = \ emsp430x167.o \ emsp430x168.o \ emsp430x169.o \ + emsp430x1610.o \ + emsp430x1611.o \ + emsp430x1612.o \ emsp430x311.o \ emsp430x312.o \ emsp430x313.o \ @@ -407,12 +410,17 @@ ALL_EMULATIONS = \ emsp430x337.o \ emsp430x412.o \ emsp430x413.o \ + emsp430x415.o \ + emsp430x417.o \ emsp430xE423.o \ emsp430xE425.o \ emsp430xE427.o \ emsp430xW423.o \ emsp430xW425.o \ emsp430xW427.o \ + emsp430xG437.o \ + emsp430xG438.o \ + emsp430xG439.o \ emsp430x435.o \ emsp430x436.o \ emsp430x437.o \ @@ -1881,6 +1889,18 @@ emsp430x169.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)" msp430all +emsp430x1610.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x1610 "$(tdir_msp430x1610)" msp430all +emsp430x1611.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x1611 "$(tdir_msp430x1611)" msp430all +emsp430x1612.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x1612 "$(tdir_msp430x1612)" msp430all emsp430x311.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \ ${GEN_DEPENDS} @@ -1925,6 +1945,14 @@ emsp430x413.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)" msp430all +emsp430x415.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x415 "$(tdir_msp430x415)" msp430all +emsp430x417.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430x417 "$(tdir_msp430x417)" msp430all emsp430xE423.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} @@ -1949,6 +1977,18 @@ emsp430xW427.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} msp430xW427 "$(tdir_msp430xW427)" msp430all +emsp430xG437.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430xG437 "$(tdir_msp430xG437)" msp430all +emsp430xG438.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430xG438 "$(tdir_msp430xG438)" msp430all +emsp430xG439.c: $(srcdir)/emulparams/msp430all.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} msp430xG439 "$(tdir_msp430xG439)" msp430all emsp430x435.c: $(srcdir)/emulparams/msp430all.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \ ${GEN_DEPENDS} diff --git a/ld/configure.tgt b/ld/configure.tgt index 26e27fe21cd..a26574e4d1a 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -454,7 +454,7 @@ mmix-*-*) targ_emul=mmo mn10200-*-*) targ_emul=mn10200 ;; mn10300-*-*) targ_emul=mn10300 ;; msp430-*-*) targ_emul=msp430x110 - targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449" ;; + targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x1610 msp430x1611 msp430x1612 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430x415 msp430x417 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430xG437 msp430xG438 msp430xG439 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449" ;; alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu) targ_emul=elf64alpha_fbsd targ_extra_emuls="elf64alpha alpha" diff --git a/ld/emulparams/msp430all.sh b/ld/emulparams/msp430all.sh index 3aa3289ee0d..e2ecc0d84f2 100644 --- a/ld/emulparams/msp430all.sh +++ b/ld/emulparams/msp430all.sh @@ -286,7 +286,7 @@ EMBEDDED=yes TEMPLATE_NAME=generic ROM_START=0x4000 -ROM_SIZE=0xbef0 +ROM_SIZE=0xbfe0 RAM_START=0x0200 RAM_SIZE=0x07ff @@ -388,7 +388,7 @@ EMBEDDED=yes TEMPLATE_NAME=generic ROM_START=0x4000 -ROM_SIZE=0xbef0 +ROM_SIZE=0xbfe0 RAM_START=0x0200 RAM_SIZE=0x07ff @@ -412,6 +412,57 @@ RAM_SIZE=0x07ff STACK=0xa00 fi +if [ "${MSP430_NAME}" = "msp430x1610" ] ; then +ARCH=msp:16 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0x8000 +ROM_SIZE=0x7fe0 +RAM_START=0x1100 +RAM_SIZE=0x13ff + +STACK=0x1400 +fi + +if [ "${MSP430_NAME}" = "msp430x1611" ] ; then +ARCH=msp:16 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0x4000 +ROM_SIZE=0xbfe0 +RAM_START=0x1100 +RAM_SIZE=0x27ff + +STACK=0x2800 +fi + +if [ "${MSP430_NAME}" = "msp430x1612" ] ; then +ARCH=msp:16 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0x2800 +ROM_SIZE=0xd7e0 +RAM_START=0x1100 +RAM_SIZE=0x13ff + +STACK=0x1400 +fi + if [ "${MSP430_NAME}" = "msp430x311" ] ; then ARCH=msp:31 MACHINE= @@ -599,6 +650,40 @@ RAM_SIZE=256 STACK=0x300 fi +if [ "${MSP430_NAME}" = "msp430x415" ] ; then +ARCH=msp:41 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0xc000 +ROM_SIZE=0x3fe0 +RAM_START=0x0200 +RAM_SIZE=512 + +STACK=0x400 +fi + +if [ "${MSP430_NAME}" = "msp430x417" ] ; then +ARCH=msp:41 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0x8000 +ROM_SIZE=0x7fe0 +RAM_START=0x0200 +RAM_SIZE=1024 + +STACK=0x600 +fi + if [ "${MSP430_NAME}" = "msp430x435" ] ; then ARCH=msp:43 MACHINE= @@ -662,7 +747,7 @@ TEMPLATE_NAME=generic ROM_START=0x8000 ROM_SIZE=0x7fe0 RAM_START=0x0200 -RAM_SIZE=1K +RAM_SIZE=1024 STACK=0x600 fi @@ -677,7 +762,7 @@ EMBEDDED=yes TEMPLATE_NAME=generic ROM_START=0x4000 -ROM_SIZE=0xbef0 +ROM_SIZE=0xbfe0 RAM_START=0x0200 RAM_SIZE=0x07ff @@ -747,11 +832,62 @@ TEMPLATE_NAME=generic ROM_START=0x8000 ROM_SIZE=0x7fe0 RAM_START=0x0200 -RAM_SIZE=1K +RAM_SIZE=1024 STACK=0x600 fi +if [ "${MSP430_NAME}" = "msp430xG437" ] ; then +ARCH=msp:43 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0x8000 +ROM_SIZE=0x7fe0 +RAM_START=0x0200 +RAM_SIZE=1024 + +STACK=0x600 +fi + +if [ "${MSP430_NAME}" = "msp430xG438" ] ; then +ARCH=msp:43 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0x4000 +ROM_SIZE=0xbef0 +RAM_START=0x0200 +RAM_SIZE=0x07ff + +STACK=0xa00 +fi + +if [ "${MSP430_NAME}" = "msp430xG439" ] ; then +ARCH=msp:43 +MACHINE= +SCRIPT_NAME=elf32msp430 +OUTPUT_FORMAT="elf32-msp430" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=generic + +ROM_START=0x1100 +ROM_SIZE=0xeee0 +RAM_START=0x0200 +RAM_SIZE=0x07ff + +STACK=0xa00 +fi + if [ "${MSP430_NAME}" = "msp430xW423" ] ; then ARCH=msp:42 MACHINE=