From 81c4a259cde3366e6e8548c6067711ed15735d27 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sun, 29 Apr 2007 01:51:51 +0000 Subject: * regcache.c (deprecated_read_register_gen): Remove, inline ... (read_register): ... here. (deprecated_write_register_gen): Remove, inline ... (write_register): ... here. * regcache.h (deprecated_read_register_gen): Remove prototype. (deprecated_write_register_gen): Likewise. * remote-sim.c (gdbsim_store_register): Replace call to deprecated_read_register_gen with regcache_cooked_read. * target.c (debug_print_register): Replace calls to deprecated_read_register_gen and read_register with regcache_cooked_read. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/regcache.c | 24 ++++++------------------ gdb/regcache.h | 17 ----------------- gdb/remote-sim.c | 2 +- gdb/target.c | 12 ++++++------ 5 files changed, 28 insertions(+), 42 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f023281..19503bc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,20 @@ 2007-04-28 Ulrich Weigand + * regcache.c (deprecated_read_register_gen): Remove, inline ... + (read_register): ... here. + (deprecated_write_register_gen): Remove, inline ... + (write_register): ... here. + * regcache.h (deprecated_read_register_gen): Remove prototype. + (deprecated_write_register_gen): Likewise. + + * remote-sim.c (gdbsim_store_register): Replace call to + deprecated_read_register_gen with regcache_cooked_read. + * target.c (debug_print_register): Replace calls to + deprecated_read_register_gen and read_register with + regcache_cooked_read. + +2007-04-28 Ulrich Weigand + * hpux-thread.c (hpux_thread_store_registers): Use regcache_raw_collect, not regcache_raw_read. * irix5-nat.c (fetch_core_registers): Use regcache_raw_supply, diff --git a/gdb/regcache.c b/gdb/regcache.c index 11810ef..37e4bdc 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -574,14 +574,6 @@ regcache_raw_write_unsigned (struct regcache *regcache, int regnum, } void -deprecated_read_register_gen (int regnum, gdb_byte *buf) -{ - gdb_assert (current_regcache != NULL); - gdb_assert (current_regcache->descr->gdbarch == current_gdbarch); - regcache_cooked_read (current_regcache, regnum, buf); -} - -void regcache_cooked_read (struct regcache *regcache, int regnum, gdb_byte *buf) { gdb_assert (regnum >= 0); @@ -685,14 +677,6 @@ regcache_raw_write (struct regcache *regcache, int regnum, } void -deprecated_write_register_gen (int regnum, gdb_byte *buf) -{ - gdb_assert (current_regcache != NULL); - gdb_assert (current_regcache->descr->gdbarch == current_gdbarch); - regcache_cooked_write (current_regcache, regnum, buf); -} - -void regcache_cooked_write (struct regcache *regcache, int regnum, const gdb_byte *buf) { @@ -806,7 +790,9 @@ ULONGEST read_register (int regnum) { gdb_byte *buf = alloca (register_size (current_gdbarch, regnum)); - deprecated_read_register_gen (regnum, buf); + gdb_assert (current_regcache != NULL); + gdb_assert (current_regcache->descr->gdbarch == current_gdbarch); + regcache_cooked_read (current_regcache, regnum, buf); return (extract_unsigned_integer (buf, register_size (current_gdbarch, regnum))); } @@ -841,7 +827,9 @@ write_register (int regnum, LONGEST val) size = register_size (current_gdbarch, regnum); buf = alloca (size); store_signed_integer (buf, size, (LONGEST) val); - deprecated_write_register_gen (regnum, buf); + gdb_assert (current_regcache != NULL); + gdb_assert (current_regcache->descr->gdbarch == current_gdbarch); + regcache_cooked_write (current_regcache, regnum, buf); } void diff --git a/gdb/regcache.h b/gdb/regcache.h index 88192c7..c8ceca6 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -157,23 +157,6 @@ extern struct regcache *regcache_dup_no_passthrough (struct regcache *regcache); extern void regcache_cpy (struct regcache *dest, struct regcache *src); extern void regcache_cpy_no_passthrough (struct regcache *dest, struct regcache *src); -/* NOTE: cagney/2002-11-02: The below have been superseded by the - regcache_cooked_*() functions found above, and the frame_*() - functions found in "frame.h". Take care though, often more than a - simple substitution is required when updating the code. The - change, as far as practical, should avoid adding references to - global variables (e.g., current_regcache, current_frame, - current_gdbarch or the selected frame) and instead refer to - the FRAME or REGCACHE that has been passed into the containing - function as parameters. Consequently, the change typically - involves modifying the containing function so that it takes a FRAME - or REGCACHE parameter. In the case of an architecture vector - method, there should already be a non-deprecated variant that is - parameterized with FRAME or REGCACHE. */ - -extern void deprecated_read_register_gen (int regnum, gdb_byte *myaddr); -extern void deprecated_write_register_gen (int regnum, gdb_byte *myaddr); - /* NOTE: cagney/2002-11-05: This function has been superseeded by regcache_raw_supply(). */ extern void deprecated_registers_fetched (void); diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index f9fee8b..2d8f3a7 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -353,7 +353,7 @@ gdbsim_store_register (int regno) { char tmp[MAX_REGISTER_SIZE]; int nr_bytes; - deprecated_read_register_gen (regno, tmp); + regcache_cooked_read (current_regcache, regno, tmp); nr_bytes = sim_store_register (gdbsim_desc, REGISTER_SIM_REGNO (regno), tmp, register_size (current_gdbarch, regno)); diff --git a/gdb/target.c b/gdb/target.c index 42b0a1d..0299f9a 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2160,19 +2160,19 @@ debug_print_register (const char * func, int regno) fprintf_unfiltered (gdb_stdlog, "(%d)", regno); if (regno >= 0) { - int i; + int i, size = register_size (current_gdbarch, regno); unsigned char buf[MAX_REGISTER_SIZE]; - deprecated_read_register_gen (regno, buf); + regcache_cooked_read (current_regcache, regno, buf); fprintf_unfiltered (gdb_stdlog, " = "); - for (i = 0; i < register_size (current_gdbarch, regno); i++) + for (i = 0; i < size; i++) { fprintf_unfiltered (gdb_stdlog, "%02x", buf[i]); } - if (register_size (current_gdbarch, regno) <= sizeof (LONGEST)) + if (size <= sizeof (LONGEST)) { + ULONGEST val = extract_unsigned_integer (buf, size); fprintf_unfiltered (gdb_stdlog, " 0x%s %s", - paddr_nz (read_register (regno)), - paddr_d (read_register (regno))); + paddr_nz (val), paddr_d (val)); } } fprintf_unfiltered (gdb_stdlog, "\n"); -- cgit v1.1