diff options
| author |   kettenis <kettenis@openbsd.org> | 2005-11-08 22:03:07 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2005-11-08 22:03:07 +0000 |
| commit | b297fcd9d14e725f34dbede022f547028f85ce63 (patch) | |
| tree | 462a03a57ffe46864cb31dad3fe46cc647f1e054 | |
| parent | Remove some leftover debugging cruft and an unnecessary check. (diff) | |
| download | wireguard-openbsd-b297fcd9d14e725f34dbede022f547028f85ce63.tar.xz wireguard-openbsd-b297fcd9d14e725f34dbede022f547028f85ce63.zip | |
Fix single step buglet on sparc/sparc64.
| -rw-r--r-- | gnu/usr.bin/binutils/gdb/sparc-tdep.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/usr.bin/binutils/gdb/sparc-tdep.c b/gnu/usr.bin/binutils/gdb/sparc-tdep.c index 05b42aca59c..a472bb27e61 100644 --- a/gnu/usr.bin/binutils/gdb/sparc-tdep.c +++ b/gnu/usr.bin/binutils/gdb/sparc-tdep.c @@ -1026,10 +1026,10 @@ sparc_software_single_step (enum target_signal sig, int insert_breakpoints_p) if (insert_breakpoints_p) { - CORE_ADDR pc; + CORE_ADDR pc, orig_npc; pc = sparc_address_from_register (tdep->pc_regnum); - npc = sparc_address_from_register (tdep->npc_regnum); + orig_npc = npc = sparc_address_from_register (tdep->npc_regnum); /* Analyze the instruction at PC. */ nnpc = sparc_analyze_control_transfer (pc, &npc); @@ -1039,9 +1039,10 @@ sparc_software_single_step (enum target_signal sig, int insert_breakpoints_p) target_insert_breakpoint (nnpc, nnpc_save); /* Assert that we have set at least one breakpoint, and that - they're not set at the same spot. */ - gdb_assert (npc != 0 || nnpc != 0); - gdb_assert (nnpc != npc); + they're not set at the same spot - unless we're going + from here straight to NULL, i.e. a call or jump to 0. */ + gdb_assert (npc != 0 || nnpc != 0 || orig_npc == 0); + gdb_assert (nnpc != npc || orig_npc == 0); } else { |