gdb

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

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

-   Copyright 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.

 
    Contributed by Apple Computer, Inc.
    Written by Michael Snyder.
 
    Contributed by Apple Computer, Inc.
    Written by Michael Snyder.


@@ -9,7 +10,7 @@
 
    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
 
    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 2 of the License, or
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,9 +19,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "symtab.h"
 
 #include "defs.h"
 #include "symtab.h"


@@ -30,6 +29,7 @@
 #include "language.h"
 #include "c-lang.h"
 #include "objc-lang.h"
 #include "language.h"
 #include "c-lang.h"
 #include "objc-lang.h"

+#include "exceptions.h"

 #include "complaints.h"
 #include "value.h"
 #include "symfile.h"
 #include "complaints.h"
 #include "value.h"
 #include "symfile.h"


@@ -83,24 +83,23 @@ struct objc_method {
 struct symbol *
 lookup_struct_typedef (char *name, struct block *block, int noerr)
 {
 struct symbol *
 lookup_struct_typedef (char *name, struct block *block, int noerr)
 {

-  register struct symbol *sym;
+  struct symbol *sym;

 
 

-  sym = lookup_symbol (name, block, STRUCT_DOMAIN, 0, 
-                      (struct symtab **) NULL);
+  sym = lookup_symbol (name, block, STRUCT_DOMAIN, 0);

 
   if (sym == NULL)
     {
       if (noerr)
        return 0;
       else 
 
   if (sym == NULL)
     {
       if (noerr)
        return 0;
       else 

-       error ("No struct type named %s.", name);
+       error (_("No struct type named %s."), name);

     }
   if (TYPE_CODE (SYMBOL_TYPE (sym)) != TYPE_CODE_STRUCT)
     {
       if (noerr)
        return 0;
       else
     }
   if (TYPE_CODE (SYMBOL_TYPE (sym)) != TYPE_CODE_STRUCT)
     {
       if (noerr)
        return 0;
       else

-       error ("This context has class, union or enum %s, not a struct.", 
+       error (_("This context has class, union or enum %s, not a struct."), 

               name);
     }
   return sym;
               name);
     }
   return sym;


@@ -118,12 +117,12 @@ lookup_objc_class (char *classname)
     }
 
   if (lookup_minimal_symbol("objc_lookUpClass", 0, 0))
     }
 
   if (lookup_minimal_symbol("objc_lookUpClass", 0, 0))

-    function = find_function_in_inferior("objc_lookUpClass");
+    function = find_function_in_inferior("objc_lookUpClass", NULL);

   else if (lookup_minimal_symbol ("objc_lookup_class", 0, 0))
   else if (lookup_minimal_symbol ("objc_lookup_class", 0, 0))

-    function = find_function_in_inferior("objc_lookup_class");
+    function = find_function_in_inferior("objc_lookup_class", NULL);

   else
     {
   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;
     }
 


@@ -133,7 +132,7 @@ lookup_objc_class (char *classname)
                                                           1, &classval));
 }
 
                                                           1, &classval));
 }
 

-int
+CORE_ADDR

 lookup_child_selector (char *selname)
 {
   struct value * function, *selstring;
 lookup_child_selector (char *selname)
 {
   struct value * function, *selstring;


@@ -145,12 +144,12 @@ lookup_child_selector (char *selname)
     }
 
   if (lookup_minimal_symbol("sel_getUid", 0, 0))
     }
 
   if (lookup_minimal_symbol("sel_getUid", 0, 0))

-    function = find_function_in_inferior("sel_getUid");
+    function = find_function_in_inferior("sel_getUid", NULL);

   else if (lookup_minimal_symbol ("sel_get_any_uid", 0, 0))
   else if (lookup_minimal_symbol ("sel_get_any_uid", 0, 0))

-    function = find_function_in_inferior("sel_get_any_uid");
+    function = find_function_in_inferior("sel_get_any_uid", NULL);

   else
     {
   else
     {

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

       return 0;
     }
 
       return 0;
     }
 


@@ -166,44 +165,51 @@ value_nsstring (char *ptr, int len)
   struct value *function, *nsstringValue;
   struct symbol *sym;
   struct type *type;
   struct value *function, *nsstringValue;
   struct symbol *sym;
   struct type *type;

