M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

Commit missing parts of cf41890.

This commit is contained in:
whitequark 2016-02-24 17:53:13 +00:00
parent cf41890255
commit a829b8a6fc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/compiler/targets.py
View File

@ -151,7 +151,11 @@ class Target:
if addresses == []:
return []
offset_addresses = [hex(addr) for addr in addresses]
# We got a list of return addresses, i.e. addresses of instructions
# just after the call. Offset them back to get an address somewhere
# inside the call instruction (or its delay slot), since that's what
# the backtrace entry should point at.
offset_addresses = [hex(addr - 1) for addr in addresses]
with RunTool([self.triple + "-addr2line", "--addresses", "--functions", "--inlines",
"--exe={library}"] + offset_addresses,
library=library) \
@ -164,7 +168,7 @@ class Target:
except StopIteration:
break
if address_or_function[:2] == "0x":
address = int(address_or_function[2:], 16)
address = int(address_or_function[2:], 16) + 1 # remove offset
function = next(lines)
else:
address = backtrace[-1][4] # inlined