* ui-out.c (ui_out_get_field_separator): Remove unused function.

[deliverable/binutils-gdb.git] / gdb / objc-lang.c

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index d5897c036b6f2d2d6ebd33cec2d0b3e20a15b298..592b52e3ca2c25a39427b3dd624d3165893cd0f5 100644 (file)
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1,6 +1,6 @@
 /* Objective-C language support routines for GDB, the GNU debugger.
 
 /* Objective-C language support routines for GDB, the GNU debugger.
 

-   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011

    Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
    Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.


@@ -125,7 +125,8 @@ lookup_objc_class (struct gdbarch *gdbarch, char *classname)
     function = find_function_in_inferior("objc_lookup_class", NULL);
   else
     {
     function = find_function_in_inferior("objc_lookup_class", NULL);
   else
     {

-      complaint (&symfile_complaints, _("no way to lookup Objective-C classes"));
+      complaint (&symfile_complaints,
+                _("no way to lookup Objective-C classes"));

       return 0;
     }
 
       return 0;
     }
 


@@ -153,12 +154,14 @@ lookup_child_selector (struct gdbarch *gdbarch, char *selname)
     function = find_function_in_inferior("sel_get_any_uid", NULL);
   else
     {
     function = find_function_in_inferior("sel_get_any_uid", NULL);
   else
     {

-      complaint (&symfile_complaints, _("no way to lookup Objective-C selectors"));
+      complaint (&symfile_complaints,
+                _("no way to lookup Objective-C selectors"));

       return 0;
     }
 
   selstring = value_coerce_array (value_string (selname, 
       return 0;
     }
 
   selstring = value_coerce_array (value_string (selname, 

-                                               strlen (selname) + 1, char_type));
+                                               strlen (selname) + 1,
+                                               char_type));

   return value_as_long (call_function_by_hand (function, 1, &selstring));
 }
 
   return value_as_long (call_function_by_hand (function, 1, &selstring));
 }
 


@@ -233,25 +236,26 @@ objc_demangle (const char *mangled, int options)
        *cp++ = '+';            /* for class    method */
 
       *cp++ = '[';             /* opening left brace  */
        *cp++ = '+';            /* for class    method */
 
       *cp++ = '[';             /* opening left brace  */

-      strcpy(cp, mangled+3);   /* tack on the rest of the mangled name */
+      strcpy(cp, mangled+3);   /* Tack on the rest of the mangled name.  */

 
       while (*cp && *cp == '_')
 
       while (*cp && *cp == '_')

-       cp++;                   /* skip any initial underbars in class name */
+       cp++;                   /* Skip any initial underbars in class
+                                  name.  */

 
       cp = strchr(cp, '_');
 
       cp = strchr(cp, '_');

-      if (!cp)                 /* find first non-initial underbar */
+      if (!cp)                 /* Find first non-initial underbar.  */

        {
          xfree(demangled);     /* not mangled name */
          return NULL;
        }
        {
          xfree(demangled);     /* not mangled name */
          return NULL;
        }

-      if (cp[1] == '_')                /* easy case: no category name     */
+      if (cp[1] == '_')                /* Easy case: no category name.    */

        {
        {

-         *cp++ = ' ';          /* replace two '_' with one ' '    */
+         *cp++ = ' ';          /* Replace two '_' with one ' '.   */

          strcpy(cp, mangled + (cp - demangled) + 2);
        }
       else
        {
          strcpy(cp, mangled + (cp - demangled) + 2);
        }
       else
        {

-         *cp++ = '(';          /* less easy case: category name */
+         *cp++ = '(';          /* Less easy case: category name.  */

          cp = strchr(cp, '_');
          if (!cp)
            {
          cp = strchr(cp, '_');
          if (!cp)
            {


@@ -259,16 +263,17 @@ objc_demangle (const char *mangled, int options)
              return NULL;
            }
          *cp++ = ')';
              return NULL;
            }
          *cp++ = ')';

-         *cp++ = ' ';          /* overwriting 1st char of method name...  */
-         strcpy(cp, mangled + (cp - demangled));       /* get it back */
+         *cp++ = ' ';          /* Overwriting 1st char of method name...  */
+         strcpy(cp, mangled + (cp - demangled));       /* Get it back.  */

        }
 
       while (*cp && *cp == '_')
        }
 
       while (*cp && *cp == '_')

-       cp++;                   /* skip any initial underbars in method name */
+       cp++;                   /* Skip any initial underbars in
+                                  method name.  */

 
       for (; *cp; cp++)
        if (*cp == '_')
 
       for (; *cp; cp++)
        if (*cp == '_')

