From 8e6270ff8a3e832fae37baa001fb72de7bc47a45 Mon Sep 17 00:00:00 2001 From: kettenis Date: Sun, 12 Jun 2005 19:54:20 +0000 Subject: [PATCH] * hppa-tdep.c (hppa_frame_prev_register) (hppa_fallback_frame_prev_register) (hppa_stub_frame_prev_register): Change type of last argument to `gdb_byte *'. (hppa_fetch_pointer_argument): Tweak comment. Use get_frame_register_unsigned instead of get_frame_register. (hppa32_return_value, hppa64_return_value): Change type of readbuf and writebuf arguments to `gdb_byte *'. Remove unecessary casts and local variables. (hppa_pseudo_register_read): Change type of last argument to `gdb_byte *'. --- gdb/ChangeLog | 12 ++++++++++++ gdb/hppa-tdep.c | 35 ++++++++++++++++------------------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9187eefb88..bd4eb0d64a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2005-06-12 Mark Kettenis + * hppa-tdep.c (hppa_frame_prev_register) + (hppa_fallback_frame_prev_register) + (hppa_stub_frame_prev_register): Change type of last argument to + `gdb_byte *'. + (hppa_fetch_pointer_argument): Tweak comment. Use + get_frame_register_unsigned instead of get_frame_register. + (hppa32_return_value, hppa64_return_value): Change type of readbuf + and writebuf arguments to `gdb_byte *'. Remove unecessary casts + and local variables. + (hppa_pseudo_register_read): Change type of last argument to + `gdb_byte *'. + * m68k-tdep.c (m68k_frame_prev_register): Change type of last argument to `gdb_byte *'. diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 93f015f72d..4db6ec85f2 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -1035,7 +1035,7 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, static enum return_value_convention hppa32_return_value (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, - void *readbuf, const void *writebuf) + gdb_byte *readbuf, const gdb_byte *writebuf) { if (TYPE_LENGTH (type) <= 2 * 4) { @@ -1061,9 +1061,9 @@ hppa32_return_value (struct gdbarch *gdbarch, for (b = part; b < TYPE_LENGTH (type); b += 4) { if (readbuf != NULL) - regcache_cooked_read (regcache, reg, (char *) readbuf + b); + regcache_cooked_read (regcache, reg, readbuf + b); if (writebuf != NULL) - regcache_cooked_write (regcache, reg, (const char *) writebuf + b); + regcache_cooked_write (regcache, reg, writebuf + b); reg++; } return RETURN_VALUE_REGISTER_CONVENTION; @@ -1075,7 +1075,7 @@ hppa32_return_value (struct gdbarch *gdbarch, static enum return_value_convention hppa64_return_value (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, - void *readbuf, const void *writebuf) + gdb_byte *readbuf, const gdb_byte *writebuf) { int len = TYPE_LENGTH (type); int regnum, offset; @@ -1139,12 +1139,11 @@ hppa64_return_value (struct gdbarch *gdbarch, if (readbuf) { - char *buf = readbuf; while (len > 0) { regcache_cooked_read_part (regcache, regnum, offset, - min (len, 8), buf); - buf += min (len, 8); + min (len, 8), readbuf); + readbuf += min (len, 8); len -= min (len, 8); regnum++; } @@ -1152,12 +1151,11 @@ hppa64_return_value (struct gdbarch *gdbarch, if (writebuf) { - const char *buf = writebuf; while (len > 0) { regcache_cooked_write_part (regcache, regnum, offset, - min (len, 8), buf); - buf += min (len, 8); + min (len, 8), writebuf); + writebuf += min (len, 8); len -= min (len, 8); regnum++; } @@ -2109,7 +2107,7 @@ hppa_frame_prev_register (struct frame_info *next_frame, void **this_cache, int regnum, int *optimizedp, enum lval_type *lvalp, CORE_ADDR *addrp, - int *realnump, void *valuep) + int *realnump, gdb_byte *valuep) { struct hppa_frame_cache *info = hppa_frame_cache (next_frame, this_cache); hppa_frame_prev_register_helper (next_frame, info->saved_regs, regnum, @@ -2232,7 +2230,7 @@ hppa_fallback_frame_prev_register (struct frame_info *next_frame, void **this_cache, int regnum, int *optimizedp, enum lval_type *lvalp, CORE_ADDR *addrp, - int *realnump, void *valuep) + int *realnump, gdb_byte *valuep) { struct hppa_frame_cache *info = hppa_fallback_frame_cache (next_frame, this_cache); @@ -2317,7 +2315,7 @@ hppa_stub_frame_prev_register (struct frame_info *next_frame, void **this_prologue_cache, int regnum, int *optimizedp, enum lval_type *lvalp, CORE_ADDR *addrp, - int *realnump, void *valuep) + int *realnump, gdb_byte *valuep) { struct hppa_stub_unwind_cache *info = hppa_stub_frame_unwind_cache (next_frame, this_prologue_cache); @@ -2587,26 +2585,25 @@ hppa_smash_text_address (CORE_ADDR addr) return (addr &= ~0x3); } -/* Get the ith function argument for the current function. */ +/* Get the ARGIth function argument for the current function. */ + static CORE_ADDR hppa_fetch_pointer_argument (struct frame_info *frame, int argi, struct type *type) { - CORE_ADDR addr; - get_frame_register (frame, HPPA_R0_REGNUM + 26 - argi, &addr); - return addr; + return get_frame_register_unsigned (frame, HPPA_R0_REGNUM + 26 - argi); } static void hppa_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, - int regnum, void *buf) + int regnum, gdb_byte *buf) { ULONGEST tmp; regcache_raw_read_unsigned (regcache, regnum, &tmp); if (regnum == HPPA_PCOQ_HEAD_REGNUM || regnum == HPPA_PCOQ_TAIL_REGNUM) tmp &= ~0x3; - store_unsigned_integer (buf, sizeof(tmp), tmp); + store_unsigned_integer (buf, sizeof tmp, tmp); } static CORE_ADDR -- 2.11.0