x

From-SVN: r13258

gcc/Makefile.in

@@ -1078,14 +1078,14 @@ sublibobjc.a: cc1obj specs stmp-int-hdrs libgcc2.ready
 # linked using GCC on systems using COFF or ELF, for the sake of C++
 # constructors.
 $(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) gbl-ctors.h
-	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS) \
-	  $(MULTILIB_CFLAGS) -finhibit-size-directive -fno-inline-functions \
-	  -g0 -c $(srcdir)/crtstuff.c -DCRT_BEGIN -o $(T)crtbegin$(objext)
+	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
+	  -finhibit-size-directive -fno-inline-functions $(CRTSTUFF_T_CFLAGS) \
+	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN -o $(T)crtbegin$(objext)
 
 $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) gbl-ctors.h
-	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(CRTSTUFF_T_CFLAGS) \
-	  $(MULTILIB_CFLAGS) -finhibit-size-directive -fno-inline-functions \
-	  -g0 -c $(srcdir)/crtstuff.c -DCRT_END -o $(T)crtend$(objext)
+	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
+	  -finhibit-size-directive -fno-inline-functions $(CRTSTUFF_T_CFLAGS) \
+	  -c $(srcdir)/crtstuff.c -DCRT_END -o $(T)crtend$(objext)
 
 # On some systems we also want to install versions of these files
 # compiled using PIC for use in shared libraries.

gcc/config/mips/mips.c

@@ -4940,7 +4940,7 @@ compute_frame_size (size)
 			      + gp_reg_rounded + fp_reg_size
 			      - fp_inc * UNITS_PER_FPREG);
       current_frame_info.fp_sp_offset = offset;
-      current_frame_info.fp_save_offset = offset - total_size + UNITS_PER_WORD;
+      current_frame_info.fp_save_offset = offset - total_size;
     }
   else
     {
@@ -5066,7 +5066,25 @@ save_restore_insns (store_p, large_reg, large_offset, file)
 						  GEN_INT (gp_offset - base_offset)));
 
 		  if (store_p)
-		    emit_move_insn (mem_rtx, reg_rtx);
+		    {
+		      rtx insn = emit_move_insn (mem_rtx, reg_rtx);
+
+		      if (write_symbols == DWARF2_DEBUG)
+			{
+			  int offset = (gp_offset
+					- current_frame_info.total_size);
+			  if (regno == GP_REG_FIRST + 31)
+			    REG_NOTES (insn)
+			      = gen_rtx (EXPR_LIST, REG_RETURN_SAVE,
+					 GEN_INT (offset), REG_NOTES (insn));
+			  else
+			    REG_NOTES (insn)
+			      = gen_rtx (EXPR_LIST, REG_SAVE,
+					 gen_rtx (EXPR_LIST, VOIDmode, reg_rtx,
+						  GEN_INT (offset)),
+					 REG_NOTES (insn));
+			}
+		    }
 		  else if (!TARGET_ABICALLS || mips_abi != ABI_32
 			   || regno != (PIC_OFFSET_TABLE_REGNUM - GP_REG_FIRST))
 		    emit_move_insn (reg_rtx, mem_rtx);
@@ -5179,7 +5197,20 @@ save_restore_insns (store_p, large_reg, large_offset, file)
 						  GEN_INT (fp_offset - base_offset)));
 
 		  if (store_p)
-		    emit_move_insn (mem_rtx, reg_rtx);
+		    {
+		      rtx insn = emit_move_insn (mem_rtx, reg_rtx);
+
+		      if (write_symbols == DWARF2_DEBUG)
+			{
+			  int offset = (gp_offset
+					- current_frame_info.total_size);
+			  REG_NOTES (insn)
+			    = gen_rtx (EXPR_LIST, REG_SAVE,
+				       gen_rtx (EXPR_LIST, VOIDmode, reg_rtx,
+						GEN_INT (offset)),
+				       REG_NOTES (insn));
+			}
+		    }
 		  else
 		    emit_move_insn (reg_rtx, mem_rtx);
 		}