-         *cp = ':';            /* replace remaining '_' with ':' */
+         *cp = ':';            /* Replace remaining '_' with ':'.  */

 
       *cp++ = ']';             /* closing right brace */
       *cp++ = 0;               /* string terminator */
 
       *cp++ = ']';             /* closing right brace */
       *cp++ = 0;               /* string terminator */


@@ -434,7 +439,7 @@ objc_printstr (struct ui_file *stream, struct type *type,
 
 /* Determine if we are currently in the Objective-C dispatch function.
    If so, get the address of the method function that the dispatcher
 
 /* Determine if we are currently in the Objective-C dispatch function.
    If so, get the address of the method function that the dispatcher

-   would call and use that as the function to step into instead. Also
+   would call and use that as the function to step into instead.  Also

    skip over the trampoline for the function (if any).  This is better
    for the user since they are only interested in stepping into the
    method function anyway.  */
    skip over the trampoline for the function (if any).  This is better
    for the user since they are only interested in stepping into the
    method function anyway.  */


@@ -525,7 +530,8 @@ const struct language_defn objc_language_defn = {
   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
   basic_lookup_transparent_type,/* lookup_transparent_type */
   objc_demangle,               /* Language specific symbol demangler */
   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
   basic_lookup_transparent_type,/* lookup_transparent_type */
   objc_demangle,               /* Language specific symbol demangler */

-  NULL,                                /* Language specific class_name_from_physname */
+  NULL,                                /* Language specific
+                                  class_name_from_physname */

   objc_op_print_tab,           /* Expression operators for printing */
   1,                           /* C-style arrays */
   0,                           /* String lower bound */
   objc_op_print_tab,           /* Expression operators for printing */
   1,                           /* C-style arrays */
   0,                           /* String lower bound */


@@ -540,7 +546,7 @@ const struct language_defn objc_language_defn = {
 
 /*
  * ObjC:
 
 /*
  * ObjC:

- * Following functions help construct Objective-C message calls 
+ * Following functions help construct Objective-C message calls.

  */
 
 struct selname         /* For parsing Objective-C.  */
  */
 
 struct selname         /* For parsing Objective-C.  */


@@ -645,10 +651,10 @@ specialcmp (char *a, char *b)
       a++, b++;
     }
   if (*a && *a != ' ' && *a != ']')
       a++, b++;
     }
   if (*a && *a != ' ' && *a != ']')

-    return  1;         /* a is longer therefore greater */
+    return  1;         /* a is longer therefore greater.  */

   if (*b && *b != ' ' && *b != ']')
   if (*b && *b != ' ' && *b != ']')

-    return -1;         /* a is shorter therefore lesser */
-  return    0;         /* a and b are identical */
+    return -1;         /* a is shorter therefore lesser.  */
+  return    0;         /* a and b are identical.  */

 }
 
 /*
 }
 
 /*


@@ -714,6 +720,9 @@ selectors_info (char *regexp, int from_tty)
        strcpy(myregexp, ".*]");
       else
        {
        strcpy(myregexp, ".*]");
       else
        {

+         /* Allow a few extra bytes because of the strcat below.  */
+         if (sizeof (myregexp) < strlen (regexp) + 4)
+           error (_("Regexp is too long: %s"), regexp);

          strcpy(myregexp, regexp);
          if (myregexp[strlen(myregexp) - 1] == '$') /* end of selector */
            myregexp[strlen(myregexp) - 1] = ']';    /* end of method name */
          strcpy(myregexp, regexp);
          if (myregexp[strlen(myregexp) - 1] == '$') /* end of selector */
            myregexp[strlen(myregexp) - 1] = ']';    /* end of method name */


