binutils/gas/riscv: Add DWARF register numbers for CSRs

[deliverable/binutils-gdb.git] / gdb / f-valprint.c

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 8d9dd16f7553f925b7692acffd963108cc9cf7f0..d5515c8f8fec041f8dfc97bcd6d6293b31e4b119 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -33,6 +33,7 @@
 #include "command.h"
 #include "block.h"
 #include "dictionary.h"
+#include "cli/cli-style.h"
 
 static void f77_get_dynamic_length_of_aggregate (struct type *);
 
@@ -199,7 +200,7 @@ static const struct generic_val_print_decorations f_decorations =
   ")",
   ".TRUE.",
   ".FALSE.",
-  "VOID",
+  "void",
   "{",
   "}"
 };
@@ -386,17 +387,17 @@ info_common_command_for_block (const struct block *block, const char *comname,
 
        gdb_assert (SYMBOL_CLASS (sym) == LOC_COMMON_BLOCK);
 
-       if (comname && (!SYMBOL_LINKAGE_NAME (sym)
-                       || strcmp (comname, SYMBOL_LINKAGE_NAME (sym)) != 0))
+       if (comname && (!sym->linkage_name ()
+                       || strcmp (comname, sym->linkage_name ()) != 0))
          continue;
 
        if (*any_printed)
          putchar_filtered ('\n');
        else
          *any_printed = 1;
-       if (SYMBOL_PRINT_NAME (sym))
+       if (sym->print_name ())
          printf_filtered (_("Contents of F77 COMMON block '%s':\n"),
-                          SYMBOL_PRINT_NAME (sym));
+                          sym->print_name ());
        else
          printf_filtered (_("Contents of blank COMMON block:\n"));
        
@@ -405,7 +406,7 @@ info_common_command_for_block (const struct block *block, const char *comname,
            struct value *val = NULL;
 
            printf_filtered ("%s = ",
-                            SYMBOL_PRINT_NAME (common->contents[index]));
+                            common->contents[index]->print_name ());
 
            try
              {
@@ -413,10 +414,11 @@ info_common_command_for_block (const struct block *block, const char *comname,
                value_print (val, gdb_stdout, &opts);
              }
 
-           catch (const gdb_exception_RETURN_MASK_ERROR &except)
+           catch (const gdb_exception_error &except)
              {
-               printf_filtered ("<error reading variable: %s>",
-                                except.what ());
+               fprintf_styled (gdb_stdout, metadata_style.style (),
+                               "<error reading variable: %s>",
+                               except.what ());
              }
 
            putchar_filtered ('\n');