@@ -5405,6 +5436,8 @@ mips_expand_prologue ()
       /* If we are doing svr4-abi, sp move is done by function_prologue.  */
       if (!TARGET_ABICALLS || mips_abi != ABI_32)
 	{
+	  rtx insn;
+
 	  if (tsize > 32767)
 	    {
 	      tmp_rtx = gen_rtx (REG, Pmode, MIPS_TEMP1_REGNUM);
@@ -5413,21 +5446,37 @@ mips_expand_prologue ()
 	    }
 
 	  if (TARGET_LONG64)
-	    emit_insn (gen_subdi3 (stack_pointer_rtx, stack_pointer_rtx,
-				   tsize_rtx));
+	    insn = emit_insn (gen_subdi3 (stack_pointer_rtx, stack_pointer_rtx,
+					  tsize_rtx));
 	  else
-	    emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
-				   tsize_rtx));
+	    insn = emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
+					  tsize_rtx));
+
+	  if (write_symbols == DWARF2_DEBUG)
+	    REG_NOTES (insn)
+	      = gen_rtx (EXPR_LIST, REG_FRAME,
+			 gen_rtx (PLUS, VOIDmode, stack_pointer_rtx,
+				  GEN_INT (tsize)),
+			 REG_NOTES (insn));
 	}
 
       save_restore_insns (TRUE, tmp_rtx, tsize, (FILE *)0);
 
       if (frame_pointer_needed)
 	{
+	  rtx insn;
+
 	  if (TARGET_64BIT)
-	    emit_insn (gen_movdi (frame_pointer_rtx, stack_pointer_rtx));
+	    insn= emit_insn (gen_movdi (frame_pointer_rtx, stack_pointer_rtx));
 	  else
-	    emit_insn (gen_movsi (frame_pointer_rtx, stack_pointer_rtx));
+	    insn= emit_insn (gen_movsi (frame_pointer_rtx, stack_pointer_rtx));
+
+	  if (write_symbols == DWARF2_DEBUG)
+	    REG_NOTES (insn)
+	      = gen_rtx (EXPR_LIST, REG_FRAME,
+			 gen_rtx (PLUS, VOIDmode, frame_pointer_rtx,
+				  GEN_INT (tsize)),
+			 REG_NOTES (insn));
 	}
 
       if (TARGET_ABICALLS && mips_abi != ABI_32)

gcc/config/mips/t-iris6

@@ -17,3 +17,4 @@ INSTALL_LIBGCC = install-multilib
 # end labels to the .ctors and .dtors section when we link using gcc.
 
 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o
+CRTSTUFF_T_CFLAGS=-g1

gcc/final.c

@@ -1066,11 +1066,6 @@ final_end_function (first, file, optimize)
     dwarfout_end_function ();
 #endif
 
-#ifdef DWARF2_DEBUGGING_INFO
-  if (write_symbols == DWARF2_DEBUG)
-    dwarf2out_end_function ();
-#endif
-
 #ifdef XCOFF_DEBUGGING_INFO
   if (write_symbols == XCOFF_DEBUG)
     xcoffout_end_function (file, high_function_linenum);

gcc/toplev.c

@@ -2776,15 +2776,6 @@ rest_of_type_compilation (type, toplev)
   if (write_symbols == SDB_DEBUG)
     TIMEVAR (symout_time, sdbout_symbol (TYPE_STUB_DECL (type), !toplev));
 #endif
