update asm include system to GCC syntax

diff --git a/Makefile b/Makefile
index afc2a76c341da25d66d74dd6670fb60991d8ce2c..a52c798c85bd49470c62f0490daeeabc4f8f03a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ default: rom.asm x.asm
        ./rcf2ihex.py $< > $@
 
 %.asm: %.hex ns430-atoi.inc
-       msp430-objdump --disassemble-all --architecture=msp:54 $< \
+       msp430-objdump --disassemble-all --architecture=msp $< \
            | ./inc2syms.py ns430-atoi.inc | ./rename_regs.sh > $@
 
 %.h: %.mmap

diff --git a/inc2syms.py b/inc2syms.py
index ec036ed38fc6d05e1cb1a777f59fe5ec27b2d14b..8b58c29701a2fbdc517068053162c2e62355737f 100755 (executable)
--- a/inc2syms.py
+++ b/inc2syms.py
@@ -20,11 +20,13 @@ syms = {}
 addrs = {}
 print 'Symbol Table:'
 for line in incfile:
-    if 'equ' in line:
+    if line.startswith('.equ'):
         sp = line.strip().split()
-        syms[sp[0]] = '0x' + sp[2][:-1]
-        addrs[syms[sp[0]]] = sp[0]
-        print '  %s: %s' % (sp[0], syms[sp[0]])
+        sym = sp[1][:-1]
+        value = sp[2]
+        syms[sym] = value
+        addrs[syms[sym]] = sym
+        print '  %s: %s' % (sym, syms[sym])
 
 
 lines = asmfile.readlines()

diff --git a/mmap2inc.sh b/mmap2inc.sh
index 3e7e82f794cafc8c662d5b7c7a8a8c8751856504..eb2699204291a5c7cb7344ce4a7c3f25eec827e2 100755 (executable)
--- a/mmap2inc.sh
+++ b/mmap2inc.sh
@@ -5,6 +5,6 @@
 # transform to assembler equ's
 egrep -o '#.*' $1 \
     | cut -c 2- \
-    | tr -d = \
-    | awk '{print $1 " equ " $2}'
+    | tr -d =h \
+    | awk '{print ".equ " $1 ", 0x" $2}'