* 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.
This commit is contained in:
Ulrich Weigand
2008-05-04 14:12:34 +00:00
parent ebd3bcc132
commit 515630c5e5
9 changed files with 127 additions and 84 deletions

View File

@@ -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)
{