* read.h (s_vendor_attribute): Move to...

[deliverable/binutils-gdb.git] / gdb / findcmd.c

diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index c752316bcc5cf566d3a9312199f30caee1a80ca0..116e0b0107beb65bbad39c73ec9d11fdc7e17be8 100644 (file)
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -1,6 +1,6 @@
 /* The find command.
 
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -126,11 +126,13 @@ parse_find_args (char *args, ULONGEST *max_countp,
   if (*s == '+')
     {
       LONGEST len;
+
       ++s;
       v = parse_to_comma_and_eval (&s);
       len = value_as_long (v);
       if (len == 0)
        {
+         do_cleanups (old_cleanups);
          printf_filtered (_("Empty search range.\n"));
          return;
        }
@@ -145,16 +147,18 @@ parse_find_args (char *args, ULONGEST *max_countp,
   else
     {
       CORE_ADDR end_addr;
+
       v = parse_to_comma_and_eval (&s);
       end_addr = value_as_address (v);
       if (start_addr > end_addr)
-       error (_("Invalid search space, end preceeds start."));
+       error (_("Invalid search space, end precedes start."));
       search_space_len = end_addr - start_addr + 1;
       /* We don't support searching all of memory
         (i.e. start=0, end = 0xff..ff).
         Bail to avoid overflows later on.  */
       if (search_space_len == 0)
-       error (_("Overflow in address range computation, choose smaller range."));
+       error (_("Overflow in address range "
+                "computation, choose smaller range."));
     }
 
   if (*s == ',')
@@ -165,21 +169,24 @@ parse_find_args (char *args, ULONGEST *max_countp,
   while (*s != '\0')
     {
       LONGEST x;
-      int val_bytes;
+      struct type *t;
+      ULONGEST pattern_buf_size_need;
 
       while (isspace (*s))
        ++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.  */
-      if ((pattern_buf_end - pattern_buf + max (val_bytes, sizeof (int64_t)))
-         > pattern_buf_size)
+      pattern_buf_size_need = (pattern_buf_end - pattern_buf
+                              + 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 *= 2;
+
+         pattern_buf_size = pattern_buf_size_need * 2;
          pattern_buf = xrealloc (pattern_buf, pattern_buf_size);
          pattern_buf_end = pattern_buf + current_offset;
        }
@@ -208,8 +215,8 @@ parse_find_args (char *args, ULONGEST *max_countp,
        }
       else
        {
-         memcpy (pattern_buf_end, value_contents_raw (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 == ',')
@@ -298,6 +305,7 @@ find_command (char *args, int from_tty)
   if (found_count > 0)
     {
       struct type *ptr_type = builtin_type (gdbarch)->builtin_data_ptr;
+
       set_internalvar (lookup_internalvar ("_"),
                       value_from_pointer (ptr_type, last_found_addr));
     }
@@ -319,8 +327,8 @@ _initialize_mem_search (void)
 {
   add_cmd ("find", class_vars, find_command, _("\
 Search memory for a sequence of bytes.\n\
-Usage:\n\
-find [/size-char] [/max-count] start-address, end-address, expr1 [, expr2 ...]\n\
+Usage:\nfind \
+[/size-char] [/max-count] start-address, end-address, expr1 [, expr2 ...]\n\
 find [/size-char] [/max-count] start-address, +length, expr1 [, expr2 ...]\n\
 size-char is one of b,h,w,g for 8,16,32,64 bit values respectively,\n\
 and if not specified the size is taken from the type of the expression\n\