+  struct objfile *objf;
+  struct gdbarch *gdbarch;

 
   if (!target_has_execution)
     return 0;          /* Can't call into inferior to create NSString.  */
 
 
   if (!target_has_execution)
     return 0;          /* Can't call into inferior to create NSString.  */
 

-  sym = lookup_struct_typedef("NSString", 0, 1);
-  if (sym == NULL)
-    sym = lookup_struct_typedef("NXString", 0, 1);
-  if (sym == NULL)
-    type = lookup_pointer_type(builtin_type_void);
-  else
-    type = lookup_pointer_type(SYMBOL_TYPE (sym));
-

   stringValue[2] = value_string(ptr, len);
   stringValue[2] = value_coerce_array(stringValue[2]);
   /* _NSNewStringFromCString replaces "istr" after Lantern2A.  */
   if (lookup_minimal_symbol("_NSNewStringFromCString", 0, 0))
     {
   stringValue[2] = value_string(ptr, len);
   stringValue[2] = value_coerce_array(stringValue[2]);
   /* _NSNewStringFromCString replaces "istr" after Lantern2A.  */
   if (lookup_minimal_symbol("_NSNewStringFromCString", 0, 0))
     {

-      function = find_function_in_inferior("_NSNewStringFromCString");
+      function = find_function_in_inferior("_NSNewStringFromCString", &objf);

       nsstringValue = call_function_by_hand(function, 1, &stringValue[2]);
     }
   else if (lookup_minimal_symbol("istr", 0, 0))
     {
       nsstringValue = call_function_by_hand(function, 1, &stringValue[2]);
     }
   else if (lookup_minimal_symbol("istr", 0, 0))
     {

-      function = find_function_in_inferior("istr");
+      function = find_function_in_inferior("istr", &objf);

       nsstringValue = call_function_by_hand(function, 1, &stringValue[2]);
     }
   else if (lookup_minimal_symbol("+[NSString stringWithCString:]", 0, 0))
     {
       nsstringValue = call_function_by_hand(function, 1, &stringValue[2]);
     }
   else if (lookup_minimal_symbol("+[NSString stringWithCString:]", 0, 0))
     {

-      function = find_function_in_inferior("+[NSString stringWithCString:]");
+      function
+       = find_function_in_inferior("+[NSString stringWithCString:]", &objf);
+      type = builtin_type (get_objfile_arch (objf))->builtin_long;
+

       stringValue[0] = value_from_longest 
       stringValue[0] = value_from_longest 

-       (builtin_type_long, lookup_objc_class ("NSString"));
+       (type, lookup_objc_class ("NSString"));

       stringValue[1] = value_from_longest 
       stringValue[1] = value_from_longest 

-       (builtin_type_long, lookup_child_selector ("stringWithCString:"));
+       (type, lookup_child_selector ("stringWithCString:"));

       nsstringValue = call_function_by_hand(function, 3, &stringValue[0]);
     }
   else
       nsstringValue = call_function_by_hand(function, 3, &stringValue[0]);
     }
   else

-    error ("NSString: internal error -- no way to create new NSString");
+    error (_("NSString: internal error -- no way to create new NSString"));
+
+  gdbarch = get_objfile_arch (objf);

 
 

-  VALUE_TYPE(nsstringValue) = type;
+  sym = lookup_struct_typedef("NSString", 0, 1);
+  if (sym == NULL)
+    sym = lookup_struct_typedef("NXString", 0, 1);
+  if (sym == NULL)
+    type = builtin_type (gdbarch)->builtin_data_ptr;
+  else
+    type = lookup_pointer_type(SYMBOL_TYPE (sym));
+
+  deprecated_set_value_type (nsstringValue, type);

   return nsstringValue;
 }
 
   return nsstringValue;
 }
 


@@ -274,7 +280,7 @@ objc_demangle (const char *mangled, int options)
    for printing characters and strings is language specific.  */
 
 static void
    for printing characters and strings is language specific.  */
 
 static void

