From 1b0ba102266620a8d82e08315e921ab4d7f9972d Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 16 May 2005 04:45:43 +0000 Subject: [PATCH] 2005-05-16 Andrew Cagney * target.h (target_read_partial, target_write_partial) (do_xfer_memory, xfer_memory, target_read, target_write) (get_target_memory): For buffers, change "void*" to gdb_byte. (struct target_ops): Ditto for to_xfer_partial and deprecated_xfer_memory. * dcache.h (dcache_xfer_memory): Ditto. * target.c (default_xfer_partial, target_read_partial) (target_write_partial, target_read, target_write) (do_xfer_memory, update_current_target, get_target_memory): Update. (target_read_string): Change buf to a gdb_byte. * dcache.c (dcache_xfer_memory): Update. * exec.c (xfer_memory): Make buffer type to gdb_byte. * mem-break.c (default_memory_insert_breakpoint): Remove cast. * disasm.c (dis_asm_read_memory): Remove cast, use gdb_byte. --- gdb/ChangeLog | 17 +++++++++++++++++ gdb/dcache.c | 4 ++-- gdb/dcache.h | 4 ++-- gdb/disasm.c | 4 ++-- gdb/exec.c | 5 ++--- gdb/mem-break.c | 2 +- gdb/target.c | 32 ++++++++++++++++---------------- gdb/target.h | 20 ++++++++++---------- 8 files changed, 52 insertions(+), 36 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 26c6d8530a4..08a3a17da0e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2005-05-16 Andrew Cagney + + * target.h (target_read_partial, target_write_partial) + (do_xfer_memory, xfer_memory, target_read, target_write) + (get_target_memory): For buffers, change "void*" to gdb_byte. + (struct target_ops): Ditto for to_xfer_partial and + deprecated_xfer_memory. + * dcache.h (dcache_xfer_memory): Ditto. + * target.c (default_xfer_partial, target_read_partial) + (target_write_partial, target_read, target_write) + (do_xfer_memory, update_current_target, get_target_memory): Update. + (target_read_string): Change buf to a gdb_byte. + * dcache.c (dcache_xfer_memory): Update. + * exec.c (xfer_memory): Make buffer type to gdb_byte. + * mem-break.c (default_memory_insert_breakpoint): Remove cast. + * disasm.c (dis_asm_read_memory): Remove cast, use gdb_byte. + 2005-05-16 Mark Kettenis * sol-thread.c (ignore): Change last argument to `gdb_byte.' diff --git a/gdb/dcache.c b/gdb/dcache.c index bff7e9fccab..72e98660be2 100644 --- a/gdb/dcache.c +++ b/gdb/dcache.c @@ -532,8 +532,8 @@ dcache_free (DCACHE *dcache) This routine is indended to be called by remote_xfer_ functions. */ int -dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, char *myaddr, int len, - int should_write) +dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, gdb_byte *myaddr, + int len, int should_write) { int i; int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, char *ptr); diff --git a/gdb/dcache.h b/gdb/dcache.h index 5f9da65e222..e9eed3dabb0 100644 --- a/gdb/dcache.h +++ b/gdb/dcache.h @@ -37,7 +37,7 @@ void dcache_free (DCACHE *); /* Simple to call from _xfer_memory */ -int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, char *my, int len, - int should_write); +int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my, + int len, int should_write); #endif /* DCACHE_H */ diff --git a/gdb/disasm.c b/gdb/disasm.c index cf54f8a50a9..4126f726221 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -46,10 +46,10 @@ struct dis_line_entry /* Like target_read_memory, but slightly different parameters. */ static int -dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len, +dis_asm_read_memory (bfd_vma memaddr, gdb_byte *myaddr, unsigned int len, struct disassemble_info *info) { - return target_read_memory (memaddr, (char *) myaddr, len); + return target_read_memory (memaddr, myaddr, len); } /* Like memory_error with slightly different parameters. */ diff --git a/gdb/exec.c b/gdb/exec.c index 5b853177535..938b106adef 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -455,9 +455,8 @@ map_vmap (bfd *abfd, bfd *arch) we just tail-call it with more arguments to select between them. */ int -xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, - struct mem_attrib *attrib, - struct target_ops *target) +xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, + struct mem_attrib *attrib, struct target_ops *target) { int res; struct section_table *p; diff --git a/gdb/mem-break.c b/gdb/mem-break.c index e2b7cbc6f35..0f937ee994c 100644 --- a/gdb/mem-break.c +++ b/gdb/mem-break.c @@ -58,7 +58,7 @@ default_memory_insert_breakpoint (CORE_ADDR addr, bfd_byte *contents_cache) /* Write the breakpoint. */ if (val == 0) - val = target_write_memory (addr, (char *) bp, bplen); + val = target_write_memory (addr, bp, bplen); return val; } diff --git a/gdb/target.c b/gdb/target.c index fa9f1fa612c..a905cc73a96 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -71,8 +71,8 @@ static void nosupport_runtime (void); static LONGEST default_xfer_partial (struct target_ops *ops, enum target_object object, - const char *annex, void *readbuf, - const void *writebuf, + const char *annex, gdb_byte *readbuf, + const gdb_byte *writebuf, ULONGEST offset, LONGEST len); /* Transfer LEN bytes between target address MEMADDR and GDB address @@ -81,7 +81,7 @@ static LONGEST default_xfer_partial (struct target_ops *ops, partial transfers, try either target_read_memory_partial or target_write_memory_partial). */ -static int target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, +static int target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write); static void init_dummy_target (void); @@ -505,7 +505,7 @@ update_current_target (void) (void (*) (void)) noprocess); de_fault (deprecated_xfer_memory, - (int (*) (CORE_ADDR, char *, int, int, struct mem_attrib *, struct target_ops *)) + (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); de_fault (to_files_info, (void (*) (struct target_ops *)) @@ -771,7 +771,7 @@ int target_read_string (CORE_ADDR memaddr, char **string, int len, int *errnop) { int tlen, origlen, offset, i; - char buf[4]; + gdb_byte buf[4]; int errcode = 0; char *buffer; int buffer_allocated; @@ -790,7 +790,7 @@ target_read_string (CORE_ADDR memaddr, char **string, int len, int *errnop) tlen = MIN (len, 4 - (memaddr & 3)); offset = memaddr & 3; - errcode = target_read_memory (memaddr & ~3, buf, 4); + errcode = target_read_memory (memaddr & ~3, buf, sizeof buf); if (errcode != 0) { /* The transfer request might have crossed the boundary to an @@ -1053,7 +1053,7 @@ Mode for reading from readonly sections is %s.\n"), Result is -1 on error, or the number of bytes transfered. */ int -do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, +do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, struct mem_attrib *attrib) { int res; @@ -1114,7 +1114,7 @@ do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, Result is 0 or errno value. */ static int -target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write) +target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write) { int res; int reg_len; @@ -1151,7 +1151,7 @@ target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write) { if (region->attrib.cache) res = dcache_xfer_memory (target_dcache, memaddr, myaddr, - reg_len, write); + reg_len, write); else res = do_xfer_memory (memaddr, myaddr, reg_len, write, ®ion->attrib); @@ -1305,8 +1305,8 @@ target_write_memory_partial (CORE_ADDR memaddr, char *buf, int len, int *err) static LONGEST default_xfer_partial (struct target_ops *ops, enum target_object object, - const char *annex, void *readbuf, - const void *writebuf, ULONGEST offset, LONGEST len) + const char *annex, gdb_byte *readbuf, + const gdb_byte *writebuf, ULONGEST offset, LONGEST len) { if (object == TARGET_OBJECT_MEMORY && ops->deprecated_xfer_memory != NULL) @@ -1352,7 +1352,7 @@ default_xfer_partial (struct target_ops *ops, enum target_object object, LONGEST target_read_partial (struct target_ops *ops, enum target_object object, - const char *annex, void *buf, + const char *annex, gdb_byte *buf, ULONGEST offset, LONGEST len) { return target_xfer_partial (ops, object, annex, buf, NULL, offset, len); @@ -1361,7 +1361,7 @@ target_read_partial (struct target_ops *ops, LONGEST target_write_partial (struct target_ops *ops, enum target_object object, - const char *annex, const void *buf, + const char *annex, const gdb_byte *buf, ULONGEST offset, LONGEST len) { return target_xfer_partial (ops, object, annex, NULL, buf, offset, len); @@ -1371,7 +1371,7 @@ target_write_partial (struct target_ops *ops, LONGEST target_read (struct target_ops *ops, enum target_object object, - const char *annex, void *buf, + const char *annex, gdb_byte *buf, ULONGEST offset, LONGEST len) { LONGEST xfered = 0; @@ -1393,7 +1393,7 @@ target_read (struct target_ops *ops, LONGEST target_write (struct target_ops *ops, enum target_object object, - const char *annex, const void *buf, + const char *annex, const gdb_byte *buf, ULONGEST offset, LONGEST len) { LONGEST xfered = 0; @@ -1415,7 +1415,7 @@ target_write (struct target_ops *ops, /* Memory transfer methods. */ void -get_target_memory (struct target_ops *ops, CORE_ADDR addr, void *buf, +get_target_memory (struct target_ops *ops, CORE_ADDR addr, gdb_byte *buf, LONGEST len) { if (target_read (ops, TARGET_OBJECT_MEMORY, NULL, buf, addr, len) diff --git a/gdb/target.h b/gdb/target.h index 56d4ee4ac63..80fd78326a8 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -236,23 +236,23 @@ enum target_object extern LONGEST target_read_partial (struct target_ops *ops, enum target_object object, - const char *annex, void *buf, + const char *annex, gdb_byte *buf, ULONGEST offset, LONGEST len); extern LONGEST target_write_partial (struct target_ops *ops, enum target_object object, - const char *annex, const void *buf, + const char *annex, const gdb_byte *buf, ULONGEST offset, LONGEST len); /* Wrappers to perform the full transfer. */ extern LONGEST target_read (struct target_ops *ops, enum target_object object, - const char *annex, void *buf, + const char *annex, gdb_byte *buf, ULONGEST offset, LONGEST len); extern LONGEST target_write (struct target_ops *ops, enum target_object object, - const char *annex, const void *buf, + const char *annex, const gdb_byte *buf, ULONGEST offset, LONGEST len); /* Wrappers to target read/write that perform memory transfers. They @@ -263,7 +263,7 @@ extern LONGEST target_write (struct target_ops *ops, which in turn lifted it from read_memory. */ extern void get_target_memory (struct target_ops *ops, CORE_ADDR addr, - void *buf, LONGEST len); + gdb_byte *buf, LONGEST len); extern ULONGEST get_target_memory_unsigned (struct target_ops *ops, CORE_ADDR addr, int len); @@ -329,7 +329,7 @@ struct target_ops NOTE: cagney/2004-10-01: This has been entirely superseeded by to_xfer_partial and inferior inheritance. */ - int (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr, + int (*deprecated_xfer_memory) (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target); @@ -419,7 +419,7 @@ struct target_ops only one, of readbuf or writebuf must be non-NULL. */ LONGEST (*to_xfer_partial) (struct target_ops *ops, enum target_object object, const char *annex, - void *readbuf, const void *writebuf, + gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, LONGEST len); int to_magic; @@ -532,8 +532,8 @@ extern void target_disconnect (char *, int); extern DCACHE *target_dcache; -extern int do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, - struct mem_attrib *attrib); +extern int do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, + int write, struct mem_attrib *attrib); extern int target_read_string (CORE_ADDR, char **, int, int *); @@ -542,7 +542,7 @@ extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len); extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len); -extern int xfer_memory (CORE_ADDR, char *, int, int, +extern int xfer_memory (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *); extern int child_xfer_memory (CORE_ADDR, char *, int, int, -- 2.30.2