about summary refs log tree commit diff stats
path: root/miasm2/core/parse_asm.py
diff options
context:
space:
mode:
authorFabrice Desclaux <fabrice.desclaux@cea.fr>2017-02-15 17:06:02 +0100
committerFabrice Desclaux <fabrice.desclaux@cea.fr>2017-03-13 14:13:14 +0100
commit8651b88eda697ff955757847391e3759dbac26b2 (patch)
tree605e703df0ae01b07572f0b3dc123a389d6a5b21 /miasm2/core/parse_asm.py
parent397af784e950e4df8a76b4e2806e743193580943 (diff)
downloadfocaccia-miasm-8651b88eda697ff955757847391e3759dbac26b2.tar.gz
focaccia-miasm-8651b88eda697ff955757847391e3759dbac26b2.zip
Asmbloc: rename asm_constraint to AsmConstraint
Diffstat (limited to 'miasm2/core/parse_asm.py')
-rw-r--r--miasm2/core/parse_asm.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/miasm2/core/parse_asm.py b/miasm2/core/parse_asm.py
index bceab949..514fee3b 100644
--- a/miasm2/core/parse_asm.py
+++ b/miasm2/core/parse_asm.py
@@ -116,8 +116,8 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None):
     if symbol_pool is None:
         symbol_pool = asmbloc.AsmSymbolPool()
 
-    C_NEXT = asmbloc.asm_constraint.c_next
-    C_TO = asmbloc.asm_constraint.c_to
+    C_NEXT = asmbloc.AsmConstraint.c_next
+    C_TO = asmbloc.AsmConstraint.c_to
 
     lines = []
     # parse each line
@@ -263,8 +263,8 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None):
             state = STATE_IN_BLOC
             if block_to_nlink:
                 block_to_nlink.addto(
-                    asmbloc.asm_constraint(cur_block.label,
-                                           C_NEXT))
+                    asmbloc.AsmConstraint(cur_block.label,
+                                          C_NEXT))
             block_to_nlink = None
             continue
 
@@ -284,7 +284,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None):
             elif isinstance(line, asmbloc.AsmLabel):
                 if block_to_nlink:
                     cur_block.addto(
-                        asmbloc.asm_constraint(line, C_NEXT))
+                        asmbloc.AsmConstraint(line, C_NEXT))
                     block_to_nlink = None
                 state = STATE_NO_BLOC
                 continue
@@ -303,7 +303,7 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None):
                             continue
                         if dst in mnemo.regs.all_regs_ids:
                             continue
-                        cur_block.addto(asmbloc.asm_constraint(dst.name, C_TO))
+                        cur_block.addto(asmbloc.AsmConstraint(dst.name, C_TO))
 
                 if not line.splitflow():
                     block_to_nlink = None