-objc_emit_char (register int c, struct ui_file *stream, int quoter)
+objc_emit_char (int c, struct ui_file *stream, int quoter)

 {
 
   c &= 0xFF;                   /* Avoid sign bit follies.  */
 {
 
   c &= 0xFF;                   /* Avoid sign bit follies.  */


@@ -334,10 +340,10 @@ objc_printchar (int c, struct ui_file *stream)
    FORCE_ELLIPSES.  */
 
 static void
    FORCE_ELLIPSES.  */
 
 static void

-objc_printstr (struct ui_file *stream, char *string, 
+objc_printstr (struct ui_file *stream, const gdb_byte *string, 

               unsigned int length, int width, int force_ellipses)
 {
               unsigned int length, int width, int force_ellipses)
 {

-  register unsigned int i;
+  unsigned int i;

   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;
   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;


@@ -422,147 +428,6 @@ objc_printstr (struct ui_file *stream, char *string,
     fputs_filtered ("...", stream);
 }
 
     fputs_filtered ("...", stream);
 }
 

-/* Create a fundamental C type using default reasonable for the
-   current target.
-
-   Some object/debugging file formats (DWARF version 1, COFF, etc) do
-   not define fundamental types such as "int" or "double".  Others
-   (stabs or DWARF version 2, etc) do define fundamental types.  For
-   the formats which don't provide fundamental types, gdb can create
-   such types using this function.
-
-   FIXME: Some compilers distinguish explicitly signed integral types
-   (signed short, signed int, signed long) from "regular" integral
-   types (short, int, long) in the debugging information.  There is
-   some disagreement as to how useful this feature is.  In particular,
-   gcc does not support this.  Also, only some debugging formats allow
-   the distinction to be passed on to a debugger.  For now, we always
-   just use "short", "int", or "long" as the type name, for both the
-   implicit and explicitly signed types.  This also makes life easier
-   for the gdb test suite since we don't have to account for the
-   differences in output depending upon what the compiler and
-   debugging format support.  We will probably have to re-examine the
-   issue when gdb starts taking it's fundamental type information
-   directly from the debugging information supplied by the compiler.
-   fnf@cygnus.com */
-
-static struct type *
-objc_create_fundamental_type (struct objfile *objfile, int typeid)
-{
-  register struct type *type = NULL;
-
-  switch (typeid)
-    {
-      default:
-       /* FIXME: For now, if we are asked to produce a type not in
-          this language, create the equivalent of a C integer type
-          with the name "<?type?>".  When all the dust settles from
-          the type reconstruction work, this should probably become
-          an error.  */
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_INT_BIT / TARGET_CHAR_BIT,
-                         0, "<?type?>", objfile);
-        warning ("internal error: no C/C++ fundamental type %d", typeid);
-       break;
-      case FT_VOID:
-       type = init_type (TYPE_CODE_VOID,
-                         TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         0, "void", objfile);
-       break;
-      case FT_CHAR:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         0, "char", objfile);
-       break;
-      case FT_SIGNED_CHAR:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         0, "signed char", objfile);
-       break;
-      case FT_UNSIGNED_CHAR:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "unsigned char", objfile);
-       break;
-      case FT_SHORT:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_SHORT_BIT / TARGET_CHAR_BIT,
-                         0, "short", objfile);
-       break;
-      case FT_SIGNED_SHORT:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_SHORT_BIT / TARGET_CHAR_BIT,
-                         0, "short", objfile); /* FIXME-fnf */
-       break;
-      case FT_UNSIGNED_SHORT:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_SHORT_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "unsigned short", objfile);
-       break;
-      case FT_INTEGER:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_INT_BIT / TARGET_CHAR_BIT,
-                         0, "int", objfile);
-       break;
-      case FT_SIGNED_INTEGER:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_INT_BIT / TARGET_CHAR_BIT,
-                         0, "int", objfile); /* FIXME -fnf */
-       break;
-      case FT_UNSIGNED_INTEGER:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_INT_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "unsigned int", objfile);
-       break;
-      case FT_LONG:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_LONG_BIT / TARGET_CHAR_BIT,
-                         0, "long", objfile);
-       break;
-      case FT_SIGNED_LONG:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_LONG_BIT / TARGET_CHAR_BIT,
-                         0, "long", objfile); /* FIXME -fnf */
-       break;
-      case FT_UNSIGNED_LONG:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_LONG_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "unsigned long", objfile);
-       break;
-      case FT_LONG_LONG:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT,
-                         0, "long long", objfile);
-       break;
-      case FT_SIGNED_LONG_LONG:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT,
-                         0, "signed long long", objfile);
-       break;
-      case FT_UNSIGNED_LONG_LONG:
-       type = init_type (TYPE_CODE_INT,
-                         TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "unsigned long long", objfile);
-       break;
-      case FT_FLOAT:
-       type = init_type (TYPE_CODE_FLT,
-                         TARGET_FLOAT_BIT / TARGET_CHAR_BIT,
-                         0, "float", objfile);
-       break;
-      case FT_DBL_PREC_FLOAT:
-       type = init_type (TYPE_CODE_FLT,
-                         TARGET_DOUBLE_BIT / TARGET_CHAR_BIT,
-                         0, "double", objfile);
-       break;
-      case FT_EXT_PREC_FLOAT:
-       type = init_type (TYPE_CODE_FLT,
-                         TARGET_LONG_DOUBLE_BIT / TARGET_CHAR_BIT,
-                         0, "long double", objfile);
-       break;
-      }
-  return (type);
-}
-

 /* 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
 /* 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


@@ -570,12 +435,13 @@ objc_create_fundamental_type (struct objfile *objfile, int typeid)
    for the user since they are only interested in stepping into the
    method function anyway.  */
 static CORE_ADDR 
    for the user since they are only interested in stepping into the
    method function anyway.  */
 static CORE_ADDR 

