gdb: remove BLOCK_NAMESPACE macro

[binutils-gdb.git] / gdb / dbxread.c

diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 165040dd7ce4fd7ecc29204f03b0c5ff72daf382..bcf519000bceefd52cacceeed7c844f9896acaa3 100644 (file)
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -1655,7 +1655,7 @@ read_dbx_symtab (minimal_symbol_reader &reader,
                                          pst ? pst->filename : NULL,
                                          objfile);
                  if (minsym.minsym != NULL)
-                   nlist.n_value = MSYMBOL_VALUE_RAW_ADDRESS (minsym.minsym);
+                   nlist.n_value = minsym.minsym->value_raw_address ();
                }
              if (pst && textlow_not_set
                  && gdbarch_sofun_address_maybe_missing (gdbarch))
@@ -1711,7 +1711,7 @@ read_dbx_symtab (minimal_symbol_reader &reader,
                                          pst ? pst->filename : NULL,
                                          objfile);
                  if (minsym.minsym != NULL)
-                   nlist.n_value = MSYMBOL_VALUE_RAW_ADDRESS (minsym.minsym);
+                   nlist.n_value = minsym.minsym->value_raw_address ();
                }
              if (pst && textlow_not_set
                  && gdbarch_sofun_address_maybe_missing (gdbarch))
@@ -1836,12 +1836,12 @@ read_dbx_symtab (minimal_symbol_reader &reader,
                            (dependencies_used
                             * sizeof (legacy_psymtab *)));
 #ifdef DEBUG_INFO
-                   fprintf_unfiltered (gdb_stderr,
-                                       "Had to reallocate "
-                                       "dependency list.\n");
-                   fprintf_unfiltered (gdb_stderr,
-                                       "New dependencies allocated: %d\n",
-                                       dependencies_allocated);
+                   gdb_printf (gdb_stderr,
+                               "Had to reallocate "
+                               "dependency list.\n");
+                   gdb_printf (gdb_stderr,
+                               "New dependencies allocated: %d\n",
+                               dependencies_allocated);
 #endif
                  }
              }
@@ -2024,8 +2024,8 @@ dbx_end_psymtab (struct objfile *objfile, psymtab_storage *partial_symtabs,
        }
 
       if (minsym.minsym)
-       pst->set_text_high (MSYMBOL_VALUE_RAW_ADDRESS (minsym.minsym)
-                           + MSYMBOL_SIZE (minsym.minsym));
+       pst->set_text_high (minsym.minsym->value_raw_address ()
+                           + minsym.minsym->size ());
 
       last_function_name = NULL;
     }
@@ -2318,8 +2318,8 @@ read_ofile_symtab (struct objfile *objfile, legacy_psymtab *pst)
   if (get_last_source_start_addr () > text_offset)
     set_last_source_start_addr (text_offset);
 
-  pst->compunit_symtab = end_symtab (text_offset + text_size,
-                                    SECT_OFF_TEXT (objfile));
+  pst->compunit_symtab = end_compunit_symtab (text_offset + text_size,
+                                             SECT_OFF_TEXT (objfile));
 
   end_stabs ();
 
@@ -2367,7 +2367,7 @@ cp_set_block_scope (const struct symbol *symbol,
    the pst->section_offsets.  All symbols that refer to memory
    locations need to be offset by these amounts.
    OBJFILE is the object file from which we are reading symbols.  It
-   is used in end_symtab.
+   is used in end_compunit_symtab.
    LANGUAGE is the language of the symtab.
 */
 
@@ -2575,7 +2575,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name,
              patch_subfile_names (get_current_subfile (), name);
              break;            /* Ignore repeated SOs.  */
            }
-         end_symtab (valu, SECT_OFF_TEXT (objfile));
+         end_compunit_symtab (valu, SECT_OFF_TEXT (objfile));
          end_stabs ();
        }
 
@@ -2587,7 +2587,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name,
       function_start_offset = 0;
 
       start_stabs ();
-      start_symtab (objfile, name, NULL, valu, language);
+      start_compunit_symtab (objfile, name, NULL, valu, language);
       record_debugformat ("stabs");
       break;
 
@@ -2791,7 +2791,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name,
                    = find_stab_function (name, get_last_source_file (),
                                          objfile);
                  if (minsym.minsym != NULL)
-                   valu = BMSYMBOL_VALUE_ADDRESS (minsym);
+                   valu = minsym.value_address ();
                }
 
              /* These addresses are absolute.  */