From 84e7fd53af6de808bb2b47c0e4c9cc2b7f0062d1 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 15 Oct 2003 21:10:55 +0000 Subject: [PATCH] 2003-10-15 Andrew Cagney * remote.c (remote_search): Delete function. * target.h (target_search): Delete disabled macro. (struct target_ops): Delete disabled field "to_search". --- gdb/ChangeLog | 6 ++++++ gdb/remote.c | 67 ----------------------------------------------------------- gdb/target.h | 23 -------------------- 3 files changed, 6 insertions(+), 90 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 137e7ea..33e1456 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2003-10-15 Andrew Cagney + + * remote.c (remote_search): Delete function. + * target.h (target_search): Delete disabled macro. + (struct target_ops): Delete disabled field "to_search". + 2003-10-14 Kevin Buettner * frv-tdep.c (frv_frame_this_id): Call inside_entry_func() diff --git a/gdb/remote.c b/gdb/remote.c index 3d24684..3cc8259 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -3989,73 +3989,6 @@ remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len, return res; } - -#if 0 -/* Enable after 4.12. */ - -void -remote_search (int len, char *data, char *mask, CORE_ADDR startaddr, - int increment, CORE_ADDR lorange, CORE_ADDR hirange, - CORE_ADDR *addr_found, char *data_found) -{ - if (increment == -4 && len == 4) - { - long mask_long, data_long; - long data_found_long; - CORE_ADDR addr_we_found; - char *buf = alloca (rs->remote_packet_size); - long returned_long[2]; - char *p; - - mask_long = extract_unsigned_integer (mask, len); - data_long = extract_unsigned_integer (data, len); - sprintf (buf, "t%x:%x,%x", startaddr, data_long, mask_long); - putpkt (buf); - getpkt (buf, (rs->remote_packet_size), 0); - if (buf[0] == '\0') - { - /* The stub doesn't support the 't' request. We might want to - remember this fact, but on the other hand the stub could be - switched on us. Maybe we should remember it only until - the next "target remote". */ - generic_search (len, data, mask, startaddr, increment, lorange, - hirange, addr_found, data_found); - return; - } - - if (buf[0] == 'E') - /* There is no correspondance between what the remote protocol uses - for errors and errno codes. We would like a cleaner way of - representing errors (big enough to include errno codes, bfd_error - codes, and others). But for now just use EIO. */ - memory_error (EIO, startaddr); - p = buf; - addr_we_found = 0; - while (*p != '\0' && *p != ',') - addr_we_found = (addr_we_found << 4) + fromhex (*p++); - if (*p == '\0') - error ("Protocol error: short return for search"); - - data_found_long = 0; - while (*p != '\0' && *p != ',') - data_found_long = (data_found_long << 4) + fromhex (*p++); - /* Ignore anything after this comma, for future extensions. */ - - if (addr_we_found < lorange || addr_we_found >= hirange) - { - *addr_found = 0; - return; - } - - *addr_found = addr_we_found; - *data_found = store_unsigned_integer (data_we_found, len); - return; - } - generic_search (len, data, mask, startaddr, increment, lorange, - hirange, addr_found, data_found); -} -#endif /* 0 */ - static void remote_files_info (struct target_ops *ignore) { diff --git a/gdb/target.h b/gdb/target.h index a3e10e8..5a0d333 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -229,29 +229,6 @@ struct target_ops struct mem_attrib *attrib, struct target_ops *target); -#if 0 - /* Enable this after 4.12. */ - - /* Search target memory. Start at STARTADDR and take LEN bytes of - target memory, and them with MASK, and compare to DATA. If they - match, set *ADDR_FOUND to the address we found it at, store the data - we found at LEN bytes starting at DATA_FOUND, and return. If - not, add INCREMENT to the search address and keep trying until - the search address is outside of the range [LORANGE,HIRANGE). - - If we don't find anything, set *ADDR_FOUND to (CORE_ADDR)0 and - return. */ - - void (*to_search) (int len, char *data, char *mask, - CORE_ADDR startaddr, int increment, - CORE_ADDR lorange, CORE_ADDR hirange, - CORE_ADDR * addr_found, char *data_found); - -#define target_search(len, data, mask, startaddr, increment, lorange, hirange, addr_found, data_found) \ - (*current_target.to_search) (len, data, mask, startaddr, increment, \ - lorange, hirange, addr_found, data_found) -#endif /* 0 */ - void (*to_files_info) (struct target_ops *); int (*to_insert_breakpoint) (CORE_ADDR, char *); int (*to_remove_breakpoint) (CORE_ADDR, char *); -- 2.7.4