aboutsummaryrefslogtreecommitdiff
path: root/gdb/infrun.c
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2002-08-17 06:12:52 +0000
committerJoel Brobecker <brobecker@gnat.com>2002-08-17 06:12:52 +0000
commitc8edd8b484eaa59ae60a2b3c89f5772b98aefad1 (patch)
tree8d91d7df37ec6abf1d7f1a17ff682465cd5b1bda /gdb/infrun.c
parent238617f6788c017a70157ce0d37cb7a35088df00 (diff)
downloadgdb-c8edd8b484eaa59ae60a2b3c89f5772b98aefad1.zip
gdb-c8edd8b484eaa59ae60a2b3c89f5772b98aefad1.tar.gz
gdb-c8edd8b484eaa59ae60a2b3c89f5772b98aefad1.tar.bz2
* alpha-osf1-tdep.c (alpha_osf1_init_abi): Unfortunately,
procfs appears to be broken when debugging on multi-processor machines. So enable software single stepping in order to avoid using the procfs interface to do next/step operations, using internal breakpoints instead. * infrun.c (handle_inferior_event): Readjust the stop_pc by DECR_PC_AFTER_BREAK when hitting a single step breakpoint, to make this pc address equal to the value it would have if the system stepping capability was used. Also set a new flag used to ensure that we don't readjust the PC one more time later. * breakpoint.c (bpstat_stop_status): Do not adjust the PC address by DECR_PC_AFTER_BREAK when software single step is in use for this architecture, as this has already been taken care of in handle_inferior_event().
Diffstat (limited to 'gdb/infrun.c')
-rw-r--r--gdb/infrun.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 8375b69..98867cc 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1408,6 +1408,7 @@ handle_inferior_event (struct execution_control_state *ecs)
{
CORE_ADDR tmp;
int stepped_after_stopped_by_watchpoint;
+ int sw_single_step_trap_p = 0;
/* Cache the last pid/waitstatus. */
target_last_wait_ptid = ecs->ptid;
@@ -1888,6 +1889,18 @@ handle_inferior_event (struct execution_control_state *ecs)
}
else if (SOFTWARE_SINGLE_STEP_P () && singlestep_breakpoints_inserted_p)
{
+ /* Readjust the stop_pc as it is off by DECR_PC_AFTER_BREAK
+ compared to the value it would have if the system stepping
+ capability was used. This allows the rest of the code in
+ this function to use this address without having to worry
+ whether software single step is in use or not. */
+ if (DECR_PC_AFTER_BREAK)
+ {
+ stop_pc -= DECR_PC_AFTER_BREAK;
+ write_pc_pid (stop_pc, ecs->ptid);
+ }
+
+ sw_single_step_trap_p = 1;
ecs->random_signal = 0;
}
}
@@ -2111,14 +2124,16 @@ handle_inferior_event (struct execution_control_state *ecs)
(&stop_pc,
/* Pass TRUE if our reason for stopping is something other
than hitting a breakpoint. We do this by checking that
+ either we detected earlier a software single step trap or
1) stepping is going on and 2) we didn't hit a breakpoint
in a signal handler without an intervening stop in
sigtramp, which is detected by a new stack pointer value
below any usual function calling stack adjustments. */
- (currently_stepping (ecs)
- && prev_pc != stop_pc - DECR_PC_AFTER_BREAK
- && !(step_range_end
- && INNER_THAN (read_sp (), (step_sp - 16)))));
+ sw_single_step_trap_p
+ || (currently_stepping (ecs)
+ && prev_pc != stop_pc - DECR_PC_AFTER_BREAK
+ && !(step_range_end
+ && INNER_THAN (read_sp (), (step_sp - 16)))));
/* Following in case break condition called a
function. */
stop_print_frame = 1;