-#ifdef DWARF_DEBUGGING_INFO
-  /* Don't write out function-scope types here.  */
-  if (write_symbols == DWARF_DEBUG && toplev)
-    TIMEVAR (symout_time, dwarfout_file_scope_decl (TYPE_STUB_DECL (type), 0));
-#endif
-#ifdef DWARF2_DEBUGGING_INFO
-  if (write_symbols == DWARF2_DEBUG)
-    TIMEVAR (symout_time, dwarf2out_decl (TYPE_STUB_DECL (type)));
-#endif
 }
 
 /* This is called from finish_function (within yyparse)
@@ -3904,19 +3895,11 @@ main (argc, argv, envp)
 		{ "gstabs+", DBX_DEBUG, 1 },
 #endif
 #ifdef DWARF_DEBUGGING_INFO
-		{ "gdwarf-1", DWARF_DEBUG, 0 },
-		{ "gdwarf-1+", DWARF_DEBUG, 1 },
-#endif
-#ifdef DWARF2_DEBUGGING_INFO
-		{ "gdwarf-2", DWARF2_DEBUG, 0 },
-#endif
-#if defined (DWARF_DEBUGGING_INFO) || defined (DWARF2_DEBUGGING_INFO)
-#if PREFERRED_DEBUGGING_TYPE == DWARF_DEBUG || !defined (DWARF2_DEBUGGING_INFO)
 		{ "gdwarf", DWARF_DEBUG, 0 },
 		{ "gdwarf+", DWARF_DEBUG, 1 },
-#else
-		{ "gdwarf", DWARF2_DEBUG, 0 },
 #endif
+#ifdef DWARF2_DEBUGGING_INFO
+		{ "gdwarf-2", DWARF2_DEBUG, 0 },
 #endif
 #ifdef XCOFF_DEBUGGING_INFO
 		{ "gxcoff", XCOFF_DEBUG, 0 },
@@ -4398,3 +4381,58 @@ debug_undef (lineno, buffer)
     dwarf2out_undef (lineno, buffer);
 #endif /* DWARF2_DEBUGGING_INFO */
 }
+
+/* Record the relative location of the current stack frame at the PC value
+   indicated by LABEL if specified, or at the beginning of the function
+   if LABEL is NULL.  RTL is either:
+
+   a REG:  The frame is at 0(REG).
+   a PLUS of a REG and a CONST_INT:  The frame is at CONST(REG).  */
+
+void
+debug_frame (label, rtl)
+     char *label;
+     rtx rtl;
+{
+#ifdef DWARF2_DEBUGGING_INFO
+  if (write_symbols == DWARF2_DEBUG)
+    dwarf2out_def_cfa (label, rtl);
+#endif
+}
+
+/* Record that REGNO, a callee-saved register, has been saved somewhere.
+   LABEL is as for debug_frame.  RTL is either:
+
+   a REG:  The register is saved in REG.
+   a CONST_INT:  The register is saved at an offset of CONST
+     from the frame.  */
+
+void
+debug_reg_save (label, regno, rtl)
+     char *label;
+     unsigned regno;
+     rtx rtl;
+{
+#ifdef DWARF2_DEBUGGING_INFO
+  if (write_symbols == DWARF2_DEBUG)
+    dwarf2out_reg_save (label, regno, rtl);
+#endif
+}
+
+/* Record the location of the return address for the current frame.
+   LABEL is as for debug_frame.  RTL is either:
+
+   a REG:  The return address is saved in REG.
+   a CONST_INT:  The return address is saved at an offset of CONST
+     from the frame.  */
+
+void
+debug_return_save (label, rtl)
+     char *label;
+     rtx rtl;
+{
+#ifdef DWARF2_DEBUGGING_INFO
+  if (write_symbols == DWARF2_DEBUG)
+    dwarf2out_return_save (label, rtl);
+#endif
+}

gcc/tree.c

@@ -1268,6 +1268,45 @@ get_identifier (text)
   return idp;			/* <-- return if created */
 }
 
+/* If an identifier with the name TEXT (a null-terminated string) has
+   previously been referred to, return that node; otherwise return
+   NULL_TREE.  */
+
+tree
+maybe_get_identifier (text)
+     register char *text;
+{
+  register int hi;
+  register int i;
+  register tree idp;
+  register int len, hash_len;
+
+  /* Compute length of text in len.  */
+  for (len = 0; text[len]; len++);
+
+  /* Decide how much of that length to hash on */
+  hash_len = len;
+  if (warn_id_clash && len > id_clash_len)
+    hash_len = id_clash_len;
+
+  /* Compute hash code */
+  hi = hash_len * 613 + (unsigned) text[0];
+  for (i = 1; i < hash_len; i += 2)
+    hi = ((hi * 613) + (unsigned) (text[i]));
+
+  hi &= (1 << HASHBITS) - 1;
+  hi %= MAX_HASH_TABLE;
+  
+  /* Search table for identifier */
+  for (idp = hash_table[hi]; idp; idp = TREE_CHAIN (idp))
+    if (IDENTIFIER_LENGTH (idp) == len
+	&& IDENTIFIER_POINTER (idp)[0] == text[0]
+	&& !bcmp (IDENTIFIER_POINTER (idp), text, len))
+      return idp;		/* <-- return if found */
+
+  return NULL_TREE;
+}
+
 /* Enable warnings on similar identifiers (if requested).
    Done after the built-in identifiers are created.  */
 

