Address review comments for the previous series

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

diff --git a/gdb/macroscope.c b/gdb/macroscope.c
index d90e075f49684ac758d36bc05f18d7755b6614a9..481775f80abfb95dd87f81d0009ee46ad767944d 100644 (file)
--- a/gdb/macroscope.c
+++ b/gdb/macroscope.c
@@ -1,12 +1,12 @@
 /* Functions for deciding which macros are currently in scope.
 /* Functions for deciding which macros are currently in scope.

-   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2017 Free Software Foundation, Inc.

    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    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
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    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,


@@ -15,9 +15,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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

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


@@ -29,20 +27,30 @@
 #include "inferior.h"
 #include "complaints.h"
 
 #include "inferior.h"
 #include "complaints.h"
 

+/* A table of user-defined macros.  Unlike the macro tables used for
+   symtabs, this one uses xmalloc for all its allocation, not an
+   obstack, and it doesn't bcache anything; it just xmallocs things.  So
+   it's perfectly possible to remove things from this, or redefine
+   things.  */
+struct macro_table *macro_user_macros;
+

 
 struct macro_scope *
 sal_macro_scope (struct symtab_and_line sal)
 {
   struct macro_source_file *main_file, *inclusion;
   struct macro_scope *ms;
 
 struct macro_scope *
 sal_macro_scope (struct symtab_and_line sal)
 {
   struct macro_source_file *main_file, *inclusion;
   struct macro_scope *ms;

+  struct compunit_symtab *cust;

 
 

-  if (! sal.symtab
-      || ! sal.symtab->macro_table)
-    return 0;
+  if (sal.symtab == NULL)
+    return NULL;
+  cust = SYMTAB_COMPUNIT (sal.symtab);
+  if (COMPUNIT_MACRO_TABLE (cust) == NULL)
+    return NULL;

 
 

-  ms = (struct macro_scope *) xmalloc (sizeof (*ms));
+  ms = XNEW (struct macro_scope);

 
 

-  main_file = macro_main (sal.symtab->macro_table);
+  main_file = macro_main (COMPUNIT_MACRO_TABLE (cust));

   inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename);
 
   if (inclusion)
   inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename);
 
   if (inclusion)


@@ -72,29 +80,38 @@ sal_macro_scope (struct symtab_and_line sal)
       complaint (&symfile_complaints,
                  _("symtab found for `%s', but that file\n"
                  "is not covered in the compilation unit's macro information"),
       complaint (&symfile_complaints,
                  _("symtab found for `%s', but that file\n"
                  "is not covered in the compilation unit's macro information"),

-                 sal.symtab->filename);
+                 symtab_to_filename_for_display (sal.symtab));

     }
 
   return ms;
 }
 
 
     }
 
   return ms;
 }
 
 

+struct macro_scope *
+user_macro_scope (void)
+{
+  struct macro_scope *ms;
+
+  ms = XNEW (struct macro_scope);
+  ms->file = macro_main (macro_user_macros);
+  ms->line = -1;
+  return ms;
+}
+

 struct macro_scope *
 default_macro_scope (void)
 {
   struct symtab_and_line sal;
   struct macro_scope *ms;
 struct macro_scope *
 default_macro_scope (void)
 {
   struct symtab_and_line sal;
   struct macro_scope *ms;

+  struct frame_info *frame;
+  CORE_ADDR pc;

 
 

-  /* If there's a selected frame, use its PC.  */ 
-  if (deprecated_selected_frame)
-    sal = find_pc_line (get_frame_pc (deprecated_selected_frame), 0);
-  
-  /* If the target has any registers at all, then use its PC.  Why we
-     would have registers but no stack, I'm not sure.  */
-  else if (target_has_registers)
-    sal = find_pc_line (read_pc (), 0);
+  /* If there's a selected frame, use its PC.  */
+  frame = deprecated_safe_get_selected_frame ();
+  if (frame && get_frame_pc_if_available (frame, &pc))
+    sal = find_pc_line (pc, 0);

 
 

-  /* If all else fails, fall back to the current listing position.  */
+  /* Fall back to the current listing position.  */

   else
     {
       /* Don't call select_source_symtab here.  That can raise an
   else
     {
       /* Don't call select_source_symtab here.  That can raise an


@@ -115,7 +132,11 @@ default_macro_scope (void)
       sal.line = cursal.line;
     }
 
       sal.line = cursal.line;
     }
 

-  return sal_macro_scope (sal);
+  ms = sal_macro_scope (sal);
+  if (! ms)
+    ms = user_macro_scope ();
+
+  return ms;

 }
 
 
 }
 
 


@@ -126,6 +147,19 @@ struct macro_definition *
 standard_macro_lookup (const char *name, void *baton)
 {
   struct macro_scope *ms = (struct macro_scope *) baton;
 standard_macro_lookup (const char *name, void *baton)
 {
   struct macro_scope *ms = (struct macro_scope *) baton;

+  struct macro_definition *result;

 
 

-  return macro_lookup_definition (ms->file, ms->line, name);
+  /* Give user-defined macros priority over all others.  */
+  result = macro_lookup_definition (macro_main (macro_user_macros), -1, name);
+  if (! result)
+    result = macro_lookup_definition (ms->file, ms->line, name);
+  return result;
+}
+
+void
+_initialize_macroscope (void)
+{
+  macro_user_macros = new_macro_table (NULL, NULL, NULL);
+  macro_set_main (macro_user_macros, "<user-defined>");
+  macro_allow_redefinitions (macro_user_macros);

 }
 }