Merge remote-tracking branch 'origin/GP-5195_d-millar_missing_stack'

This commit is contained in:
Ryan Kurtz 2024-12-17 11:31:15 -05:00
commit 9f8a08cb09

View file

@ -1344,7 +1344,8 @@ def put_frames():
path = STACK_PATTERN.format(procnum=nproc, tnum=nthrd)
(values, keys) = create_generic(path)
STATE.trace.proxy_object_path(path).retain_values(keys)
return
# NB: some flavors of dbgmodel lack Attributes, so we grab Instruction Offset regardless
#return
mapper = STATE.trace.memory_mapper
keys = []
@ -1357,6 +1358,8 @@ def put_frames():
base, offset_inst = mapper.map(nproc, f.InstructionOffset)
if base != offset_inst.space:
STATE.trace.create_overlay_space(base, offset_inst.space)
fobj.set_value('Instruction Offset', offset_inst)
if not util.dbg.use_generics:
base, offset_stack = mapper.map(nproc, f.StackOffset)
if base != offset_stack.space:
STATE.trace.create_overlay_space(base, offset_stack.space)
@ -1366,7 +1369,6 @@ def put_frames():
base, offset_frame = mapper.map(nproc, f.FrameOffset)
if base != offset_frame.space:
STATE.trace.create_overlay_space(base, offset_frame.space)
fobj.set_value('Instruction Offset', offset_inst)
fobj.set_value('Stack Offset', offset_stack)
fobj.set_value('Return Offset', offset_ret)
fobj.set_value('Frame Offset', offset_frame)