From 515630c5e5a3b481867b81031930664f8d1d9b77 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sun, 4 May 2008 14:12:34 +0000 Subject: * inferior.h (read_pc_pid, write_pc_pid): Remove. * regcache.h (regcache_read_pc, regcache_write_pc): Add prototypes. * regcache.c (read_pc_pid): Remove, replace by ... (regcache_read_pc): ... this function. (write_pc_pid): Remove, replace by ... (regcache_write_pc): ... this function. (read_pc, write_pc): Update. * infrun.c (displaced_step_prepare): Replace read_pc_pid and write_pc_pid by regcache_read_pc and regcache_write_pc. (displaced_step_fixup): Likewise. (resume): Likewise. Use regcache arch instead of current_gdbarch. (prepare_to_proceed): Likewise. (proceed): Likewise. (adjust_pc_after_break): Likewise. (handle_inferior_event): Likewise. * linux-nat.c (cancel_breakpoint): Likewise. * linux-thread-db.c (check_event): Likewise. * aix-thread.c (aix_thread_wait): Likewise. * tracepoint.c (trace_dump_command): Likewise. --- gdb/tracepoint.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gdb/tracepoint.c') diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index fbb1b27..40e3c0f 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -2558,6 +2558,8 @@ replace_comma (void *data) static void trace_dump_command (char *args, int from_tty) { + struct regcache *regcache; + struct gdbarch *gdbarch; struct tracepoint *t; struct action_line *action; char *action_exp, *next_comma; @@ -2594,8 +2596,11 @@ trace_dump_command (char *args, int from_tty) to the tracepoint PC. If not, then the current frame was collected during single-stepping. */ - stepping_frame = (t->address != (read_pc () - gdbarch_decr_pc_after_break - (current_gdbarch))); + regcache = get_current_regcache (); + gdbarch = get_regcache_arch (regcache); + + stepping_frame = (t->address != (regcache_read_pc (regcache) + - gdbarch_decr_pc_after_break (gdbarch))); for (action = t->actions; action; action = action->next) { -- cgit v1.1