simutils: find_inst_addr in dasmutil

simutils/dasmutil.py

@@ -127,17 +127,16 @@ def __iter__(self):
 
 ###############################################################################
 
+def find_inst_addr(binary, which, cyc_offset=0):
+  """Get a list of addresses of certain instructions, with given offset"""
+  dasm = DisAsm(binary)
+  allinst = [ inst for line, inst in dasm if inst ]
+  match = [ x+' ' in inst['inst'] for x in which for inst in allinst ]
+  return [ x['addr'] for i,x in enumerate(allinst) if match[i-cyc_offset] ]
+
 
 def ret_points(binary):
-  dasm = DisAsm(binary)
-  cnt = 1
-  for line, inst in dasm:
-    if inst:
-      if cnt==0: yield inst['addr']
-      if 'call' in inst['inst']:
-        cnt = -2
-        continue
-      cnt = cnt + 1
+  return find_inst_addr(binary, ['call'], 3)
 
 
 ###############################################################################

simutils/simutil.py

@@ -47,7 +47,7 @@ def trace_ex(binary):
   with open(os.devnull, 'w') as fnull:
     pasim = Popen(pasim_cmd, stderr=PIPE, stdout=fnull)
     ro = re.compile(r'^.*PRR: ([0-9]{8}) .* PC : 0*([0-9a-fA-F]{1,8})') # regex object
-    pipeline = [None, None] # initial pipline fill
+    pipeline = [None, None] # initial pipeline fill
     cyc = 0
     for line in pasim.stderr:
       mo = ro.match(line) # matcher object