* corefile.c (generic_search): Delete disabled code.

	* gdbcore.h (generic_search): Delete declaration.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 81c50ae..2d96f6e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28  Pedro Alves  <pedro@codesourcery.com>
+
+       * corefile.c (generic_search): Delete disabled code.
+       * gdbcore.h (generic_search): Delete declaration.
+
 2009-01-26  Pedro Alves  <pedro@codesourcery.com>
 
        * linux-nat.c (linux_child_follow_fork): Copy attach_flag from the

diff --git a/gdb/corefile.c b/gdb/corefile.c
index 57a0cdf..e667183 100644 (file)
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -368,40 +368,6 @@ write_memory_signed_integer (CORE_ADDR addr, int len, LONGEST value)
   store_signed_integer (buf, len, value);
   write_memory (addr, buf, len);
 }
-
-\f
-
-#if 0
-/* Enable after 4.12.  It is not tested.  */
-
-/* Search code.  Targets can just make this their search function, or
-   if the protocol has a less general search function, they can call this
-   in the cases it can't handle.  */
-void
-generic_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)
-{
-  int i;
-  CORE_ADDR curaddr = startaddr;
-
-  while (curaddr >= lorange && curaddr < hirange)
-    {
-      read_memory (curaddr, data_found, len);
-      for (i = 0; i < len; ++i)
-       if ((data_found[i] & mask[i]) != data[i])
-         goto try_again;
-      /* It matches.  */
-      *addr_found = curaddr;
-      return;
-
-    try_again:
-      curaddr += increment;
-    }
-  *addr_found = (CORE_ADDR) 0;
-  return;
-}
-#endif /* 0 */
 \f
 /* The current default bfd target.  Points to storage allocated for
    gnutarget_string.  */

diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h
index 5636cd5..5b538ec 100644 (file)
--- a/gdb/gdbcore.h
+++ b/gdb/gdbcore.h
@@ -82,11 +82,6 @@ extern void write_memory_unsigned_integer (CORE_ADDR addr, int len,
 /* Store VALUE at ADDR in the inferior as a LEN-byte unsigned integer.  */
 extern void write_memory_signed_integer (CORE_ADDR addr, int len,
                                          LONGEST value);
-
-extern void generic_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);
 \f
 /* Hook for `exec_file_command' command to call.  */