1 Status: submitted for comments
3 2004-11-13 Daniel Jacobowitz <dan@debian.org>
5 * sparc-tdep.c (sparc_software_single_step): Handle stepping to NULL.
7 Index: gdb-6.3/gdb/sparc-tdep.c
8 ===================================================================
9 --- gdb-6.3.orig/gdb/sparc-tdep.c 2004-06-06 22:02:55.000000000 -0400
10 +++ gdb-6.3/gdb/sparc-tdep.c 2004-11-13 17:06:05.000000000 -0500
11 @@ -1026,10 +1026,10 @@
13 if (insert_breakpoints_p)
16 + CORE_ADDR pc, orig_npc;
18 pc = sparc_address_from_register (tdep->pc_regnum);
19 - npc = sparc_address_from_register (tdep->npc_regnum);
20 + orig_npc = npc = sparc_address_from_register (tdep->npc_regnum);
22 /* Analyze the instruction at PC. */
23 nnpc = sparc_analyze_control_transfer (pc, &npc);
24 @@ -1039,9 +1039,10 @@
25 target_insert_breakpoint (nnpc, nnpc_save);
27 /* Assert that we have set at least one breakpoint, and that
28 - they're not set at the same spot. */
29 - gdb_assert (npc != 0 || nnpc != 0);
30 - gdb_assert (nnpc != npc);
31 + they're not set at the same spot - unless we're going
32 + from here straight to NULL, i.e. a call or jump to 0. */
33 + gdb_assert (npc != 0 || nnpc != 0 || orig_npc == 0);
34 + gdb_assert (nnpc != npc || orig_npc == 0);