From 2dbde378c431470dcb97749fc56b470b5a779f74 Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Tue, 14 Jul 1992 02:13:12 +0000
Subject: 	* Makefile.in (DEMANGLING_STYLE):  New define to set default 
 demangling style for C++.  Defaults to "auto". 	* Makefile.in
 (DEMANGLE_OPTS):  Use DEMANGLING_STYLE. 	* Makefile.in
 (SFILES_MAINDIR):  Add demangle.c 	* Makefile.in (OBS):  Add demangle.o 
 * cplus-dem.c (GNU_DEMANGLING, ARM_DEMANGLING, LUCID_DEMANGLING): 	Remove
 compile time decisions about demangling style and replace 	with runtime
 decisions using current_demangling_style. 	* cplus-dem.c (main):  Expand
 code included during building of 	standalone demangler to recognize
 demangling style options. 	* dbxread.c (demangle.h):  Include. 	*
 dbxread.c (read_ofile_symtab, process_one_symbol):  Set GNU C++ 
 demangling style if processing g++ code and current demangling style 	is
 auto (Note: this feature currently disabled.) 	* demangle.c:  New file,
 generic demangling control. 	* demangle.h (demangling_styles):  New
 enumeration to select one 	of several demangling styles.  Also define
 string names for each 	style. 	* demangle.h (set_demangling_style):  Add
 prototype. 	* dwarfread.c (demangle.h):  Include. 	* dwarfread.c
 (GPLUS_PRODUCER, LCC_PRODUCER, CFRONT_PRODUCER): 	New producer string
 prefixes to recognize. 	* dwarfread.c (handle_producer):  Consolidate
 actions for specific 	producers.  Set demangling style based on producer
 string if 	current style is auto.  (Note: this feature currently
 disabled.) 	* config/ncr3000.mt (DEMANGLE_OPTS):  Remove.

---
 gdb/dwarfread.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 2 deletions(-)

(limited to 'gdb/dwarfread.c')

diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index 484472d..6ba1e77 100644
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -53,6 +53,7 @@ other things to work on, if you get bored. :-)
 #include "libbfd.h"	/* FIXME Secret Internal BFD stuff (bfd_read) */
 #include "elf/dwarf.h"
 #include "buildsym.h"
+#include "demangle.h"
 
 #ifdef MAINTENANCE	/* Define to 1 to compile in some maintenance stuff */
 #define SQUAWK(stuff) dwarfwarn stuff
@@ -70,6 +71,18 @@ typedef unsigned int DIE_REF;	/* Reference to a DIE */
 #define GCC_PRODUCER "GNU C "
 #endif
 
+#ifndef GPLUS_PRODUCER
+#define GPLUS_PRODUCER "GNU C++ "
+#endif
+
+#ifndef LCC_PRODUCER
+#define LCC_PRODUCER "LUCID C++ "
+#endif
+
+#ifndef CFRONT_PRODUCER
+#define CFRONT_PRODUCER "CFRONT "	/* A wild a** guess... */
+#endif
+
 #define STREQ(a,b)		(strcmp(a,b)==0)
 #define STREQN(a,b,n)		(strncmp(a,b,n)==0)
 
@@ -302,6 +315,9 @@ static void
 add_enum_psymbol PARAMS ((struct dieinfo *, struct objfile *));
 
 static void
+handle_producer PARAMS ((char *));
+
+static void
 read_file_scope PARAMS ((struct dieinfo *, char *, char *, struct objfile *));
 
 static void
@@ -1530,6 +1546,57 @@ read_func_scope (dip, thisdie, enddie, objfile)
   list_in_scope = &file_symbols;
 }
 
+
+/*
+
+LOCAL FUNCTION
+
+	handle_producer -- process the AT_producer attribute
+
+DESCRIPTION
+
+	Perform any operations that depend on finding a particular
+	AT_producer attribute.
+
+ */
+
+static void
+handle_producer (producer)
+     char *producer;
+{
+
+  /* If this compilation unit was compiled with g++ or gcc, then set the
+     processing_gcc_compilation flag. */
+
+  processing_gcc_compilation =
+    STREQN (producer, GPLUS_PRODUCER, strlen (GPLUS_PRODUCER))
+      || STREQN (producer, GCC_PRODUCER, strlen (GCC_PRODUCER));
+
+  /* Select a demangling style if we can identify the producer and if
+     the current style is auto.  We leave the current style alone if it
+     is not auto.  We also leave the demangling style alone if we find a
+     gcc (cc1) producer, as opposed to a g++ (cc1plus) producer. */
+
+#if 0 /* Works, but is disabled for now.  -fnf */
+  if (current_demangling_style == auto_demangling)
+    {
+      if (STREQN (producer, GPLUS_PRODUCER, strlen (GPLUS_PRODUCER)))
+	{
+	  set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
+	}
+      else if (STREQN (producer, LCC_PRODUCER, strlen (LCC_PRODUCER)))
+	{
+	  set_demangling_style (LUCID_DEMANGLING_STYLE_STRING);
+	}
+      else if (STREQN (producer, CFRONT_PRODUCER, strlen (CFRONT_PRODUCER)))
+	{
+	  set_demangling_style (CFRONT_DEMANGLING_STYLE_STRING);
+	}
+    }
+#endif
+}
+
+
 /*
 
 LOCAL FUNCTION
@@ -1570,8 +1637,7 @@ read_file_scope (dip, thisdie, enddie, objfile)
     }
   if (dip -> at_producer != NULL)
     {
-      processing_gcc_compilation =
-	STREQN (dip -> at_producer, GCC_PRODUCER, strlen (GCC_PRODUCER));
+      handle_producer (dip -> at_producer);
     }
   numutypes = (enddie - thisdie) / 4;
   utypes = (struct type **) xmalloc (numutypes * sizeof (struct type *));
-- 
cgit v1.1