-objc_skip_trampoline (CORE_ADDR stop_pc)
+objc_skip_trampoline (struct frame_info *frame, CORE_ADDR stop_pc)

 {
   CORE_ADDR real_stop_pc;
   CORE_ADDR method_stop_pc;
   
 {
   CORE_ADDR real_stop_pc;
   CORE_ADDR method_stop_pc;
   

-  real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
+  real_stop_pc = gdbarch_skip_trampoline_code
+                  (current_gdbarch, frame, stop_pc);

 
   if (real_stop_pc != 0)
     find_objc_msgcall (real_stop_pc, &method_stop_pc);
 
   if (real_stop_pc != 0)
     find_objc_msgcall (real_stop_pc, &method_stop_pc);


@@ -584,7 +450,8 @@ objc_skip_trampoline (CORE_ADDR stop_pc)
 
   if (method_stop_pc)
     {
 
   if (method_stop_pc)
     {

-      real_stop_pc = SKIP_TRAMPOLINE_CODE (method_stop_pc);
+      real_stop_pc = gdbarch_skip_trampoline_code
+                      (current_gdbarch, frame, method_stop_pc);

       if (real_stop_pc == 0)
        real_stop_pc = method_stop_pc;
     }
       if (real_stop_pc == 0)
        real_stop_pc = method_stop_pc;
     }


@@ -630,57 +497,38 @@ static const struct op_print objc_op_print_tab[] =
     {NULL, OP_NULL, PREC_NULL, 0}
 };
 
     {NULL, OP_NULL, PREC_NULL, 0}
 };
 

-struct type ** const (objc_builtin_types[]) = 
-{
-  &builtin_type_int,
-  &builtin_type_long,
-  &builtin_type_short,
-  &builtin_type_char,
-  &builtin_type_float,
-  &builtin_type_double,
-  &builtin_type_void,
-  &builtin_type_long_long,
-  &builtin_type_signed_char,
-  &builtin_type_unsigned_char,
-  &builtin_type_unsigned_short,
-  &builtin_type_unsigned_int,
-  &builtin_type_unsigned_long,
-  &builtin_type_unsigned_long_long,
-  &builtin_type_long_double,
-  &builtin_type_complex,
-  &builtin_type_double_complex,
-  0
-};
-

 const struct language_defn objc_language_defn = {
   "objective-c",               /* Language name */
   language_objc,
 const struct language_defn objc_language_defn = {
   "objective-c",               /* Language name */
   language_objc,

-  objc_builtin_types,

   range_check_off,
   type_check_off,
   case_sensitive_on,
   range_check_off,
   type_check_off,
   case_sensitive_on,

+  array_row_major,
+  &exp_descriptor_standard,

   objc_parse,
   objc_error,
   objc_parse,
   objc_error,

-  evaluate_subexp_standard,
+  null_post_parser,

   objc_printchar,              /* Print a character constant */
   objc_printstr,               /* Function to print string constant */
   objc_emit_char,
   objc_printchar,              /* Print a character constant */
   objc_printstr,               /* Function to print string constant */
   objc_emit_char,

-  objc_create_fundamental_type,        /* Create fundamental type in this language */

   c_print_type,                        /* Print a type using appropriate syntax */
   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 */
   objc_skip_trampoline,        /* Language specific skip_trampoline */
   c_val_print,                 /* Print a value using appropriate syntax */
   c_value_print,               /* Print a top-level value */
   objc_skip_trampoline,        /* Language specific skip_trampoline */

-  value_of_this,               /* value_of_this */
+  "self",                      /* name_of_this */

   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */

+  basic_lookup_transparent_type,/* lookup_transparent_type */

   objc_demangle,               /* Language specific symbol demangler */
   objc_demangle,               /* Language specific symbol demangler */

-  {"",     "",    "",  ""},    /* Binary format info */
-  {"0%lo",  "0",   "o", ""},   /* Octal format info */
-  {"%ld",   "",    "d", ""},   /* Decimal format info */
-  {"0x%lx", "0x",  "x", ""},   /* Hex format info */
+  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 */

-  &builtin_type_char,          /* Type of string elements */
+  default_word_break_characters,
+  default_make_symbol_completion_list,
+  c_language_arch_info,
+  default_print_array_index,
+  default_pass_by_reference,

   LANG_MAGIC
 };
 
   LANG_MAGIC
 };
 


