Merge ARM into the head. ARM will compile but may not actually work.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/arch/micro_asm.py b/src/arch/micro_asm.py
index 36c9919c0..3433a8076 100644
--- a/src/arch/micro_asm.py
+++ b/src/arch/micro_asm.py
@@ -141,7 +141,7 @@ def handle_statement(parser, container, statement):
         try:
             for label in statement.labels:
                 container.labels[label.text] = microop
-                if label.extern:
+                if label.is_extern:
                     container.externs[label.text] = microop
             container.add_microop(statement.mnemonic, microop)
         except:
@@ -242,7 +242,10 @@ def t_params_PARAMS(t):
 def t_asm_ID(t):
     r'[A-Za-z_]\w*'
     t.type = reserved_map.get(t.value, 'ID')
-    t.lexer.begin('params')
+    # If the ID is really "extern", we shouldn't start looking for parameters
+    # yet. The real ID, the label itself, is coming up.
+    if t.type != 'EXTERN':
+        t.lexer.begin('params')
     return t
 
 # If there is a label and you're -not- in the assembler (which would be caught