Merge pull request #90 from nedwill/thumb_fix

Fix thumb bug on UI
This commit is contained in:
George Hotz 2015-03-21 14:02:49 -07:00
commit 348539201d
2 changed files with 2 additions and 1 deletions

View File

@ -384,6 +384,7 @@ class Trace:
self.analysisready = False
minclnum = self.db.get_minclnum()
maxclnum = self.db.get_maxclnum()
self.program.read_asm_file()
self.flow = qira_analysis.get_instruction_flow(self, self.program, minclnum, maxclnum)
self.dmap = qira_analysis.get_hacked_depth_map(self.flow, self.program)
qira_analysis.analyse_calls(self.program, self.flow)

View File

@ -396,7 +396,7 @@ class Tags:
if tag == "instruction":
dat = self.static.memory(self.address, 0x10)
# arch should probably come from the address with fallthrough
self.backing['instruction'] = Instruction(dat, self.address, self.static['arch'])
self.backing['instruction'] = Instruction(dat, self.address, self.static[self.address]['arch'])
self.backing['len'] = self.backing['instruction'].size()
self.backing['type'] = 'instruction'
return self.backing[tag]