GDB 7.6.50

gdb/findcmd.c

 /* The find command.
 
-   Copyright (C) 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbcmd.h"
 #include "value.h"
 #include "target.h"
+#include "cli/cli-utils.h"
 
 /* Copied from bfd_put_bits.  */
 
 static void
-put_bits (bfd_uint64_t data, char *buf, int bits, bfd_boolean big_p)
+put_bits (bfd_uint64_t data, gdb_byte *buf, int bits, bfd_boolean big_p)
 {
   int i;
   int bytes;
 
   gdb_assert (bits % 8 == 0);
 
   bytes = bits / 8;
   for (i = 0; i < bytes; i++)
     {
       int index = big_p ? bytes - i - 1 : i;
 
       buf[index] = data & 0xff;
       data >>= 8;
     }
 }
 
 /* Subroutine of find_command to simplify it.
    Parse the arguments of the "find" command.  */
 
 static void
 parse_find_args (char *args, ULONGEST *max_countp,
-                 char **pattern_bufp, ULONGEST *pattern_lenp,
+                 gdb_byte **pattern_bufp, ULONGEST *pattern_lenp,
                  CORE_ADDR *start_addrp, ULONGEST *search_space_lenp,
                  bfd_boolean big_p)
 {
   /* Default to using the specified type.  */
   char size = '\0';
   ULONGEST max_count = ~(ULONGEST) 0;
   /* Buffer to hold the search pattern.  */
-  char *pattern_buf;
+  gdb_byte *pattern_buf;
   /* Current size of search pattern buffer.
      We realloc space as needed.  */
 #define INITIAL_PATTERN_BUF_SIZE 100
   ULONGEST pattern_buf_size = INITIAL_PATTERN_BUF_SIZE;
   /* Pointer to one past the last in-use part of pattern_buf.  */
-  char *pattern_buf_end;
+  gdb_byte *pattern_buf_end;
   ULONGEST pattern_len;
   CORE_ADDR start_addr;
   ULONGEST search_space_len;
-  char *s = args;
+  const char *s = args;
   struct cleanup *old_cleanups;
   struct value *v;
 
   if (args == NULL)
     error (_("Missing search parameters."));
 
   pattern_buf = xmalloc (pattern_buf_size);
   pattern_buf_end = pattern_buf;
   old_cleanups = make_cleanup (free_current_contents, &pattern_buf);
 
@@ skipping 20 matching lines @@
             case 'h':
             case 'w':
             case 'g':
               size = *s++;
               break;
             default:
               error (_("Invalid size granularity."));
             }
         }
 
-      while (isspace (*s))
-        ++s;
+      s = skip_spaces_const (s);
     }
 
   /* Get the search range.  */
 
   v = parse_to_comma_and_eval (&s);
   start_addr = value_as_address (v);
 
   if (*s == ',')
     ++s;
-  while (isspace (*s))
-    ++s;
+  s = skip_spaces_const (s);
 
   if (*s == '+')
     {
       LONGEST len;
 
       ++s;
       v = parse_to_comma_and_eval (&s);
       len = value_as_long (v);
       if (len == 0)
         {
@@ skipping 27 matching lines @@
     }
 
   if (*s == ',')
     ++s;
 
   /* Fetch the search string.  */
 
   while (*s != '\0')
     {
       LONGEST x;
-      int val_bytes;
+      struct type *t;
       ULONGEST pattern_buf_size_need;
 
-      while (isspace (*s))
-        ++s;
+      s = skip_spaces_const (s);
 
       v = parse_to_comma_and_eval (&s);
-      val_bytes = TYPE_LENGTH (value_type (v));
+      t = value_type (v);
 
       /* Keep it simple and assume size == 'g' when watching for when we
          need to grow the pattern buf.  */
       pattern_buf_size_need = (pattern_buf_end - pattern_buf
-                               + max (val_bytes, sizeof (int64_t)));
+                               + max (TYPE_LENGTH (t), sizeof (int64_t)));
       if (pattern_buf_size_need > pattern_buf_size)
         {
           size_t current_offset = pattern_buf_end - pattern_buf;
 
           pattern_buf_size = pattern_buf_size_need * 2;
           pattern_buf = xrealloc (pattern_buf, pattern_buf_size);
           pattern_buf_end = pattern_buf + current_offset;
         }
 
       if (size != '\0')
@@ skipping 13 matching lines @@
               pattern_buf_end += sizeof (int32_t);
               break;
             case 'g':
               put_bits (x, pattern_buf_end, 64, big_p);
               pattern_buf_end += sizeof (int64_t);
               break;
             }
         }
       else
         {
-          memcpy (pattern_buf_end, value_contents (v), val_bytes);
-          pattern_buf_end += val_bytes;
+          memcpy (pattern_buf_end, value_contents (v), TYPE_LENGTH (t));
+          pattern_buf_end += TYPE_LENGTH (t);
         }
 
       if (*s == ',')
         ++s;
-      while (isspace (*s))
-        ++s;
+      s = skip_spaces_const (s);
     }
 
   if (pattern_buf_end == pattern_buf)
     error (_("Missing search pattern."));
 
   pattern_len = pattern_buf_end - pattern_buf;
 
   if (search_space_len < pattern_len)
     error (_("Search space too small to contain pattern."));
 
   *max_countp = max_count;
   *pattern_bufp = pattern_buf;
   *pattern_lenp = pattern_len;
   *start_addrp = start_addr;
   *search_space_lenp = search_space_len;
 
   /* We successfully parsed the arguments, leave the freeing of PATTERN_BUF
      to the caller now.  */
   discard_cleanups (old_cleanups);
 }
 
 static void
 find_command (char *args, int from_tty)
 {
   struct gdbarch *gdbarch = get_current_arch ();
   bfd_boolean big_p = gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG;
   /* Command line parameters.
      These are initialized to avoid uninitialized warnings from -Wall.  */
   ULONGEST max_count = 0;
-  char *pattern_buf = 0;
+  gdb_byte *pattern_buf = 0;
   ULONGEST pattern_len = 0;
   CORE_ADDR start_addr = 0;
   ULONGEST search_space_len = 0;
   /* End of command line parameters.  */
   unsigned int found_count;
   CORE_ADDR last_found_addr;
   struct cleanup *old_cleanups;
 
   parse_find_args (args, &max_count, &pattern_buf, &pattern_len, 
                    &start_addr, &search_space_len, big_p);
@@ skipping 68 matching lines @@
 and if not specified the size is taken from the type of the expression\n\
 in the current language.\n\
 Note that this means for example that in the case of C-like languages\n\
 a search for an untyped 0x42 will search for \"(int) 0x42\"\n\
 which is typically four bytes.\n\
 \n\
 The address of the last match is stored as the value of \"$_\".\n\
 Convenience variable \"$numfound\" is set to the number of matches."),
            &cmdlist);
 }