gcc/varasm.c

@@ -1175,25 +1175,15 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
 	      && (TREE_PUBLIC (decl) == 0 || DECL_INITIAL (decl) == 0))
 	    sdbout_symbol (decl, 0);
 #endif
-#ifdef DWARF_DEBUGGING_INFO
-	  if (write_symbols == DWARF_DEBUG && top_level
-	      && DECL_CONTEXT (decl))
-	    dwarfout_file_scope_decl (decl, 0);
-#endif
-#ifdef DWARF2_DEBUGGING_INFO
-	  if (write_symbols == DWARF2_DEBUG && top_level
-	      && DECL_CONTEXT (decl))
-	    dwarf2out_decl (decl);
-#endif
 	}
 
-      /* Only output DWARF debugging information for record-scope variables
-	 here.  In the case of function-scope variables, the information
-	 for them is output when we do our recursive traversal of the tree
-	 representation for the entire containing function.  In the case of
-	 file-scope variables, we output information for all of them at the
-	 very end of compilation while we are doing our final traversal of
-	 the chain of file-scope declarations.  */
+      /* Don't output any DWARF debugging information for variables here.
+	 In the case of local variables, the information for them is output
+	 when we do our recursive traversal of the tree representation for
+	 the entire containing function.  In the case of file-scope variables,
+	 we output information for all of them at the very end of compilation
+	 while we are doing our final traversal of the chain of file-scope
+	 declarations.  */
 
       return;
     }
@@ -1308,24 +1298,14 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
 	  && (TREE_PUBLIC (decl) == 0 || DECL_INITIAL (decl) == 0))
 	sdbout_symbol (decl, 0);
 #endif
-#ifdef DWARF_DEBUGGING_INFO
-      if (write_symbols == DWARF_DEBUG && top_level
-	  && DECL_CONTEXT (decl))
-	dwarfout_file_scope_decl (decl, 0);
-#endif
-#ifdef DWARF2_DEBUGGING_INFO
-      if (write_symbols == DWARF2_DEBUG && top_level
-	  && DECL_CONTEXT (decl))
-	dwarf2out_decl (decl);
-#endif
 
-      /* Only output DWARF debugging information for record-scope variables
-	 here.  In the case of function-scope variables, the information
-	 for them is output when we do our recursive traversal of the tree
-	 representation for the entire containing function.  In the case of
-	 file-scope variables, we output information for all of them at the
-	 very end of compilation while we are doing our final traversal of
-	 the chain of file-scope declarations.  */
+      /* Don't output any DWARF debugging information for variables here.
+	 In the case of local variables, the information for them is output
+	 when we do our recursive traversal of the tree representation for
+	 the entire containing function.  In the case of file-scope variables,
+	 we output information for all of them at the very end of compilation
+	 while we are doing our final traversal of the chain of file-scope
+	 declarations.  */
 
 #if 0 /* ??? We should either delete this or add a comment describing what
 	 it was intended to do and why we shouldn't delete it.  */
@@ -1729,15 +1709,13 @@ assemble_name (file, name)
      char *name;
 {
   char *real_name;
-  int save_warn_id_clash = warn_id_clash;
+  tree id;
 
   STRIP_NAME_ENCODING (real_name, name);
 
-  /* Don't warn about an identifier name length clash on this name, since
-     it can be a user symbol suffixed by a number.  */
-  warn_id_clash = 0;
-  TREE_SYMBOL_REFERENCED (get_identifier (real_name)) = 1;
-  warn_id_clash = save_warn_id_clash;
+  id = maybe_get_identifier (real_name);
+  if (id)
+    TREE_SYMBOL_REFERENCED (id) = 1;
 
   if (name[0] == '*')
     {