@@ -703,7 +551,7 @@ static char *msglist_sel;
 void
 start_msglist(void)
 {
 void
 start_msglist(void)
 {

-  register struct selname *new = 
+  struct selname *new = 

     (struct selname *) xmalloc (sizeof (struct selname));
 
   new->next = selname_chain;
     (struct selname *) xmalloc (sizeof (struct selname));
 
   new->next = selname_chain;


@@ -749,17 +597,17 @@ add_msglist(struct stoken *str, int addcolon)
 int
 end_msglist(void)
 {
 int
 end_msglist(void)
 {

-  register int val = msglist_len;
-  register struct selname *sel = selname_chain;
-  register char *p = msglist_sel;
-  int selid;
+  int val = msglist_len;
+  struct selname *sel = selname_chain;
+  char *p = msglist_sel;
+  CORE_ADDR selid;

 
   selname_chain = sel->next;
   msglist_len = sel->msglist_len;
   msglist_sel = sel->msglist_sel;
   selid = lookup_child_selector(p);
   if (!selid)
 
   selname_chain = sel->next;
   msglist_len = sel->msglist_len;
   msglist_sel = sel->msglist_sel;
   selid = lookup_child_selector(p);
   if (!selid)

-    error("Can't find selector \"%s\"", p);
+    error (_("Can't find selector \"%s\""), p);

   write_exp_elt_longcst (selid);
   xfree(p);
   write_exp_elt_longcst (val); /* Number of args */
   write_exp_elt_longcst (selid);
   xfree(p);
   write_exp_elt_longcst (val); /* Number of args */


@@ -806,12 +654,12 @@ compare_selectors (const void *a, const void *b)
   aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
   bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
   if (aname == NULL || bname == NULL)
   aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
   bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
   if (aname == NULL || bname == NULL)

-    error ("internal: compare_selectors(1)");
+    error (_("internal: compare_selectors(1)"));

 
   aname = strchr(aname, ' ');
   bname = strchr(bname, ' ');
   if (aname == NULL || bname == NULL)
 
   aname = strchr(aname, ' ');
   bname = strchr(bname, ' ');
   if (aname == NULL || bname == NULL)

-    error ("internal: compare_selectors(2)");
+    error (_("internal: compare_selectors(2)"));

 
   return specialcmp (aname+1, bname+1);
 }
 
   return specialcmp (aname+1, bname+1);
 }


@@ -866,7 +714,7 @@ selectors_info (char *regexp, int from_tty)
     {
       val = re_comp (myregexp);
       if (val != 0)
     {
       val = re_comp (myregexp);
       if (val != 0)

-       error ("Invalid regexp (%s): %s", val, regexp);
+       error (_("Invalid regexp (%s): %s"), val, regexp);

     }
 
   /* First time thru is JUST to get max length and count.  */
     }
 
   /* First time thru is JUST to get max length and count.  */


@@ -896,7 +744,7 @@ selectors_info (char *regexp, int from_tty)
     }
   if (matches)
     {
     }
   if (matches)
     {

-      printf_filtered ("Selectors matching \"%s\":\n\n", 
+      printf_filtered (_("Selectors matching \"%s\":\n\n"), 

                       regexp ? regexp : "*");
 
       sym_arr = alloca (matches * sizeof (struct symbol *));
                       regexp ? regexp : "*");
 
       sym_arr = alloca (matches * sizeof (struct symbol *));


@@ -943,7 +791,7 @@ 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 : "*");

 }
 
 /*
 }
 
 /*


@@ -961,7 +809,7 @@ compare_classes (const void *a, const void *b)
   aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
   bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
   if (aname == NULL || bname == NULL)
   aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
   bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
   if (aname == NULL || bname == NULL)

-    error ("internal: compare_classes(1)");
+    error (_("internal: compare_classes(1)"));

 
   return specialcmp (aname+1, bname+1);
 }
 
   return specialcmp (aname+1, bname+1);
 }


@@ -1006,7 +854,7 @@ classes_info (char *regexp, int from_tty)
     {
       val = re_comp (myregexp);
       if (val != 0)
     {
       val = re_comp (myregexp);
       if (val != 0)

-       error ("Invalid regexp (%s): %s", val, regexp);
+       error (_("Invalid regexp (%s): %s"), val, regexp);

     }
 
   /* First time thru is JUST to get max length and count.  */
     }
 
   /* First time thru is JUST to get max length and count.  */


@@ -1030,7 +878,7 @@ classes_info (char *regexp, int from_tty)
     }
   if (matches)
     {
     }
   if (matches)
     {

-      printf_filtered ("Classes matching \"%s\":\n\n", 
+      printf_filtered (_("Classes matching \"%s\":\n\n"), 

                       regexp ? regexp : "*");
       sym_arr = alloca (matches * sizeof (struct symbol *));
       matches = 0;
                       regexp ? regexp : "*");
       sym_arr = alloca (matches * sizeof (struct symbol *));
       matches = 0;


@@ -1069,7 +917,7 @@ classes_info (char *regexp, int from_tty)
       begin_line();
     }
   else
       begin_line();
     }
   else

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

 }
 
 /* 
 }
 
 /* 


@@ -1431,7 +1279,7 @@ char *find_imps (struct symtab *symtab, struct block *block,
     if (tmp == NULL)
       return NULL;
     
     if (tmp == NULL)
       return NULL;
     

-    sym = lookup_symbol (selector, block, VAR_DOMAIN, 0, NULL);
+    sym = lookup_symbol (selector, block, VAR_DOMAIN, 0);

     if (sym != NULL) 
       {
        if (syms)
     if (sym != NULL) 
       {
        if (syms)


@@ -1525,7 +1373,7 @@ print_object_command (char *args, int from_tty)
   struct value *object, *function, *description;
   CORE_ADDR string_addr, object_addr;
   int i = 0;
   struct value *object, *function, *description;
   CORE_ADDR string_addr, object_addr;
   int i = 0;

-  char c = -1;
+  gdb_byte c = 0;

 
   if (!args || !*args)
     error (
 
   if (!args || !*args)
     error (


@@ -1533,12 +1381,12 @@ print_object_command (char *args, int from_tty)
 
   {
     struct expression *expr = parse_expression (args);
 
   {
     struct expression *expr = parse_expression (args);

-    register struct cleanup *old_chain = 
+    struct cleanup *old_chain = 

       make_cleanup (free_current_contents, &expr);
     int pc = 0;
 
       make_cleanup (free_current_contents, &expr);
     int pc = 0;
 

-    object = expr->language_defn->evaluate_exp (builtin_type_void_data_ptr,
-                                               expr, &pc, EVAL_NORMAL);
+    object = expr->language_defn->la_exp_desc->evaluate_exp 
+      (builtin_type (expr->gdbarch)->builtin_data_ptr, expr, &pc, EVAL_NORMAL);

     do_cleanups (old_chain);
   }
 
     do_cleanups (old_chain);
   }
 


@@ -1546,18 +1394,18 @@ print_object_command (char *args, int from_tty)
   object_addr = value_as_long (object);
   read_memory (object_addr, &c, 1);
 
   object_addr = value_as_long (object);
   read_memory (object_addr, &c, 1);
 

-  function = find_function_in_inferior ("_NSPrintForDebugger");
+  function = find_function_in_inferior ("_NSPrintForDebugger", NULL);

   if (function == NULL)
   if (function == NULL)

-    error ("Unable to locate _NSPrintForDebugger in child process");
+    error (_("Unable to locate _NSPrintForDebugger in child process"));

 
   description = call_function_by_hand (function, 1, &object);
 
   string_addr = value_as_long (description);
   if (string_addr == 0)
 
   description = call_function_by_hand (function, 1, &object);
 
   string_addr = value_as_long (description);
   if (string_addr == 0)

-    error ("object returns null description");
+    error (_("object returns null description"));

 
   read_memory (string_addr + i++, &c, 1);
 
   read_memory (string_addr + i++, &c, 1);

-  if (c != '\0')
+  if (c != 0)

     do
       { /* Read and print characters up to EOS.  */
        QUIT;
     do
       { /* Read and print characters up to EOS.  */
        QUIT;


@@ -1565,7 +1413,7 @@ print_object_command (char *args, int from_tty)
        read_memory (string_addr + i++, &c, 1);
       } while (c != 0);
   else
        read_memory (string_addr + i++, &c, 1);
       } while (c != 0);
   else

