From 5a168c78efc6a75c33bdd11b9c8def6b3cf77212 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 1 May 2005 19:58:55 +0000 Subject: 2005-05-01 Andrew Cagney * gdbarch.sh (deprecated_extract_return_value) (breakpoint_from_pc, deprecated_store_return_value) (memory_insert_breakpoint, memory_remove_breakpoint): Change type of buffer to a bfd_byte pointer. * gdbarch.h, gdbarch.c: Re-generate. * mem-break.c (memory_insert_breakpoint) (memory_remove_breakpoint, default_memory_insert_breakpoint) (default_memory_remove_breakpoint): Update. * target.h (memory_insert_breakpoint) (memory_remove_breakpoint, default_memory_insert_breakpoint) (default_memory_remove_breakpoint): Update declarations. (struct target_ops): Update to_insert_breakpoint and to_remove_breakpoint. * target.c (debug_to_remove_breakpoint) (debug_to_insert_breakpoint): Update. * remote-m32r-sdi.c (m32r_remove_breakpoint) (m32r_insert_breakpoint): Update. * m32r-tdep.c (m32r_memory_insert_breakpoint) (m32r_memory_remove_breakpoint): Update. * remote-e7000.c (e7000_insert_breakpoint) (e7000_remove_breakpoint): Update. * remote-rdi.c (arm_rdi_insert_breakpoint) (arm_rdi_remove_breakpoint): Update. * remote-sim.c (gdbsim_insert_breakpoint) (gdbsim_remove_breakpoint): Update. * exec.c (ignore): Update. * rs6000-tdep.c (rs6000_extract_return_value): Update. * ia64-tdep.c (ia64_memory_insert_breakpoint) (ia64_memory_remove_breakpoint): Update. * remote-rdp.c (remote_rdp_insert_breakpoint) (remote_rdp_remove_breakpoint): Update. --- gdb/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ gdb/corelow.c | 4 ++-- gdb/exec.c | 4 ++-- gdb/gdbarch.c | 10 +++++----- gdb/gdbarch.h | 20 ++++++++++---------- gdb/gdbarch.sh | 10 +++++----- gdb/ia64-tdep.c | 4 ++-- gdb/m32r-tdep.c | 4 ++-- gdb/mem-break.c | 10 +++++----- gdb/remote-e7000.c | 4 ++-- gdb/remote-m32r-sdi.c | 4 ++-- gdb/remote-rdi.c | 8 ++++---- gdb/remote-rdp.c | 4 ++-- gdb/remote-sim.c | 4 ++-- gdb/remote.c | 8 ++++---- gdb/rs6000-tdep.c | 3 ++- gdb/target.c | 8 ++++---- gdb/target.h | 12 ++++++------ 18 files changed, 95 insertions(+), 60 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 55808dd..8742137 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,37 @@ +2005-05-01 Andrew Cagney + + * gdbarch.sh (deprecated_extract_return_value) + (breakpoint_from_pc, deprecated_store_return_value) + (memory_insert_breakpoint, memory_remove_breakpoint): Change type + of buffer to a bfd_byte pointer. + * gdbarch.h, gdbarch.c: Re-generate. + * mem-break.c (memory_insert_breakpoint) + (memory_remove_breakpoint, default_memory_insert_breakpoint) + (default_memory_remove_breakpoint): Update. + * target.h (memory_insert_breakpoint) + (memory_remove_breakpoint, default_memory_insert_breakpoint) + (default_memory_remove_breakpoint): Update declarations. + (struct target_ops): Update to_insert_breakpoint and + to_remove_breakpoint. + * target.c (debug_to_remove_breakpoint) + (debug_to_insert_breakpoint): Update. + * remote-m32r-sdi.c (m32r_remove_breakpoint) + (m32r_insert_breakpoint): Update. + * m32r-tdep.c (m32r_memory_insert_breakpoint) + (m32r_memory_remove_breakpoint): Update. + * remote-e7000.c (e7000_insert_breakpoint) + (e7000_remove_breakpoint): Update. + * remote-rdi.c (arm_rdi_insert_breakpoint) + (arm_rdi_remove_breakpoint): Update. + * remote-sim.c (gdbsim_insert_breakpoint) + (gdbsim_remove_breakpoint): Update. + * exec.c (ignore): Update. + * rs6000-tdep.c (rs6000_extract_return_value): Update. + * ia64-tdep.c (ia64_memory_insert_breakpoint) + (ia64_memory_remove_breakpoint): Update. + * remote-rdp.c (remote_rdp_insert_breakpoint) + (remote_rdp_remove_breakpoint): Update. + 2005-05-01 Mark Kettenis * somsolib.c, somsolib.h: Remove files. diff --git a/gdb/corelow.c b/gdb/corelow.c index a78f71a..75f9419 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -93,7 +93,7 @@ static void get_core_registers (int); static void add_to_thread_list (bfd *, asection *, void *); -static int ignore (CORE_ADDR, char *); +static int ignore (CORE_ADDR, bfd_byte *); static int core_file_thread_alive (ptid_t tid); @@ -625,7 +625,7 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, `gdb internal error' (since generic_mourn calls breakpoint_init_inferior). */ static int -ignore (CORE_ADDR addr, char *contents) +ignore (CORE_ADDR addr, bfd_byte *contents) { return 0; } diff --git a/gdb/exec.c b/gdb/exec.c index 48b83bc..5b85317 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -62,7 +62,7 @@ static void set_section_command (char *, int); static void exec_files_info (struct target_ops *); -static int ignore (CORE_ADDR, char *); +static int ignore (CORE_ADDR, bfd_byte *); static void init_exec_ops (void); @@ -676,7 +676,7 @@ set_section_command (char *args, int from_tty) breakpoint_init_inferior). */ static int -ignore (CORE_ADDR addr, char *contents) +ignore (CORE_ADDR addr, bfd_byte *contents) { return 0; } diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 718506c..8b13755 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -2829,7 +2829,7 @@ set_gdbarch_store_return_value (struct gdbarch *gdbarch, } void -gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *regbuf, char *valbuf) +gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *regbuf, bfd_byte *valbuf) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->deprecated_extract_return_value != NULL); @@ -2846,7 +2846,7 @@ set_gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, } void -gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, char *valbuf) +gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *valbuf) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->deprecated_store_return_value != NULL); @@ -2937,7 +2937,7 @@ set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch->inner_than = inner_than; } -const unsigned char * +const bfd_byte * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { gdb_assert (gdbarch != NULL); @@ -2979,7 +2979,7 @@ set_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, } int -gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache) +gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->memory_insert_breakpoint != NULL); @@ -2996,7 +2996,7 @@ set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, } int -gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache) +gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->memory_remove_breakpoint != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index a46c90c..8afaf9b 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -818,8 +818,8 @@ extern void set_gdbarch_store_return_value (struct gdbarch *gdbarch, gdbarch_sto #define STORE_RETURN_VALUE(type, regcache, valbuf) (gdbarch_store_return_value (current_gdbarch, type, regcache, valbuf)) #endif -typedef void (gdbarch_deprecated_extract_return_value_ftype) (struct type *type, char *regbuf, char *valbuf); -extern void gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *regbuf, char *valbuf); +typedef void (gdbarch_deprecated_extract_return_value_ftype) (struct type *type, bfd_byte *regbuf, bfd_byte *valbuf); +extern void gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *regbuf, bfd_byte *valbuf); extern void set_gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, gdbarch_deprecated_extract_return_value_ftype *deprecated_extract_return_value); #if !defined (GDB_TM_FILE) && defined (DEPRECATED_EXTRACT_RETURN_VALUE) #error "Non multi-arch definition of DEPRECATED_EXTRACT_RETURN_VALUE" @@ -828,8 +828,8 @@ extern void set_gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch #define DEPRECATED_EXTRACT_RETURN_VALUE(type, regbuf, valbuf) (gdbarch_deprecated_extract_return_value (current_gdbarch, type, regbuf, valbuf)) #endif -typedef void (gdbarch_deprecated_store_return_value_ftype) (struct type *type, char *valbuf); -extern void gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, char *valbuf); +typedef void (gdbarch_deprecated_store_return_value_ftype) (struct type *type, bfd_byte *valbuf); +extern void gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *valbuf); extern void set_gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, gdbarch_deprecated_store_return_value_ftype *deprecated_store_return_value); #if !defined (GDB_TM_FILE) && defined (DEPRECATED_STORE_RETURN_VALUE) #error "Non multi-arch definition of DEPRECATED_STORE_RETURN_VALUE" @@ -911,8 +911,8 @@ extern void set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch_inner_than_ #define INNER_THAN(lhs, rhs) (gdbarch_inner_than (current_gdbarch, lhs, rhs)) #endif -typedef const unsigned char * (gdbarch_breakpoint_from_pc_ftype) (CORE_ADDR *pcptr, int *lenptr); -extern const unsigned char * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr); +typedef const bfd_byte * (gdbarch_breakpoint_from_pc_ftype) (CORE_ADDR *pcptr, int *lenptr); +extern const bfd_byte * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr); extern void set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc); #if !defined (GDB_TM_FILE) && defined (BREAKPOINT_FROM_PC) #error "Non multi-arch definition of BREAKPOINT_FROM_PC" @@ -927,8 +927,8 @@ typedef CORE_ADDR (gdbarch_adjust_breakpoint_address_ftype) (struct gdbarch *gdb extern CORE_ADDR gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr); extern void set_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, gdbarch_adjust_breakpoint_address_ftype *adjust_breakpoint_address); -typedef int (gdbarch_memory_insert_breakpoint_ftype) (CORE_ADDR addr, char *contents_cache); -extern int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache); +typedef int (gdbarch_memory_insert_breakpoint_ftype) (CORE_ADDR addr, bfd_byte *contents_cache); +extern int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache); extern void set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint); #if !defined (GDB_TM_FILE) && defined (MEMORY_INSERT_BREAKPOINT) #error "Non multi-arch definition of MEMORY_INSERT_BREAKPOINT" @@ -937,8 +937,8 @@ extern void set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, gdbar #define MEMORY_INSERT_BREAKPOINT(addr, contents_cache) (gdbarch_memory_insert_breakpoint (current_gdbarch, addr, contents_cache)) #endif -typedef int (gdbarch_memory_remove_breakpoint_ftype) (CORE_ADDR addr, char *contents_cache); -extern int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache); +typedef int (gdbarch_memory_remove_breakpoint_ftype) (CORE_ADDR addr, bfd_byte *contents_cache); +extern int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache); extern void set_gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint); #if !defined (GDB_TM_FILE) && defined (MEMORY_REMOVE_BREAKPOINT) #error "Non multi-arch definition of MEMORY_REMOVE_BREAKPOINT" diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 12e367b..01195a4 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -521,8 +521,8 @@ M::enum return_value_convention:return_value:struct type *valtype, struct regcac f:=:void:extract_return_value:struct type *type, struct regcache *regcache, void *valbuf:type, regcache, valbuf::legacy_extract_return_value::0 f:=:void:store_return_value:struct type *type, struct regcache *regcache, const void *valbuf:type, regcache, valbuf::legacy_store_return_value::0 -f:=:void:deprecated_extract_return_value:struct type *type, char *regbuf, char *valbuf:type, regbuf, valbuf -f:=:void:deprecated_store_return_value:struct type *type, char *valbuf:type, valbuf +f:=:void:deprecated_extract_return_value:struct type *type, bfd_byte *regbuf, bfd_byte *valbuf:type, regbuf, valbuf +f:=:void:deprecated_store_return_value:struct type *type, bfd_byte *valbuf:type, valbuf f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type::generic_use_struct_convention::0 # As of 2004-01-17 only the 32-bit SPARC ABI has been identified as an @@ -549,10 +549,10 @@ F:=:CORE_ADDR:deprecated_extract_struct_value_address:struct regcache *regcache: # f:=:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0 f:=:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0 -f:=:const unsigned char *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0: +f:=:const bfd_byte *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0: M::CORE_ADDR:adjust_breakpoint_address:CORE_ADDR bpaddr:bpaddr -f:=:int:memory_insert_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache:0:default_memory_insert_breakpoint::0 -f:=:int:memory_remove_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache:0:default_memory_remove_breakpoint::0 +f:=:int:memory_insert_breakpoint:CORE_ADDR addr, bfd_byte *contents_cache:addr, contents_cache:0:default_memory_insert_breakpoint::0 +f:=:int:memory_remove_breakpoint:CORE_ADDR addr, bfd_byte *contents_cache:addr, contents_cache:0:default_memory_remove_breakpoint::0 v:=:CORE_ADDR:decr_pc_after_break:::0:::0 # A function can be addressed by either it's "pointer" (possibly a diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 0a89ed9..e75569c 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -523,7 +523,7 @@ fetch_instruction (CORE_ADDR addr, instruction_type *it, long long *instr) #define IA64_BREAKPOINT 0x00003333300LL static int -ia64_memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache) +ia64_memory_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { char bundle[BUNDLE_LEN]; int slotnum = (int) (addr & 0x0f) / SLOT_MULTIPLIER; @@ -556,7 +556,7 @@ ia64_memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache) } static int -ia64_memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache) +ia64_memory_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { char bundle[BUNDLE_LEN]; int slotnum = (addr & 0x0f) / SLOT_MULTIPLIER; diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c index b3a5c18..26deea0 100644 --- a/gdb/m32r-tdep.c +++ b/gdb/m32r-tdep.c @@ -81,7 +81,7 @@ m32r_frame_align (struct gdbarch *gdbarch, CORE_ADDR sp) The following functions take care of this behavior. */ static int -m32r_memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache) +m32r_memory_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { int val; char buf[4]; @@ -134,7 +134,7 @@ m32r_memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache) } static int -m32r_memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache) +m32r_memory_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { int val; char buf[4]; diff --git a/gdb/mem-break.c b/gdb/mem-break.c index 5866881..e2b7cbc 100644 --- a/gdb/mem-break.c +++ b/gdb/mem-break.c @@ -42,7 +42,7 @@ is accomplished via BREAKPOINT_MAX). */ int -default_memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache) +default_memory_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { int val; const unsigned char *bp; @@ -65,9 +65,9 @@ default_memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache) int -default_memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache) +default_memory_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { - const unsigned char *bp; + const bfd_byte *bp; int bplen; /* Determine appropriate breakpoint contents and size for this address. */ @@ -80,13 +80,13 @@ default_memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache) int -memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache) +memory_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { return MEMORY_INSERT_BREAKPOINT(addr, contents_cache); } int -memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache) +memory_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { return MEMORY_REMOVE_BREAKPOINT(addr, contents_cache); } diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c index 451d260..76a245c 100644 --- a/gdb/remote-e7000.c +++ b/gdb/remote-e7000.c @@ -1702,7 +1702,7 @@ static CORE_ADDR breakaddr[MAX_BREAKPOINTS] = {0}; static int -e7000_insert_breakpoint (CORE_ADDR addr, char *shadow) +e7000_insert_breakpoint (CORE_ADDR addr, bfd_byte *shadow) { int i; char buf[200]; @@ -1745,7 +1745,7 @@ e7000_insert_breakpoint (CORE_ADDR addr, char *shadow) } static int -e7000_remove_breakpoint (CORE_ADDR addr, char *shadow) +e7000_remove_breakpoint (CORE_ADDR addr, bfd_byte *shadow) { int i; char buf[200]; diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c index 387db49..4fa797d 100644 --- a/gdb/remote-m32r-sdi.c +++ b/gdb/remote-m32r-sdi.c @@ -1141,7 +1141,7 @@ m32r_mourn_inferior (void) } static int -m32r_insert_breakpoint (CORE_ADDR addr, char *shadow) +m32r_insert_breakpoint (CORE_ADDR addr, bfd_byte *shadow) { int ib_breakpoints; unsigned char buf[13]; @@ -1183,7 +1183,7 @@ m32r_insert_breakpoint (CORE_ADDR addr, char *shadow) } static int -m32r_remove_breakpoint (CORE_ADDR addr, char *shadow) +m32r_remove_breakpoint (CORE_ADDR addr, bfd_byte *shadow) { int i; diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c index b50da48..5540175 100644 --- a/gdb/remote-rdi.c +++ b/gdb/remote-rdi.c @@ -74,9 +74,9 @@ static void arm_rdi_kill (void); static void arm_rdi_detach (char *args, int from_tty); -static int arm_rdi_insert_breakpoint (CORE_ADDR, char *); +static int arm_rdi_insert_breakpoint (CORE_ADDR, bfd_byte *); -static int arm_rdi_remove_breakpoint (CORE_ADDR, char *); +static int arm_rdi_remove_breakpoint (CORE_ADDR, bfd_byte *); static char *rdi_error_message (int err); @@ -668,7 +668,7 @@ arm_rdi_mourn_inferior (void) here. */ static int -arm_rdi_insert_breakpoint (CORE_ADDR addr, char *contents_cache) +arm_rdi_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { int rslt; PointHandle point; @@ -692,7 +692,7 @@ arm_rdi_insert_breakpoint (CORE_ADDR addr, char *contents_cache) } static int -arm_rdi_remove_breakpoint (CORE_ADDR addr, char *contents_cache) +arm_rdi_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { int rslt; PointHandle point; diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c index 2a60f28..a1f54f7 100644 --- a/gdb/remote-rdp.c +++ b/gdb/remote-rdp.c @@ -1053,7 +1053,7 @@ rdp_execute (void) } static int -remote_rdp_insert_breakpoint (CORE_ADDR addr, char *save) +remote_rdp_insert_breakpoint (CORE_ADDR addr, bfd_byte *save) { int res; if (ds.rdi_level > 0) @@ -1077,7 +1077,7 @@ remote_rdp_insert_breakpoint (CORE_ADDR addr, char *save) } static int -remote_rdp_remove_breakpoint (CORE_ADDR addr, char *save) +remote_rdp_remove_breakpoint (CORE_ADDR addr, bfd_byte *save) { int res; if (ds.rdi_level > 0) diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index b49e9c5..802c0b0 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -805,13 +805,13 @@ gdbsim_mourn_inferior (void) } static int -gdbsim_insert_breakpoint (CORE_ADDR addr, char *contents_cache) +gdbsim_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { return memory_insert_breakpoint (addr, contents_cache); } static int -gdbsim_remove_breakpoint (CORE_ADDR addr, char *contents_cache) +gdbsim_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { return memory_remove_breakpoint (addr, contents_cache); } diff --git a/gdb/remote.c b/gdb/remote.c index e7d76da..a46b92f 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -136,9 +136,9 @@ static void get_offsets (void); static long read_frame (char *buf, long sizeof_buf); -static int remote_insert_breakpoint (CORE_ADDR, char *); +static int remote_insert_breakpoint (CORE_ADDR, bfd_byte *); -static int remote_remove_breakpoint (CORE_ADDR, char *); +static int remote_remove_breakpoint (CORE_ADDR, bfd_byte *); static int hexnumlen (ULONGEST num); @@ -4497,7 +4497,7 @@ static unsigned char little_break_insn[] = DEPRECATED_LITTLE_REMOTE_BREAKPOINT; of bytes returned by BREAKPOINT_FROM_PC. */ static int -remote_insert_breakpoint (CORE_ADDR addr, char *contents_cache) +remote_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { struct remote_state *rs = get_remote_state (); #ifdef DEPRECATED_REMOTE_BREAKPOINT @@ -4557,7 +4557,7 @@ remote_insert_breakpoint (CORE_ADDR addr, char *contents_cache) } static int -remote_remove_breakpoint (CORE_ADDR addr, char *contents_cache) +remote_remove_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) { struct remote_state *rs = get_remote_state (); int bp_size; diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 02a76f7..230f110 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -1665,7 +1665,8 @@ rs6000_use_struct_convention (int gcc_p, struct type *value_type) } static void -rs6000_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) +rs6000_extract_return_value (struct type *valtype, bfd_byte *regbuf, + bfd_byte *valbuf) { int offset = 0; struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); diff --git a/gdb/target.c b/gdb/target.c index a0965fd..f3a9713 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -114,9 +114,9 @@ static int deprecated_debug_xfer_memory (CORE_ADDR, char *, int, int, static void debug_to_files_info (struct target_ops *); -static int debug_to_insert_breakpoint (CORE_ADDR, char *); +static int debug_to_insert_breakpoint (CORE_ADDR, bfd_byte *); -static int debug_to_remove_breakpoint (CORE_ADDR, char *); +static int debug_to_remove_breakpoint (CORE_ADDR, bfd_byte *); static int debug_to_can_use_hw_breakpoint (int, int, int); @@ -2068,7 +2068,7 @@ debug_to_files_info (struct target_ops *target) } static int -debug_to_insert_breakpoint (CORE_ADDR addr, char *save) +debug_to_insert_breakpoint (CORE_ADDR addr, bfd_byte *save) { int retval; @@ -2082,7 +2082,7 @@ debug_to_insert_breakpoint (CORE_ADDR addr, char *save) } static int -debug_to_remove_breakpoint (CORE_ADDR addr, char *save) +debug_to_remove_breakpoint (CORE_ADDR addr, bfd_byte *save) { int retval; diff --git a/gdb/target.h b/gdb/target.h index 1578ddb..0e45d04 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -335,8 +335,8 @@ struct target_ops struct target_ops *target); void (*to_files_info) (struct target_ops *); - int (*to_insert_breakpoint) (CORE_ADDR, char *); - int (*to_remove_breakpoint) (CORE_ADDR, char *); + int (*to_insert_breakpoint) (CORE_ADDR, bfd_byte *); + int (*to_remove_breakpoint) (CORE_ADDR, bfd_byte *); int (*to_can_use_hw_breakpoint) (int, int, int); int (*to_insert_hw_breakpoint) (CORE_ADDR, char *); int (*to_remove_hw_breakpoint) (CORE_ADDR, char *); @@ -1137,13 +1137,13 @@ struct section_table *target_section_by_addr (struct target_ops *target, /* From mem-break.c */ -extern int memory_remove_breakpoint (CORE_ADDR, char *); +extern int memory_remove_breakpoint (CORE_ADDR, bfd_byte *); -extern int memory_insert_breakpoint (CORE_ADDR, char *); +extern int memory_insert_breakpoint (CORE_ADDR, bfd_byte *); -extern int default_memory_remove_breakpoint (CORE_ADDR, char *); +extern int default_memory_remove_breakpoint (CORE_ADDR, bfd_byte *); -extern int default_memory_insert_breakpoint (CORE_ADDR, char *); +extern int default_memory_insert_breakpoint (CORE_ADDR, bfd_byte *); /* From target.c */ -- cgit v1.1