* vax-tdep.c (INVALID_FLOAT, MAXLEN, NOPCODES): Don't define.

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

diff --git a/gdb/expprint.c b/gdb/expprint.c
index 09e7db69b3ad9bd801a2f78c6f55ad94ec867365..d0e940b3821c25c960c56360009ef3889c7cad23 100644 (file)
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -1,6 +1,7 @@
 /* Print in infix form a struct expression.
+
    Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000 Free Software Foundation, Inc.
+   1998, 1999, 2000, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -26,6 +27,10 @@
 #include "value.h"
 #include "language.h"
 #include "parser-defs.h"
+#include "frame.h"             /* For frame_map_regnum_to_name.  */
+#include "target.h"
+#include "gdb_string.h"
+#include "block.h"
 
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
@@ -103,12 +108,12 @@ print_subexp (register struct expression *exp, register int *pos,
        b = exp->elts[pc + 1].block;
        if (b != NULL
            && BLOCK_FUNCTION (b) != NULL
-           && SYMBOL_SOURCE_NAME (BLOCK_FUNCTION (b)) != NULL)
+           && SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)) != NULL)
          {
-           fputs_filtered (SYMBOL_SOURCE_NAME (BLOCK_FUNCTION (b)), stream);
+           fputs_filtered (SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)), stream);
            fputs_filtered ("::", stream);
          }
-       fputs_filtered (SYMBOL_SOURCE_NAME (exp->elts[pc + 2].symbol), stream);
+       fputs_filtered (SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol), stream);
       }
       return;
 
@@ -119,10 +124,12 @@ print_subexp (register struct expression *exp, register int *pos,
       return;
 
     case OP_REGISTER:
-      (*pos) += 2;
-      fprintf_filtered (stream, "$%s",
-             REGISTER_NAME (longest_to_int (exp->elts[pc + 1].longconst)));
-      return;
+      {
+       int regnum = longest_to_int (exp->elts[pc + 1].longconst);
+       (*pos) += 2;
+       fprintf_filtered (stream, "$%s", frame_map_regnum_to_name (regnum));
+       return;
+      }
 
     case OP_BOOL:
       (*pos) += 2;
@@ -174,6 +181,51 @@ print_subexp (register struct expression *exp, register int *pos,
       fprintf_unfiltered (stream, "B'<unimplemented>'");
       return;
 
+    case OP_OBJC_NSSTRING:     /* Objective-C Foundation Class NSString constant.  */
+      nargs = longest_to_int (exp->elts[pc + 1].longconst);
+      (*pos) += 3 + BYTES_TO_EXP_ELEM (nargs + 1);
+      fputs_filtered ("@\"", stream);
+      LA_PRINT_STRING (stream, &exp->elts[pc + 2].string, nargs, 1, 0);
+      fputs_filtered ("\"", stream);
+      return;
+
+    case OP_OBJC_MSGCALL:
+      {                        /* Objective C message (method) call.  */
+       char *selector;
+       (*pos) += 3;
+       nargs = longest_to_int (exp->elts[pc + 2].longconst);
+       fprintf_unfiltered (stream, "[");
+       print_subexp (exp, pos, stream, PREC_SUFFIX);
+       if (0 == target_read_string (exp->elts[pc + 1].longconst,
+                                    &selector, 1024, NULL))
+         {
+           error ("bad selector");
+           return;
+         }
+       if (nargs)
+         {
+           char *s, *nextS;
+           s = alloca (strlen (selector) + 1);
+           strcpy (s, selector);
+           for (tem = 0; tem < nargs; tem++)
+             {
+               nextS = strchr (s, ':');
+               *nextS = '\0';
+               fprintf_unfiltered (stream, " %s: ", s);
+               s = nextS + 1;
+               print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+             }
+         }
+       else
+         {
+           fprintf_unfiltered (stream, " %s", selector);
+         }
+       fprintf_unfiltered (stream, "]");
+       /* "selector" was malloc'd by target_read_string. Free it.  */
+       xfree (selector);
+       return;
+      }
+
     case OP_ARRAY:
       (*pos) += 3;
       nargs = longest_to_int (exp->elts[pc + 2].longconst);
@@ -217,8 +269,7 @@ print_subexp (register struct expression *exp, register int *pos,
        }
       else
        {
-         int is_chill = exp->language_defn->la_language == language_chill;
-         fputs_filtered (is_chill ? " [" : " {", stream);
+         fputs_filtered (" {", stream);
          for (tem = 0; tem < nargs; tem++)
            {
              if (tem != 0)
@@ -227,34 +278,22 @@ print_subexp (register struct expression *exp, register int *pos,
                }
              print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
            }
-         fputs_filtered (is_chill ? "]" : "}", stream);
+         fputs_filtered ("}", stream);
        }
       return;
 
     case OP_LABELED:
       tem = longest_to_int (exp->elts[pc + 1].longconst);
       (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
-
-      if (exp->language_defn->la_language == language_chill)
-       {
-         fputs_filtered (".", stream);
-         fputs_filtered (&exp->elts[pc + 2].string, stream);
-         fputs_filtered (exp->elts[*pos].opcode == OP_LABELED ? ", "
-                         : ": ",
-                         stream);
-       }
-      else
-       {
-         /* Gcc support both these syntaxes.  Unsure which is preferred.  */
+      /* Gcc support both these syntaxes.  Unsure which is preferred.  */
 #if 1
-         fputs_filtered (&exp->elts[pc + 2].string, stream);
-         fputs_filtered (": ", stream);
+      fputs_filtered (&exp->elts[pc + 2].string, stream);
+      fputs_filtered (": ", stream);
 #else
-         fputs_filtered (".", stream);
-         fputs_filtered (&exp->elts[pc + 2].string, stream);
-         fputs_filtered ("=", stream);
+      fputs_filtered (".", stream);
+      fputs_filtered (&exp->elts[pc + 2].string, stream);
+      fputs_filtered ("=", stream);
 #endif
-       }
       print_subexp (exp, pos, stream, PREC_SUFFIX);
       return;
 
@@ -384,6 +423,13 @@ print_subexp (register struct expression *exp, register int *pos,
       fputs_filtered ("this", stream);
       return;
 
+      /* Objective-C ops */
+
+    case OP_OBJC_SELF:
+      ++(*pos);
+      fputs_filtered ("self", stream); /* The ObjC equivalent of "this".  */
+      return;
+
       /* Modula-2 ops */
 
     case MULTI_SUBSCRIPT:
@@ -677,6 +723,8 @@ op_name (int opcode)
       return "STRUCTOP_PTR";
     case OP_THIS:
       return "OP_THIS";
+    case OP_OBJC_SELF:
+      return "OP_OBJC_SELF";
     case OP_SCOPE:
       return "OP_SCOPE";
     case OP_TYPE:
@@ -842,7 +890,7 @@ dump_subexp (struct expression *exp, struct ui_file *stream, int elt)
       fprintf_filtered (stream, ", symbol @");
       gdb_print_host_address (exp->elts[elt + 1].symbol, stream);
       fprintf_filtered (stream, " (%s)",
-                       SYMBOL_NAME (exp->elts[elt + 1].symbol));
+                       DEPRECATED_SYMBOL_NAME (exp->elts[elt + 1].symbol));
       elt += 3;
       break;
     case OP_LAST: