Two fixes in dwarf-mode.el

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

diff --git a/gdb/expprint.c b/gdb/expprint.c
index 2c16b497fc06c1b8f2be04979e95b81fca7a2f7a..5427a56f6ae0323845f44494f24f81d413959b29 100644 (file)
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -1,6 +1,6 @@
 /* Print in infix form a struct expression.
 
-   Copyright (C) 1986-2017 Free Software Foundation, Inc.
+   Copyright (C) 1986-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -29,6 +29,7 @@
 #include "block.h"
 #include "objfiles.h"
 #include "valprint.h"
+#include "cli/cli-style.h"
 
 #include <ctype.h>
 
@@ -86,7 +87,7 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_SCOPE:
       myprec = PREC_PREFIX;
       assoc = 0;
-      fputs_filtered (type_name_no_tag (exp->elts[pc + 1].type), stream);
+      fputs_filtered (exp->elts[pc + 1].type->name (), stream);
       fputs_filtered ("::", stream);
       nargs = longest_to_int (exp->elts[pc + 2].longconst);
       (*pos) += 4 + BYTES_TO_EXP_ELEM (nargs + 1);
@@ -105,14 +106,14 @@ print_subexp_standard (struct expression *exp, int *pos,
       }
       return;
 
-    case OP_DOUBLE:
+    case OP_FLOAT:
       {
        struct value_print_options opts;
 
        get_no_prettyformat_print_options (&opts);
        (*pos) += 3;
-       value_print (value_from_double (exp->elts[pc + 1].type,
-                                       exp->elts[pc + 2].doubleconst),
+       value_print (value_from_contents (exp->elts[pc + 1].type,
+                                         exp->elts[pc + 2].floatconst),
                     stream, &opts);
       }
       return;
@@ -125,19 +126,19 @@ print_subexp_standard (struct expression *exp, int *pos,
        b = exp->elts[pc + 1].block;
        if (b != NULL
            && BLOCK_FUNCTION (b) != NULL
-           && SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)) != NULL)
+           && BLOCK_FUNCTION (b)->print_name () != NULL)
          {
-           fputs_filtered (SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)), stream);
+           fputs_filtered (BLOCK_FUNCTION (b)->print_name (), stream);
            fputs_filtered ("::", stream);
          }
-       fputs_filtered (SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol), stream);
+       fputs_filtered (exp->elts[pc + 2].symbol->print_name (), stream);
       }
       return;
 
     case OP_VAR_MSYM_VALUE:
       {
        (*pos) += 3;
-       fputs_filtered (MSYMBOL_PRINT_NAME (exp->elts[pc + 2].msymbol), stream);
+       fputs_filtered (exp->elts[pc + 2].msymbol->print_name (), stream);
       }
       return;
 
@@ -153,7 +154,7 @@ print_subexp_standard (struct expression *exp, int *pos,
       {
        (*pos) += 2;
        fprintf_filtered (stream, "%s@entry",
-                         SYMBOL_PRINT_NAME (exp->elts[pc + 1].symbol));
+                         exp->elts[pc + 1].symbol->print_name ());
       }
       return;
 
@@ -186,6 +187,7 @@ print_subexp_standard (struct expression *exp, int *pos,
       return;
 
     case OP_FUNCALL:
+    case OP_F77_UNDETERMINED_ARGLIST:
       (*pos) += 2;
       nargs = longest_to_int (exp->elts[pc + 1].longconst);
       print_subexp (exp, pos, stream, PREC_SUFFIX);
@@ -239,24 +241,19 @@ print_subexp_standard (struct expression *exp, int *pos,
 
     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;
-         }
+       gdb::unique_xmalloc_ptr<char> selector
+         = target_read_string (exp->elts[pc + 1].longconst, 1024);
+       if (selector == nullptr)
+         error (_("bad selector"));
        if (nargs)
          {
            char *s, *nextS;
 
-           s = (char *) alloca (strlen (selector) + 1);
-           strcpy (s, selector);
+           s = selector.get ();
            for (tem = 0; tem < nargs; tem++)
              {
                nextS = strchr (s, ':');
@@ -269,11 +266,9 @@ print_subexp_standard (struct expression *exp, int *pos,
          }
        else
          {
-           fprintf_unfiltered (stream, " %s", selector);
+           fprintf_unfiltered (stream, " %s", selector.get ());
          }
        fprintf_unfiltered (stream, "]");
-       /* "selector" was malloc'd by target_read_string.  Free it.  */
-       xfree (selector);
        return;
       }
 