-    printf_filtered("<object returns empty description>");
+    printf_filtered(_("<object returns empty description>"));

   printf_filtered ("\n");
 }
 
   printf_filtered ("\n");
 }
 


@@ -1643,7 +1491,7 @@ find_objc_msgsend (void)
  * The old function "pc_off_limits" used to do a lot of other things
  * in addition, such as detecting shared library jump stubs and
  * returning the address of the shlib function that would be called.
  * The old function "pc_off_limits" used to do a lot of other things
  * in addition, such as detecting shared library jump stubs and
  * returning the address of the shlib function that would be called.

- * That functionality has been moved into the SKIP_TRAMPOLINE_CODE and
+ * That functionality has been moved into the gdbarch_skip_trampoline_code and

  * IN_SOLIB_TRAMPOLINE macros, which are resolved in the target-
  * dependent modules.  
  */
  * IN_SOLIB_TRAMPOLINE macros, which are resolved in the target-
  * dependent modules.  
  */


@@ -1710,18 +1558,18 @@ find_objc_msgcall (CORE_ADDR pc, CORE_ADDR *new_pc)
   return 0;
 }
 
   return 0;
 }
 

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

 
 void
 _initialize_objc_language (void)
 {
   add_language (&objc_language_defn);
   add_info ("selectors", selectors_info,    /* INFO SELECTORS command.  */
 
 void
 _initialize_objc_language (void)
 {
   add_language (&objc_language_defn);
   add_info ("selectors", selectors_info,    /* INFO SELECTORS command.  */

-           "All Objective-C selectors, or those matching REGEXP.");
+           _("All Objective-C selectors, or those matching REGEXP."));

   add_info ("classes", classes_info,       /* INFO CLASSES   command.  */
   add_info ("classes", classes_info,       /* INFO CLASSES   command.  */

-           "All Objective-C classes, or those matching REGEXP.");
+           _("All Objective-C classes, or those matching REGEXP."));

   add_com ("print-object", class_vars, print_object_command, 
   add_com ("print-object", class_vars, print_object_command, 

-          "Ask an Objective-C object to print itself.");
+          _("Ask an Objective-C object to print itself."));

   add_com_alias ("po", "print-object", class_vars, 1);
 }
 
   add_com_alias ("po", "print-object", class_vars, 1);
 }
 


@@ -1839,18 +1687,19 @@ find_implementation (CORE_ADDR object, CORE_ADDR sel)
   return find_implementation_from_class (ostr.isa, sel);
 }
 
   return find_implementation_from_class (ostr.isa, sel);
 }
 

