From 18cf8b5b37bea79e24868845c201571abee4d8c5 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Wed, 2 Nov 2005 15:22:24 +0000 Subject: [PATCH] 2005-11-02 Andrew Stubbs * monitor.c (monitor_xfer_memory): Change char to gdb_byte. (monitor_insert_breakpoint): Likewise. (monitor_remove_breakpoint): Likewise. * remote-e7000.c (e7000_xfer_inferior_memory): Likewise. * sh-tdep.c (sh_return_value_nofpu): Change void to gdb_byte. (sh_return_value_fpu): Likewise. (sh_pseudo_register_read): Likewise. (sh_pseudo_register_write): Likewise. (sh_frame_prev_register): Likewise. * sh64-tdep.c (sh64_extract_return_value): Change char to gdb_byte. (sh64_return_value): Change void to gdb_byte. (sh64_pseudo_register_read): Likewise. (sh64_pseudo_register_write): Likewise. (sh64_frame_prev_register): Likewise. --- gdb/ChangeLog | 17 +++++++++++++++++ gdb/monitor.c | 12 ++++++------ gdb/remote-e7000.c | 2 +- gdb/sh-tdep.c | 10 +++++----- gdb/sh64-tdep.c | 12 ++++++------ 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 815b6632cf..0a62f48e3a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2005-11-02 Andrew Stubbs + + * monitor.c (monitor_xfer_memory): Change char to gdb_byte. + (monitor_insert_breakpoint): Likewise. + (monitor_remove_breakpoint): Likewise. + * remote-e7000.c (e7000_xfer_inferior_memory): Likewise. + * sh-tdep.c (sh_return_value_nofpu): Change void to gdb_byte. + (sh_return_value_fpu): Likewise. + (sh_pseudo_register_read): Likewise. + (sh_pseudo_register_write): Likewise. + (sh_frame_prev_register): Likewise. + * sh64-tdep.c (sh64_extract_return_value): Change char to gdb_byte. + (sh64_return_value): Change void to gdb_byte. + (sh64_pseudo_register_read): Likewise. + (sh64_pseudo_register_write): Likewise. + (sh64_frame_prev_register): Likewise. + 2005-11-01 Joel Brobecker * event-top.c (gdb_setup_readline): Add missing type in extern diff --git a/gdb/monitor.c b/gdb/monitor.c index c805eb4783..fe856c0dc4 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -80,13 +80,13 @@ static ptid_t monitor_wait (ptid_t ptid, struct target_waitstatus *status); static void monitor_fetch_registers (int regno); static void monitor_store_registers (int regno); static void monitor_prepare_to_store (void); -static int monitor_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, +static int monitor_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target); static void monitor_files_info (struct target_ops *ops); -static int monitor_insert_breakpoint (CORE_ADDR addr, char *shadow); -static int monitor_remove_breakpoint (CORE_ADDR addr, char *shadow); +static int monitor_insert_breakpoint (CORE_ADDR addr, gdb_byte *shadow); +static int monitor_remove_breakpoint (CORE_ADDR addr, gdb_byte *shadow); static void monitor_kill (void); static void monitor_load (char *file, int from_tty); static void monitor_mourn_inferior (void); @@ -1982,7 +1982,7 @@ monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len) unused. */ static int -monitor_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, +monitor_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target) { int res; @@ -2038,7 +2038,7 @@ monitor_mourn_inferior (void) /* Tell the monitor to add a breakpoint. */ static int -monitor_insert_breakpoint (CORE_ADDR addr, char *shadow) +monitor_insert_breakpoint (CORE_ADDR addr, gdb_byte *shadow) { int i; const unsigned char *bp; @@ -2072,7 +2072,7 @@ monitor_insert_breakpoint (CORE_ADDR addr, char *shadow) /* Tell the monitor to remove a breakpoint. */ static int -monitor_remove_breakpoint (CORE_ADDR addr, char *shadow) +monitor_remove_breakpoint (CORE_ADDR addr, gdb_byte *shadow) { int i; diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c index 76a245c997..aa430e6eda 100644 --- a/gdb/remote-e7000.c +++ b/gdb/remote-e7000.c @@ -1478,7 +1478,7 @@ fast_but_for_the_pause_e7000_read_inferior_memory (CORE_ADDR memaddr, Returns the number of bytes transferred. */ static int -e7000_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len, +e7000_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target) { diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 15e89e9853..30fcf2f031 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1285,7 +1285,7 @@ sh_store_return_value_fpu (struct type *type, struct regcache *regcache, static enum return_value_convention sh_return_value_nofpu (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, - void *readbuf, const void *writebuf) + gdb_byte *readbuf, const gdb_byte *writebuf) { if (sh_use_struct_convention (0, type)) return RETURN_VALUE_STRUCT_CONVENTION; @@ -1299,7 +1299,7 @@ sh_return_value_nofpu (struct gdbarch *gdbarch, struct type *type, static enum return_value_convention sh_return_value_fpu (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, - void *readbuf, const void *writebuf) + gdb_byte *readbuf, const gdb_byte *writebuf) { if (sh_use_struct_convention (0, type)) return RETURN_VALUE_STRUCT_CONVENTION; @@ -1890,7 +1890,7 @@ dr_reg_base_num (int dr_regnum) static void sh_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, - int reg_nr, void *buffer) + int reg_nr, gdb_byte *buffer) { int base_regnum, portion; char temp_buffer[MAX_REGISTER_SIZE]; @@ -1929,7 +1929,7 @@ sh_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, static void sh_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, - int reg_nr, const void *buffer) + int reg_nr, const gdb_byte *buffer) { int base_regnum, portion; char temp_buffer[MAX_REGISTER_SIZE]; @@ -2282,7 +2282,7 @@ static void sh_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 sh_frame_cache *cache = sh_frame_cache (next_frame, this_cache); diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 7f5aa90ff2..1de876441b 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -1228,9 +1228,9 @@ sh64_extract_return_value (struct type *type, struct regcache *regcache, { /* return value stored in DR0_REGNUM */ DOUBLEST val; - char buf[8]; + gdb_byte buf[8]; - regcache_cooked_read (regcache, DR0_REGNUM, &buf); + regcache_cooked_read (regcache, DR0_REGNUM, buf); if (TARGET_BYTE_ORDER == BFD_ENDIAN_LITTLE) floatformat_to_doublest (&floatformat_ieee_double_littlebyte_bigword, @@ -1313,7 +1313,7 @@ sh64_store_return_value (struct type *type, struct regcache *regcache, static enum return_value_convention sh64_return_value (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, - void *readbuf, const void *writebuf) + gdb_byte *readbuf, const gdb_byte *writebuf) { if (sh64_use_struct_convention (type)) return RETURN_VALUE_STRUCT_CONVENTION; @@ -1575,7 +1575,7 @@ sh64_register_convert_to_raw (struct type *type, int regnum, static void sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, - int reg_nr, void *buffer) + int reg_nr, gdb_byte *buffer) { int base_regnum; int portion; @@ -1744,7 +1744,7 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, static void sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, - int reg_nr, const void *buffer) + int reg_nr, const gdb_byte *buffer) { int base_regnum, portion; int offset; @@ -2290,7 +2290,7 @@ static void sh64_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 sh64_frame_cache *cache = sh64_frame_cache (next_frame, this_cache); -- 2.34.1