@@ -734,19 +743,26 @@ selectors_info (char *regexp, int from_tty)
     {
       QUIT;
       name = SYMBOL_NATURAL_NAME (msymbol);
     {
       QUIT;
       name = SYMBOL_NATURAL_NAME (msymbol);

-      if (name &&
-        (name[0] == '-' || name[0] == '+') &&
-         name[1] == '[')               /* Got a method name.  */
+      if (name
+          && (name[0] == '-' || name[0] == '+')
+         && name[1] == '[')            /* Got a method name.  */

        {
          /* Filter for class/instance methods.  */
          if (plusminus && name[0] != plusminus)
            continue;
          /* Find selector part.  */
        {
          /* Filter for class/instance methods.  */
          if (plusminus && name[0] != plusminus)
            continue;
          /* Find selector part.  */

-         name = (char *) strchr(name+2, ' ');
+         name = (char *) strchr (name+2, ' ');
+         if (name == NULL)
+           {
+             complaint (&symfile_complaints, 
+                        _("Bad method name '%s'"), 
+                        SYMBOL_NATURAL_NAME (msymbol));
+             continue;
+           }

          if (regexp == NULL || re_exec(++name) != 0)
            { 
              char *mystart = name;
          if (regexp == NULL || re_exec(++name) != 0)
            { 
              char *mystart = name;

-             char *myend   = (char *) strchr(mystart, ']');
+             char *myend   = (char *) strchr (mystart, ']');

              
              if (myend && (myend - mystart > maxlen))
                maxlen = myend - mystart;       /* Get longest selector.  */
              
              if (myend && (myend - mystart > maxlen))
                maxlen = myend - mystart;       /* Get longest selector.  */


@@ -803,7 +819,8 @@ selectors_info (char *regexp, int from_tty)
       begin_line();
     }
   else
       begin_line();
     }
   else

-    printf_filtered (_("No selectors matching \"%s\"\n"), regexp ? regexp : "*");
+    printf_filtered (_("No selectors matching \"%s\"\n"),
+                    regexp ? regexp : "*");

 }
 
 /*
 }
 
 /*


@@ -854,6 +871,9 @@ classes_info (char *regexp, int from_tty)
     strcpy(myregexp, ".* ");   /* Null input: match all objc classes.  */
   else
     {
     strcpy(myregexp, ".* ");   /* Null input: match all objc classes.  */
   else
     {

+      /* Allow a few extra bytes because of the strcat below.  */
+      if (sizeof (myregexp) < strlen (regexp) + 4)
+       error (_("Regexp is too long: %s"), regexp);

       strcpy(myregexp, regexp);
       if (myregexp[strlen(myregexp) - 1] == '$')
        /* In the method name, the end of the class name is marked by ' '.  */
       strcpy(myregexp, regexp);
       if (myregexp[strlen(myregexp) - 1] == '$')
        /* In the method name, the end of the class name is marked by ' '.  */


@@ -959,7 +979,7 @@ classes_info (char *regexp, int from_tty)
  *       into two parts: debuggable (struct symbol) syms, and
  *       non_debuggable (struct minimal_symbol) syms.  The debuggable
  *       ones will come first, before NUM_DEBUGGABLE (which will thus
  *       into two parts: debuggable (struct symbol) syms, and
  *       non_debuggable (struct minimal_symbol) syms.  The debuggable
  *       ones will come first, before NUM_DEBUGGABLE (which will thus

- *       be the index of the first non-debuggable one). 
+ *       be the index of the first non-debuggable one).

  */
 
 /*
  */
 
 /*


@@ -1201,6 +1221,8 @@ find_methods (struct symtab *symtab, char type,
          pc = gdbarch_convert_from_func_ptr_addr (gdbarch, pc,
                                                   &current_target);
 
          pc = gdbarch_convert_from_func_ptr_addr (gdbarch, pc,
                                                   &current_target);
 

+         objfile_csym++;
+

          if (symtab)
            if (pc < BLOCK_START (block) || pc >= BLOCK_END (block))
              /* Not in the specified symtab.  */
          if (symtab)
            if (pc < BLOCK_START (block) || pc >= BLOCK_END (block))
              /* Not in the specified symtab.  */


@@ -1214,10 +1236,9 @@ find_methods (struct symtab *symtab, char type,
            }
          strcpy (tmp, symname);
 
            }
          strcpy (tmp, symname);
 

-         if (parse_method (tmp, &ntype, &nclass, &ncategory, &nselector) == NULL)
+         if (parse_method (tmp, &ntype, &nclass,
+                           &ncategory, &nselector) == NULL)

            continue;
            continue;

-      
-         objfile_csym++;

 
          if ((type != '\0') && (ntype != type))
            continue;
 
          if ((type != '\0') && (ntype != type))
            continue;


@@ -1363,7 +1384,7 @@ char *find_imps (struct symtab *symtab, struct block *block,
    * with debug symbols from the first batch.  Repeat until either the
    * second section is out of debug symbols or the first section is
    * full of debug symbols.  Either way we have all debug symbols
    * with debug symbols from the first batch.  Repeat until either the
    * second section is out of debug symbols or the first section is
    * full of debug symbols.  Either way we have all debug symbols

-   * packed to the beginning of the buffer.  
+   * packed to the beginning of the buffer.

    */
 
   if (syms != NULL) 
    */
 
   if (syms != NULL) 


@@ -1468,7 +1489,7 @@ print_object_command (char *args, int from_tty)
 
 /* The data structure 'methcalls' is used to detect method calls (thru
  * ObjC runtime lib functions objc_msgSend, objc_msgSendSuper, etc.),
 
 /* The data structure 'methcalls' is used to detect method calls (thru
  * ObjC runtime lib functions objc_msgSend, objc_msgSendSuper, etc.),

- * and ultimately find the method being called. 
+ * and ultimately find the method being called.

  */
 
 struct objc_methcall {
  */
 
 struct objc_methcall {


@@ -1501,7 +1522,7 @@ static struct objc_methcall methcalls[] = {
  * structure "objc_msgs" by finding the addresses of each of the
  * (currently four) functions that it holds (of which objc_msgSend is
  * the first).  This must be called each time symbols are loaded, in
  * structure "objc_msgs" by finding the addresses of each of the
  * (currently four) functions that it holds (of which objc_msgSend is
  * the first).  This must be called each time symbols are loaded, in

- * case the functions have moved for some reason.  
+ * case the functions have moved for some reason.

  */
 
 static void 
  */
 
 static void 


@@ -1545,7 +1566,7 @@ find_objc_msgsend (void)
  * returning the address of the shlib function that would be called.
  * That functionality has been moved into the gdbarch_skip_trampoline_code and
  * IN_SOLIB_TRAMPOLINE macros, which are resolved in the target-
  * returning the address of the shlib function that would be called.
  * That functionality has been moved into the gdbarch_skip_trampoline_code and
  * IN_SOLIB_TRAMPOLINE macros, which are resolved in the target-

- * dependent modules.  
+ * dependent modules.

  */
 
 struct objc_submethod_helper_data {
  */
 
 struct objc_submethod_helper_data {


@@ -1579,7 +1600,8 @@ find_objc_msgcall_submethod (int (*f) (CORE_ADDR, CORE_ADDR *),
 
   if (catch_errors (find_objc_msgcall_submethod_helper,
                    (void *) &s,
 
   if (catch_errors (find_objc_msgcall_submethod_helper,
                    (void *) &s,

-                   "Unable to determine target of Objective-C method call (ignoring):\n",
+                   "Unable to determine target of "
+                   "Objective-C method call (ignoring):\n",

                    RETURN_MASK_ALL) == 0) 
     return 1;
   else 
                    RETURN_MASK_ALL) == 0) 
     return 1;
   else 


@@ -1610,7 +1632,8 @@ find_objc_msgcall (CORE_ADDR pc, CORE_ADDR *new_pc)
   return 0;
 }
 
   return 0;
 }
 

-extern initialize_file_ftype _initialize_objc_language; /* -Wmissing-prototypes */
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_objc_language;

 
 void
 _initialize_objc_language (void)
 
 void
 _initialize_objc_language (void)


@@ -1682,7 +1705,8 @@ read_objc_class (struct gdbarch *gdbarch, CORE_ADDR addr,
   class->name = read_memory_unsigned_integer (addr + 8, 4, byte_order);
   class->version = read_memory_unsigned_integer (addr + 12, 4, byte_order);
   class->info = read_memory_unsigned_integer (addr + 16, 4, byte_order);
   class->name = read_memory_unsigned_integer (addr + 8, 4, byte_order);
   class->version = read_memory_unsigned_integer (addr + 12, 4, byte_order);
   class->info = read_memory_unsigned_integer (addr + 16, 4, byte_order);

-  class->instance_size = read_memory_unsigned_integer (addr + 18, 4, byte_order);
+  class->instance_size = read_memory_unsigned_integer (addr + 18, 4,
+                                                      byte_order);

   class->ivars = read_memory_unsigned_integer (addr + 24, 4, byte_order);
   class->methods = read_memory_unsigned_integer (addr + 28, 4, byte_order);
   class->cache = read_memory_unsigned_integer (addr + 32, 4, byte_order);
   class->ivars = read_memory_unsigned_integer (addr + 24, 4, byte_order);
   class->methods = read_memory_unsigned_integer (addr + 28, 4, byte_order);
   class->cache = read_memory_unsigned_integer (addr + 32, 4, byte_order);


@@ -1731,7 +1755,7 @@ find_implementation_from_class (struct gdbarch *gdbarch,
 
              if (meth_str.name == sel) 
                /* FIXME: hppa arch was doing a pointer dereference
 
              if (meth_str.name == sel) 
                /* FIXME: hppa arch was doing a pointer dereference

-                  here. There needs to be a better way to do that.  */
+                  here.  There needs to be a better way to do that.  */

                return meth_str.imp;
            }
          mlistnum++;
                return meth_str.imp;
            }
          mlistnum++;