-#define OBJC_FETCH_POINTER_ARGUMENT(argi) \
-  FETCH_POINTER_ARGUMENT (get_current_frame (), argi, builtin_type_void_func_ptr)
-

 static int
 resolve_msgsend (CORE_ADDR pc, CORE_ADDR *new_pc)
 {
 static int
 resolve_msgsend (CORE_ADDR pc, CORE_ADDR *new_pc)
 {

+  struct frame_info *frame = get_current_frame ();
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+  struct type *ptr_type = builtin_type (gdbarch)->builtin_func_ptr;
+

   CORE_ADDR object;
   CORE_ADDR sel;
   CORE_ADDR res;
 
   CORE_ADDR object;
   CORE_ADDR sel;
   CORE_ADDR res;
 

-  object = OBJC_FETCH_POINTER_ARGUMENT (0);
-  sel = OBJC_FETCH_POINTER_ARGUMENT (1);
+  object = gdbarch_fetch_pointer_argument (gdbarch, frame, 0, ptr_type);
+  sel = gdbarch_fetch_pointer_argument (gdbarch, frame, 1, ptr_type);

 
   res = find_implementation (object, sel);
   if (new_pc != 0)
 
   res = find_implementation (object, sel);
   if (new_pc != 0)


@@ -1863,12 +1712,16 @@ resolve_msgsend (CORE_ADDR pc, CORE_ADDR *new_pc)
 static int
 resolve_msgsend_stret (CORE_ADDR pc, CORE_ADDR *new_pc)
 {
 static int
 resolve_msgsend_stret (CORE_ADDR pc, CORE_ADDR *new_pc)
 {

+  struct frame_info *frame = get_current_frame ();
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+  struct type *ptr_type = builtin_type (gdbarch)->builtin_func_ptr;
+

   CORE_ADDR object;
   CORE_ADDR sel;
   CORE_ADDR res;
 
   CORE_ADDR object;
   CORE_ADDR sel;
   CORE_ADDR res;
 

-  object = OBJC_FETCH_POINTER_ARGUMENT (1);
-  sel = OBJC_FETCH_POINTER_ARGUMENT (2);
+  object = gdbarch_fetch_pointer_argument (gdbarch, frame, 1, ptr_type);
+  sel = gdbarch_fetch_pointer_argument (gdbarch, frame, 2, ptr_type);

 
   res = find_implementation (object, sel);
   if (new_pc != 0)
 
   res = find_implementation (object, sel);
   if (new_pc != 0)


@@ -1881,14 +1734,18 @@ resolve_msgsend_stret (CORE_ADDR pc, CORE_ADDR *new_pc)
 static int
 resolve_msgsend_super (CORE_ADDR pc, CORE_ADDR *new_pc)
 {
 static int
 resolve_msgsend_super (CORE_ADDR pc, CORE_ADDR *new_pc)
 {

+  struct frame_info *frame = get_current_frame ();
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+  struct type *ptr_type = builtin_type (gdbarch)->builtin_func_ptr;
+

   struct objc_super sstr;
 
   CORE_ADDR super;
   CORE_ADDR sel;
   CORE_ADDR res;
 
   struct objc_super sstr;
 
   CORE_ADDR super;
   CORE_ADDR sel;
   CORE_ADDR res;
 

-  super = OBJC_FETCH_POINTER_ARGUMENT (0);
-  sel = OBJC_FETCH_POINTER_ARGUMENT (1);
+  super = gdbarch_fetch_pointer_argument (gdbarch, frame, 0, ptr_type);
+  sel = gdbarch_fetch_pointer_argument (gdbarch, frame, 1, ptr_type);

 
   read_objc_super (super, &sstr);
   if (sstr.class == 0)
 
   read_objc_super (super, &sstr);
   if (sstr.class == 0)


@@ -1905,14 +1762,18 @@ resolve_msgsend_super (CORE_ADDR pc, CORE_ADDR *new_pc)
 static int
 resolve_msgsend_super_stret (CORE_ADDR pc, CORE_ADDR *new_pc)
 {
 static int
 resolve_msgsend_super_stret (CORE_ADDR pc, CORE_ADDR *new_pc)
 {

+  struct frame_info *frame = get_current_frame ();
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+  struct type *ptr_type = builtin_type (gdbarch)->builtin_func_ptr;
+

   struct objc_super sstr;
 
   CORE_ADDR super;
   CORE_ADDR sel;
   CORE_ADDR res;
 
   struct objc_super sstr;
 
   CORE_ADDR super;
   CORE_ADDR sel;
   CORE_ADDR res;
 

-  super = OBJC_FETCH_POINTER_ARGUMENT (1);
-  sel = OBJC_FETCH_POINTER_ARGUMENT (2);
+  super = gdbarch_fetch_pointer_argument (gdbarch, frame, 1, ptr_type);
+  sel = gdbarch_fetch_pointer_argument (gdbarch, frame, 2, ptr_type);

 
   read_objc_super (super, &sstr);
   if (sstr.class == 0)
 
   read_objc_super (super, &sstr);
   if (sstr.class == 0)