Merge GDB 7.5.1

gdb/objc-lang.c

 /* Objective-C language support routines for GDB, the GNU debugger.
 
    Copyright (C) 2002-2005, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
    Written by Michael Snyder.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
@@ skipping 506 matching lines @@
   objc_parse,
   objc_error,
   null_post_parser,
   objc_printchar,               /* Print a character constant */
   objc_printstr,                /* Function to print string constant */
   objc_emit_char,
   c_print_type,                 /* Print a type using appropriate syntax */
   c_print_typedef,              /* Print a typedef using appropriate syntax */
   c_val_print,                  /* Print a value using appropriate syntax */
   c_value_print,                /* Print a top-level value */
+  default_read_var_value,       /* la_read_var_value */
   objc_skip_trampoline,         /* Language specific skip_trampoline */
   "self",                       /* name_of_this */
   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 */
   objc_op_print_tab,            /* Expression operators for printing */
   1,                            /* C-style arrays */
   0,                            /* String lower bound */
   default_word_break_characters,
   default_make_symbol_completion_list,
   c_language_arch_info,
   default_print_array_index,
   default_pass_by_reference,
   default_get_string,
-  strcmp_iw_ordered,
+  NULL,                         /* la_get_symbol_name_cmp */
   iterate_over_symbols,
   LANG_MAGIC
 };
 
 /*
  * ObjC:
  * Following functions help construct Objective-C message calls.
  */
 
 struct selname          /* For parsing Objective-C.  */
@@ skipping 75 matching lines @@
     error (_("Can't find selector \"%s\""), p);
   write_exp_elt_longcst (selid);
   xfree(p);
   write_exp_elt_longcst (val);  /* Number of args */
   xfree(sel);
 
   return val;
 }
 
 /*
- * Function: specialcmp (char *a, char *b)
+ * Function: specialcmp (const char *a, const char *b)
  *
  * Special strcmp: treats ']' and ' ' as end-of-string.
  * Used for qsorting lists of objc methods (either by class or selector).
  */
 
 static int