@@ -449,7 +444,7 @@ print_subexp_standard (struct expression *exp, int *pos,
       (*pos) += 2;
       if ((int) prec > (int) PREC_PREFIX)
        fputs_filtered ("(", stream);
-      if (TYPE_CODE (exp->elts[pc + 1].type) == TYPE_CODE_FUNC
+      if (exp->elts[pc + 1].type->code () == TYPE_CODE_FUNC
          && exp->elts[pc + 3].opcode == OP_LONG)
        {
          struct value_print_options opts;
@@ -512,8 +507,9 @@ print_subexp_standard (struct expression *exp, int *pos,
       if (exp->language_defn->la_name_of_this)
        fputs_filtered (exp->language_defn->la_name_of_this, stream);
       else
-       fprintf_filtered (stream, _("<language %s has no 'this'>"),
-                         exp->language_defn->la_name);
+       fprintf_styled (stream, metadata_style.style (),
+                       _("<language %s has no 'this'>"),
+                       exp->language_defn->la_name);
       return;
 
       /* Modula-2 ops */
@@ -580,9 +576,13 @@ print_subexp_standard (struct expression *exp, int *pos,
          longest_to_int (exp->elts[pc + 1].longconst);
        *pos += 2;
 
+       if (range_type == NONE_BOUND_DEFAULT_EXCLUSIVE
+           || range_type == LOW_BOUND_DEFAULT_EXCLUSIVE)
+         fputs_filtered ("EXCLUSIVE_", stream);
        fputs_filtered ("RANGE(", stream);
        if (range_type == HIGH_BOUND_DEFAULT
-           || range_type == NONE_BOUND_DEFAULT)
+           || range_type == NONE_BOUND_DEFAULT
+           || range_type == NONE_BOUND_DEFAULT_EXCLUSIVE)
          print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
        fputs_filtered ("..", stream);
        if (range_type == LOW_BOUND_DEFAULT
@@ -685,6 +685,13 @@ static int dump_subexp_body (struct expression *exp, struct ui_file *, int);
 const char *
 op_name (struct expression *exp, enum exp_opcode opcode)
 {
+  if (opcode >= OP_UNUSED_LAST)
+    {
+      char *cell = get_print_cell ();
+      xsnprintf (cell, PRINT_CELL_SIZE, "unknown opcode: %u",
+                unsigned (opcode));
+      return cell;
+    }
   return exp->language_defn->la_exp_desc->op_name (opcode);
 }
 
@@ -848,6 +855,7 @@ dump_subexp_body_standard (struct expression *exp,
     case UNOP_PREDECREMENT:
     case UNOP_POSTDECREMENT:
     case UNOP_SIZEOF:
+    case UNOP_ALIGNOF:
     case UNOP_PLUS:
     case UNOP_CAP:
     case UNOP_CHR:
@@ -871,13 +879,14 @@ dump_subexp_body_standard (struct expression *exp,
                        (long) exp->elts[elt + 1].longconst);
       elt += 3;
       break;
-    case OP_DOUBLE:
+    case OP_FLOAT:
       fprintf_filtered (stream, "Type @");
       gdb_print_host_address (exp->elts[elt].type, stream);
       fprintf_filtered (stream, " (");
       type_print (exp->elts[elt].type, NULL, stream, 0);
-      fprintf_filtered (stream, "), value %g",
-                       (double) exp->elts[elt + 1].doubleconst);
+      fprintf_filtered (stream, "), value ");
+      print_floating (exp->elts[elt + 1].floatconst,
+                     exp->elts[elt].type, stream);
       elt += 3;
       break;
     case OP_VAR_VALUE:
@@ -886,7 +895,7 @@ dump_subexp_body_standard (struct expression *exp,
       fprintf_filtered (stream, ", symbol @");
       gdb_print_host_address (exp->elts[elt + 1].symbol, stream);
       fprintf_filtered (stream, " (%s)",
-                       SYMBOL_PRINT_NAME (exp->elts[elt + 1].symbol));
+                       exp->elts[elt + 1].symbol->print_name ());
       elt += 3;
       break;
     case OP_VAR_MSYM_VALUE:
@@ -895,14 +904,14 @@ dump_subexp_body_standard (struct expression *exp,
       fprintf_filtered (stream, ", msymbol @");
       gdb_print_host_address (exp->elts[elt + 1].msymbol, stream);
       fprintf_filtered (stream, " (%s)",
-                       MSYMBOL_PRINT_NAME (exp->elts[elt + 1].msymbol));
+                       exp->elts[elt + 1].msymbol->print_name ());
       elt += 3;
       break;
     case OP_VAR_ENTRY_VALUE:
       fprintf_filtered (stream, "Entry value of symbol @");
       gdb_print_host_address (exp->elts[elt].symbol, stream);
       fprintf_filtered (stream, " (%s)",
-                       SYMBOL_PRINT_NAME (exp->elts[elt].symbol));
+                       exp->elts[elt].symbol->print_name ());
       elt += 2;
       break;
     case OP_LAST:
@@ -922,6 +931,7 @@ dump_subexp_body_standard (struct expression *exp,
       elt += 2;
       break;
     case OP_FUNCALL:
+    case OP_F77_UNDETERMINED_ARGLIST:
       {
        int i, nargs;
 
@@ -1052,7 +1062,7 @@ dump_subexp_body_standard (struct expression *exp,
            if (space)
              fputs_filtered (" ", stream);
            space = true;
-           fprintf_filtered (stream, mod);
+           fprintf_filtered (stream, "%s", mod);
          };
        if (flags & TYPE_INSTANCE_FLAG_CONST)
          print_one ("const");
@@ -1099,12 +1109,18 @@ dump_subexp_body_standard (struct expression *exp,
          case LOW_BOUND_DEFAULT:
            fputs_filtered ("Range '..EXP'", stream);
            break;
+         case LOW_BOUND_DEFAULT_EXCLUSIVE:
+           fputs_filtered ("ExclusiveRange '..EXP'", stream);
+           break;
          case HIGH_BOUND_DEFAULT:
            fputs_filtered ("Range 'EXP..'", stream);
            break;
          case NONE_BOUND_DEFAULT:
            fputs_filtered ("Range 'EXP..EXP'", stream);
            break;
+         case NONE_BOUND_DEFAULT_EXCLUSIVE:
+           fputs_filtered ("ExclusiveRange 'EXP..EXP'", stream);
+           break;
          default:
            fputs_filtered ("Invalid Range!", stream);
            break;
@@ -1122,7 +1138,6 @@ dump_subexp_body_standard (struct expression *exp,
     default:
     case OP_NULL:
     case MULTI_SUBSCRIPT:
-    case OP_F77_UNDETERMINED_ARGLIST:
     case OP_COMPLEX:
     case OP_BOOL:
     case OP_M2_STRING: