Skip to content

Commit 76e4ac5

Browse files
committed
Merge remote-tracking branch 'origin/GP-5215_d-millar_dbgmodel_reg_update'
2 parents dacc9b2 + 6ea0f57 commit 76e4ac5

File tree

1 file changed

+6
-2
lines changed
  • Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg

1 file changed

+6
-2
lines changed

Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,10 @@ def putreg():
583583
STATE.trace.create_overlay_space('register', rpath)
584584
path = USER_REGS_PATTERN.format(procnum=nproc, tnum=nthrd)
585585
(values, keys) = create_generic(path)
586-
return {'missing': STATE.trace.put_registers(rpath, values)}
586+
nframe = util.selected_frame()
587+
# NB: We're going to update the Register View for non-zero stack frames
588+
if nframe == 0:
589+
return {'missing': STATE.trace.put_registers(rpath, values)}
587590

588591
nproc = util.selected_process()
589592
if nproc < 0:
@@ -604,7 +607,8 @@ def putreg():
604607
value = 0
605608
try:
606609
values.append(mapper.map_value(nproc, name, value))
607-
robj.set_value(name, hex(value))
610+
if util.dbg.use_generics is False:
611+
robj.set_value(name, hex(value))
608612
except Exception:
609613
pass
610614
return {'missing': STATE.trace.put_registers(space, values)}

0 commit comments

Comments
 (0)