From 756bf753a351410e9b01cbdbddfb0a12fd36405e Mon Sep 17 00:00:00 2001 From: Jan Laukemann Date: Thu, 12 Oct 2017 13:29:39 +0200 Subject: [PATCH] changed iaca marker for binary regex --- osaca/osaca.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/osaca/osaca.py b/osaca/osaca.py index 10c7b83..00effc0 100755 --- a/osaca/osaca.py +++ b/osaca/osaca.py @@ -437,11 +437,15 @@ class Osaca(object): """ Extract instruction forms out of binary file using IACA markers. """ - self.marker = r'fs.*[\n]?.*addr32 nop' - for line in self.srcCode: + self.marker = r'fs addr32 nop' + part1 = r'64\sfs' + part2 = r'67 90\saddr32 nop' + for i, line in enumerate(self.srcCode): # Check if marker is in line if(self.marker in line): self.sem += 1 + elif(part1 in line or part2 in line): + self.sem += 0.5 elif(self.sem == 1): # We're in the marked code snippet # Check if the line is ASM code