-specialcmp (char *a, char *b)
+specialcmp (const char *a, const char *b)
 {
   while (*a && *a != ' ' && *a != ']' && *b && *b != ' ' && *b != ']')
     {
       if (*a != *b)
         return *a - *b;
       a++, b++;
     }
   if (*a && *a != ' ' && *a != ']')
     return  1;          /* a is longer therefore greater.  */
   if (*b && *b != ' ' && *b != ']')
     return -1;          /* a is shorter therefore lesser.  */
   return    0;          /* a and b are identical.  */
 }
 
 /*
  * Function: compare_selectors (const void *, const void *)
  *
  * Comparison function for use with qsort.  Arguments are symbols or
  * msymbols Compares selector part of objc method name alphabetically.
  */
 
 static int
 compare_selectors (const void *a, const void *b)
 {
-  char *aname, *bname;
+  const char *aname, *bname;
 
   aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
   bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
   if (aname == NULL || bname == NULL)
     error (_("internal: compare_selectors(1)"));
 
   aname = strchr(aname, ' ');
   bname = strchr(bname, ' ');
   if (aname == NULL || bname == NULL)
     error (_("internal: compare_selectors(2)"));
 
   return specialcmp (aname+1, bname+1);
 }
 
 /*
  * Function: selectors_info (regexp, from_tty)
  *
  * Implements the "Info selectors" command.  Takes an optional regexp
  * arg.  Lists all objective c selectors that match the regexp.  Works
  * by grepping thru all symbols for objective c methods.  Output list
  * is sorted and uniqued. 
  */
 
 static void
 selectors_info (char *regexp, int from_tty)
 {
   struct objfile        *objfile;
   struct minimal_symbol *msymbol;
-  char                  *name;
+  const char            *name;
   char                  *val;
   int                    matches = 0;
   int                    maxlen  = 0;
   int                    ix;
   char                   myregexp[2048];
   char                   asel[256];
   struct symbol        **sym_arr;
   int                    plusminus = 0;
 
   if (regexp == NULL)
@@ skipping 44 matching lines @@
           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;
-              char *myend   = (char *) strchr (mystart, ']');
+              const char *mystart = name;
+              const char *myend   = strchr (mystart, ']');
               
               if (myend && (myend - mystart > maxlen))
                 maxlen = myend - mystart;       /* Get longest selector.  */
               matches++;
             }
         }
     }
   if (matches)
     {
       printf_filtered (_("Selectors matching \"%s\":\n\n"), 
@@ skipping 50 matching lines @@
 /*
  * Function: compare_classes (const void *, const void *)
  *
  * Comparison function for use with qsort.  Arguments are symbols or
  * msymbols Compares class part of objc method name alphabetically. 
  */
 
 static int
 compare_classes (const void *a, const void *b)
 {
-  char *aname, *bname;
+  const char *aname, *bname;
 
   aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
   bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
   if (aname == NULL || bname == NULL)
     error (_("internal: compare_classes(1)"));
 
   return specialcmp (aname+1, bname+1);
 }
 
 /*
  * Function: classes_info(regexp, from_tty)
  *
  * Implements the "info classes" command for objective c classes.
  * Lists all objective c classes that match the optional regexp.
  * Works by grepping thru the list of objective c methods.  List will
  * be sorted and uniqued (since one class may have many methods).
  * BUGS: will not list a class that has no methods. 
  */
 
 static void
 classes_info (char *regexp, int from_tty)
 {
   struct objfile        *objfile;
   struct minimal_symbol *msymbol;
-  char                  *name;
+  const char            *name;
   char                  *val;
   int                    matches = 0;
   int                    maxlen  = 0;
   int                    ix;
   char                   myregexp[2048];
   char                   aclass[256];
   struct symbol        **sym_arr;
 
   if (regexp == NULL)
     strcpy(myregexp, ".* ");    /* Null input: match all objc classes.  */
@@ skipping 21 matching lines @@
   ALL_MSYMBOLS (objfile, msymbol)
     {
       QUIT;
       name = SYMBOL_NATURAL_NAME (msymbol);
       if (name &&
          (name[0] == '-' || name[0] == '+') &&
           name[1] == '[')                       /* Got a method name.  */
         if (regexp == NULL || re_exec(name+2) != 0)
           { 
             /* Compute length of classname part.  */
-            char *mystart = name + 2;
-            char *myend   = (char *) strchr(mystart, ' ');
+            const char *mystart = name + 2;
+            const char *myend   = strchr (mystart, ' ');
             
             if (myend && (myend - mystart > maxlen))
               maxlen = myend - mystart;
             matches++;
           }
     }
   if (matches)
     {
       printf_filtered (_("Classes matching \"%s\":\n\n"), 
                        regexp ? regexp : "*");
@@ skipping 196 matching lines @@
   return s2;
 }
 
 static void
 find_methods (char type, const char *class, const char *category, 
               const char *selector,
               VEC (const_char_ptr) **symbol_names)
 {
   struct objfile *objfile = NULL;
 
-  char *symname = NULL;
+  const char *symname = NULL;
 
   char ntype = '\0';
   char *nclass = NULL;
   char *ncategory = NULL;
   char *nselector = NULL;
 
   static char *tmp = NULL;
   static unsigned int tmplen = 0;
 
   gdb_assert (symbol_names != NULL);
@@ skipping 626 matching lines @@
     return 0;
   
   res = find_implementation_from_class (gdbarch, sstr.class, sel);
   if (new_pc != 0)
     *new_pc = res;
   if (res == 0)
     return 1;
   return 0;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_objc_lang;
+
 void
 _initialize_objc_lang (void)
 {
   objc_objfile_data = register_objfile_data ();
 }