Hi,
The attached patch is against today's (040223) snapshot of binutils at
sources.redhat.com. It adds support for the new 1610, 1611, and 1612
which should be sampling about......... NOW!
Dmitry:
This needs to be sent to the binutils maintainer.
Regards,
Steve
diff -rU5 binutils-040223.orig/gas/config/tc-msp430.c
binutils-040223/gas/config/tc-msp430.c
--- binutils-040223.orig/gas/config/tc-msp430.c 2003-12-10 14:41:08.000000000
+0800
+++ binutils-040223/gas/config/tc-msp430.c 2004-02-23 19:35:33.000000000
+0800
@@ -117,10 +117,13 @@
{"msp430x156", MSP430_ISA_15, bfd_mach_msp15},
{"msp430x157", MSP430_ISA_15, bfd_mach_msp15},
{"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},
{"msp430x313", MSP430_ISA_31, bfd_mach_msp31},
{"msp430x314", MSP430_ISA_31, bfd_mach_msp31},
@@ -203,10 +206,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
" msp430xE423 msp430xE425 msp430E427\n"
diff -rU5 binutils-040223.orig/gas/po/es.po binutils-040223/gas/po/es.po
--- binutils-040223.orig/gas/po/es.po 2003-07-17 22:22:40.000000000 +0800
+++ binutils-040223/gas/po/es.po 2004-02-23 19:37:06.000000000 +0800
@@ -7331,10 +7331,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
" msp430x435 msp430x436 msp430x437\n"
@@ -7350,10 +7351,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
" msp430x435 msp430x436 msp430x437\n"
diff -rU5 binutils-040223.orig/gas/po/fr.po binutils-040223/gas/po/fr.po
--- binutils-040223.orig/gas/po/fr.po 2003-08-06 18:15:13.000000000 +0800
+++ binutils-040223/gas/po/fr.po 2004-02-23 19:37:40.000000000 +0800
@@ -7343,10 +7343,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
" msp430x435 msp430x436 msp430x437\n"
@@ -7362,10 +7363,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
" msp430x435 msp430x436 msp430x437\n"
diff -rU5 binutils-040223.orig/gas/po/gas.pot binutils-040223/gas/po/gas.pot
--- binutils-040223.orig/gas/po/gas.pot 2003-07-17 22:22:40.000000000 +0800
+++ binutils-040223/gas/po/gas.pot 2004-02-23 19:38:13.000000000 +0800
@@ -7168,10 +7168,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
diff -rU5 binutils-040223.orig/gas/po/tr.po binutils-040223/gas/po/tr.po
--- binutils-040223.orig/gas/po/tr.po 2003-08-21 21:52:53.000000000 +0800
+++ binutils-040223/gas/po/tr.po 2004-02-23 19:38:47.000000000 +0800
@@ -7346,10 +7346,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
" msp430x435 msp430x436 msp430x437\n"
@@ -7365,10 +7366,11 @@
" msp430x133 msp430x135\n"
" msp430x1331 msp430x1351\n"
" 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"
" msp430x435 msp430x436 msp430x437\n"
diff -rU5 binutils-040223.orig/ld/configure.tgt binutils-040223/ld/configure.tgt
--- binutils-040223.orig/ld/configure.tgt 2004-01-07 03:19:52.000000000
+0800
+++ binutils-040223/ld/configure.tgt 2004-02-23 19:41:28.000000000 +0800
@@ -447,11 +447,11 @@
targ_extra_emuls=elf64mmix
;;
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
msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427
msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449" ;;
alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
targ_emul=elf64alpha_fbsd
targ_extra_emuls="elf64alpha alpha"
tdir_alpha=`echo ${targ_alias} | sed -e
's/freebsd/freebsdecoff/'`
;;
diff -rU5 binutils-040223.orig/ld/emulparams/msp430all.sh
binutils-040223/ld/emulparams/msp430all.sh
--- binutils-040223.orig/ld/emulparams/msp430all.sh 2003-08-16
01:04:48.000000000 +0800
+++ binutils-040223/ld/emulparams/msp430all.sh 2004-02-23 19:50:33.000000000
+0800
@@ -284,11 +284,11 @@
MAXPAGESIZE=1
EMBEDDED=yes
TEMPLATE_NAME=generic
ROM_START=0x4000
-ROM_SIZE=0xbef0
+ROM_SIZE=0xbfe0
RAM_START=0x0200
RAM_SIZE=0x07ff
STACK=0xa00
fi
@@ -386,11 +386,11 @@
MAXPAGESIZE=1
EMBEDDED=yes
TEMPLATE_NAME=generic
ROM_START=0x4000
-ROM_SIZE=0xbef0
+ROM_SIZE=0xbfe0
RAM_START=0x0200
RAM_SIZE=0x07ff
STACK=0xa00
fi
@@ -410,10 +410,61 @@
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=
SCRIPT_NAME=elf32msp430_3
OUTPUT_FORMAT="elf32-msp430"
@@ -675,11 +726,11 @@
MAXPAGESIZE=1
EMBEDDED=yes
TEMPLATE_NAME=generic
ROM_START=0x4000
-ROM_SIZE=0xbef0
+ROM_SIZE=0xbfe0
RAM_START=0x0200
RAM_SIZE=0x07ff
STACK=0xa00
fi
diff -rU5 binutils-040223.orig/ld/Makefile.am binutils-040223/ld/Makefile.am
--- binutils-040223.orig/ld/Makefile.am 2004-01-07 03:19:52.000000000 +0800
+++ binutils-040223/ld/Makefile.am 2004-02-23 19:40:06.000000000 +0800
@@ -278,10 +278,13 @@
emsp430x156.o \
emsp430x157.o \
emsp430x167.o \
emsp430x168.o \
emsp430x169.o \
+ emsp430x1610.o \
+ emsp430x1611.o \
+ emsp430x1612.o \
emsp430x311.o \
emsp430x312.o \
emsp430x313.o \
emsp430x314.o \
emsp430x315.o \
@@ -1146,10 +1149,22 @@
${GENSCRIPTS} msp430x168 "$(tdir_msp430x168)" msp430all
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}
${GENSCRIPTS} msp430x311 "$(tdir_msp430x311)" msp430all
emsp430x312.c: $(srcdir)/emulparams/msp430all.sh \
diff -rU5 binutils-040223.orig/ld/Makefile.in binutils-040223/ld/Makefile.in
--- binutils-040223.orig/ld/Makefile.in 2004-01-07 03:19:52.000000000 +0800
+++ binutils-040223/ld/Makefile.in 2004-02-23 19:40:55.000000000 +0800
@@ -392,10 +392,13 @@
emsp430x156.o \
emsp430x157.o \
emsp430x167.o \
emsp430x168.o \
emsp430x169.o \
+ emsp430x1610.o \
+ emsp430x1611.o \
+ emsp430x1612.o \
emsp430x311.o \
emsp430x312.o \
emsp430x313.o \
emsp430x314.o \
emsp430x315.o \
@@ -1872,10 +1875,22 @@
${GENSCRIPTS} msp430x168 "$(tdir_msp430x168)" msp430all
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}
${GENSCRIPTS} msp430x311 "$(tdir_msp430x311)" msp430all
emsp430x312.c: $(srcdir)/emulparams/msp430all.sh \
