about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorserpilliere <devnull@localhost>2012-12-03 10:35:06 +0100
committerserpilliere <devnull@localhost>2012-12-03 10:35:06 +0100
commitf9a6599e88502ae3c7555df6af411a446ddf2900 (patch)
tree46618430caf72da25bbaf8caf81f35073ac09668
parente7945a8c1177ed047e4968bd9b69e4ec79a7d292 (diff)
downloadmiasm-f9a6599e88502ae3c7555df6af411a446ddf2900.tar.gz
miasm-f9a6599e88502ae3c7555df6af411a446ddf2900.zip
asmbloc: Use symbol_pool methods rather than attributes
-rw-r--r--miasm/core/asmbloc.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/miasm/core/asmbloc.py b/miasm/core/asmbloc.py
index eb5708d8..63d49ad7 100644
--- a/miasm/core/asmbloc.py
+++ b/miasm/core/asmbloc.py
@@ -263,10 +263,8 @@ def dis_bloc(mnemo, pool_bin, cur_bloc, offset, job_done, symbol_pool,
             offsets_to_dis = [pool_bin.offset]
             break
         if pool_bin.offset in job_done:
-            #if not pool_bin.offset in symbol_pool.s_offset:
-            #    # XXX bug: we start dis in middle of bb
-            if pool_bin.offset in symbol_pool.s_offset:
-                l = symbol_pool.s_offset[pool_bin.offset]
+            l = symbol_pool.getby_offset(pool_bin.offset)
+            if l != None:
                 c = asm_constraint(l, asm_constraint.c_next)
                 cur_bloc.bto = [c]
                 offsets_to_dis = [pool_bin.offset]