This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Fix mess-up


Hi,

I messed up a commit on December 30, I commited part of a patch
that I thought I had removed from my local tree -- but I had only
removed the c++ specific part of it...

The ChangeLog part reverts Kazu's patch to add my "missing" ChangeLog
entry because it was obviously not missing.

I reverted the mess with this patch.  I'm terribly sorry for the
inconvenience this has caused for some of you...

Gr.
Steven

Index: ChangeLog.10
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog.10,v
retrieving revision 2.4
diff -c -3 -p -r2.4 ChangeLog.10
*** ChangeLog.10	2 Jan 2004 17:57:54 -0000	2.4
--- ChangeLog.10	3 Jan 2004 19:55:05 -0000
***************
*** 147,166 ****
  
  2003-12-30  Steven Bosscher  <steven@gcc.gnu.org>
  
- 	* Makefile.in (graph.o): Add dependencies on TREE_H and langhooks.h
- 	(gcse.c): Add dependency on langhooks.h
- 	* function.h (struct function): Remove the `name' field.
- 	(current_function_name): Do not define.
- 	* function.c (allocate_struct_function): Don't initialize the `name'
- 	field.
- 	* gcse.c (gcse_main, one_classic_gcse_pass, one_cprop_pass,
- 	one_pre_gcse_pass, bypass_jumps): Replace all occurences of
- 	current_function_name with lang_hooks.decl_printable_name calls.
- 	* graph.h (start_fct, start_bb, node_data, draw_edge, end_fct):
- 	Likewise.
- 
- 2003-12-30  Steven Bosscher  <steven@gcc.gnu.org>
- 
  	Backport from tree-ssa (relevant changes only):
  	2003-12-18  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
  
--- 147,152 ----
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1213
diff -c -3 -p -r1.1213 Makefile.in
*** Makefile.in	30 Dec 2003 10:40:46 -0000	1.1213
--- Makefile.in	3 Jan 2004 19:55:07 -0000
*************** c-convert.o : c-convert.c $(CONFIG_H) $(
*** 1322,1328 ****
  c-pragma.o: c-pragma.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
      function.h c-pragma.h toplev.h output.h $(GGC_H) $(TM_P_H) $(C_COMMON_H) gt-c-pragma.h
  graph.o: graph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h flags.h output.h \
!     $(RTL_H) function.h langhooks.h hard-reg-set.h $(BASIC_BLOCK_H) graph.h $(TREE_H)
  sbitmap.o: sbitmap.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
      hard-reg-set.h $(BASIC_BLOCK_H)
  
--- 1322,1328 ----
  c-pragma.o: c-pragma.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
      function.h c-pragma.h toplev.h output.h $(GGC_H) $(TM_P_H) $(C_COMMON_H) gt-c-pragma.h
  graph.o: graph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h flags.h output.h \
!     $(RTL_H) function.h hard-reg-set.h $(BASIC_BLOCK_H) graph.h
  sbitmap.o: sbitmap.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
      hard-reg-set.h $(BASIC_BLOCK_H)
  
*************** web.o : web.c $(CONFIG_H) $(SYSTEM_H) co
*** 1651,1657 ****
     hard-reg-set.h flags.h $(BASIC_BLOCK_H) function.h output.h toplev.h df.h
  gcse.o : gcse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
     hard-reg-set.h flags.h real.h insn-config.h $(GGC_H) $(RECOG_H) $(EXPR_H) \
!    $(BASIC_BLOCK_H) function.h langhooks.h output.h toplev.h $(TM_P_H) $(PARAMS_H) \
     except.h gt-gcse.h $(TREE_H)
  sibcall.o : sibcall.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
     function.h hard-reg-set.h flags.h insn-config.h $(RECOG_H) $(BASIC_BLOCK_H)
--- 1651,1657 ----
     hard-reg-set.h flags.h $(BASIC_BLOCK_H) function.h output.h toplev.h df.h
  gcse.o : gcse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
     hard-reg-set.h flags.h real.h insn-config.h $(GGC_H) $(RECOG_H) $(EXPR_H) \
!    $(BASIC_BLOCK_H) function.h output.h toplev.h $(TM_P_H) $(PARAMS_H) \
     except.h gt-gcse.h $(TREE_H)
  sibcall.o : sibcall.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
     function.h hard-reg-set.h flags.h insn-config.h $(RECOG_H) $(BASIC_BLOCK_H)
Index: function.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/function.c,v
retrieving revision 1.481
diff -c -3 -p -r1.481 function.c
*** function.c	30 Dec 2003 10:40:52 -0000	1.481
--- function.c	3 Jan 2004 19:55:11 -0000
*************** allocate_struct_function (tree fndecl)
*** 6408,6413 ****
--- 6408,6415 ----
    DECL_SAVED_INSNS (fndecl) = cfun;
    cfun->decl = fndecl;
  
+   current_function_name = (*lang_hooks.decl_printable_name) (fndecl, 2);
+ 
    result = DECL_RESULT (fndecl);
    if (aggregate_value_p (result, fndecl))
      {
Index: function.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/function.h,v
retrieving revision 1.106
diff -c -3 -p -r1.106 function.h
*** function.h	30 Dec 2003 10:40:52 -0000	1.106
--- function.h	3 Jan 2004 19:55:12 -0000
*************** struct function GTY(())
*** 183,188 ****
--- 183,191 ----
  
    /* For function.c.  */
  
+   /* Name of this function.  */
+   const char *name;
+ 
    /* Points to the FUNCTION_DECL of this function.  */
    tree decl;
  
*************** extern int virtuals_instantiated;
*** 531,536 ****
--- 534,540 ----
  extern int trampolines_created;
  
  /* For backward compatibility... eventually these should all go away.  */
+ #define current_function_name (cfun->name)
  #define current_function_pops_args (cfun->pops_args)
  #define current_function_returns_struct (cfun->returns_struct)
  #define current_function_returns_pcc_struct (cfun->returns_pcc_struct)
Index: gcse.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcse.c,v
retrieving revision 1.284
diff -c -3 -p -r1.284 gcse.c
*** gcse.c	30 Dec 2003 10:40:53 -0000	1.284
--- gcse.c	3 Jan 2004 19:55:16 -0000
*************** Software Foundation, 59 Temple Place - S
*** 161,167 ****
  #include "basic-block.h"
  #include "output.h"
  #include "function.h"
- #include "langhooks.h"
  #include "expr.h"
  #include "except.h"
  #include "ggc.h"
--- 161,166 ----
*************** gcse_main (rtx f, FILE *file)
*** 856,863 ****
    if (file)
      {
        fprintf (file, "GCSE of %s: %d basic blocks, ",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       n_basic_blocks);
        fprintf (file, "%d pass%s, %d bytes\n\n",
  	       pass, pass > 1 ? "es" : "", max_pass_bytes);
      }
--- 855,861 ----
    if (file)
      {
        fprintf (file, "GCSE of %s: %d basic blocks, ",
! 	       current_function_name, n_basic_blocks);
        fprintf (file, "%d pass%s, %d bytes\n\n",
  	       pass, pass > 1 ? "es" : "", max_pass_bytes);
      }
*************** one_classic_gcse_pass (int pass)
*** 3616,3623 ****
      {
        fprintf (gcse_file, "\n");
        fprintf (gcse_file, "GCSE of %s, pass %d: %d bytes needed, %d substs,",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       pass, bytes_used, gcse_subst_count);
        fprintf (gcse_file, "%d insns created\n", gcse_create_count);
      }
  
--- 3614,3620 ----
      {
        fprintf (gcse_file, "\n");
        fprintf (gcse_file, "GCSE of %s, pass %d: %d bytes needed, %d substs,",
! 	       current_function_name, pass, bytes_used, gcse_subst_count);
        fprintf (gcse_file, "%d insns created\n", gcse_create_count);
      }
  
*************** one_cprop_pass (int pass, int cprop_jump
*** 4689,4696 ****
    if (gcse_file)
      {
        fprintf (gcse_file, "CPROP of %s, pass %d: %d bytes needed, ",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       pass, bytes_used);
        fprintf (gcse_file, "%d const props, %d copy props\n\n",
  	       const_prop_count, copy_prop_count);
      }
--- 4686,4692 ----
    if (gcse_file)
      {
        fprintf (gcse_file, "CPROP of %s, pass %d: %d bytes needed, ",
! 	       current_function_name, pass, bytes_used);
        fprintf (gcse_file, "%d const props, %d copy props\n\n",
  	       const_prop_count, copy_prop_count);
      }
*************** one_pre_gcse_pass (int pass)
*** 5792,5799 ****
    if (gcse_file)
      {
        fprintf (gcse_file, "\nPRE GCSE of %s, pass %d: %d bytes needed, ",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       pass, bytes_used);
        fprintf (gcse_file, "%d substs, %d insns created\n",
  	       gcse_subst_count, gcse_create_count);
      }
--- 5788,5794 ----
    if (gcse_file)
      {
        fprintf (gcse_file, "\nPRE GCSE of %s, pass %d: %d bytes needed, ",
! 	       current_function_name, pass, bytes_used);
        fprintf (gcse_file, "%d substs, %d insns created\n",
  	       gcse_subst_count, gcse_create_count);
      }
*************** bypass_jumps (FILE *file)
*** 8022,8029 ****
    if (file)
      {
        fprintf (file, "BYPASS of %s: %d basic blocks, ",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       n_basic_blocks);
        fprintf (file, "%d bytes\n\n", bytes_used);
      }
  
--- 8017,8023 ----
    if (file)
      {
        fprintf (file, "BYPASS of %s: %d basic blocks, ",
! 	       current_function_name, n_basic_blocks);
        fprintf (file, "%d bytes\n\n", bytes_used);
      }
  
Index: graph.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/graph.c,v
retrieving revision 1.29
diff -c -3 -p -r1.29 graph.c
*** graph.c	30 Dec 2003 10:40:53 -0000	1.29
--- graph.c	3 Jan 2004 19:55:16 -0000
*************** Software Foundation, 59 Temple Place - S
*** 25,35 ****
  #include "tm.h"
  
  #include "rtl.h"
- #include "tree.h"
  #include "flags.h"
  #include "output.h"
  #include "function.h"
- #include "langhooks.h"
  #include "hard-reg-set.h"
  #include "basic-block.h"
  #include "toplev.h"
--- 25,33 ----
*************** start_fct (FILE *fp)
*** 57,64 ****
      case vcg:
        fprintf (fp, "\
  graph: { title: \"%s\"\nfolding: 1\nhidden: 2\nnode: { title: \"%s.0\" }\n",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2));
        break;
      case no_graph:
        break;
--- 55,61 ----
      case vcg:
        fprintf (fp, "\
  graph: { title: \"%s\"\nfolding: 1\nhidden: 2\nnode: { title: \"%s.0\" }\n",
! 	       current_function_name, current_function_name);
        break;
      case no_graph:
        break;
*************** start_bb (FILE *fp, int bb)
*** 74,81 ****
        fprintf (fp, "\
  graph: {\ntitle: \"%s.BB%d\"\nfolding: 1\ncolor: lightblue\n\
  label: \"basic block %d",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       bb, bb);
        break;
      case no_graph:
        break;
--- 71,77 ----
        fprintf (fp, "\
  graph: {\ntitle: \"%s.BB%d\"\nfolding: 1\ncolor: lightblue\n\
  label: \"basic block %d",
! 	       current_function_name, bb, bb);
        break;
      case no_graph:
        break;
*************** node_data (FILE *fp, rtx tmp_rtx)
*** 117,125 ****
  	case vcg:
  	  fprintf (fp, "\
  edge: { sourcename: \"%s.0\" targetname: \"%s.%d\" }\n",
! 		   (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 		   (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 		   XINT (tmp_rtx, 0));
  	  break;
  	case no_graph:
  	  break;
--- 113,120 ----
  	case vcg:
  	  fprintf (fp, "\
  edge: { sourcename: \"%s.0\" targetname: \"%s.%d\" }\n",
! 		   current_function_name,
! 		   current_function_name, XINT (tmp_rtx, 0));
  	  break;
  	case no_graph:
  	  break;
*************** edge: { sourcename: \"%s.0\" targetname:
*** 131,138 ****
      case vcg:
        fprintf (fp, "node: {\n  title: \"%s.%d\"\n  color: %s\n  \
  label: \"%s %d\n",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       XINT (tmp_rtx, 0),
  	       GET_CODE (tmp_rtx) == NOTE ? "lightgrey"
  	       : GET_CODE (tmp_rtx) == INSN ? "green"
  	       : GET_CODE (tmp_rtx) == JUMP_INSN ? "darkgreen"
--- 126,132 ----
      case vcg:
        fprintf (fp, "node: {\n  title: \"%s.%d\"\n  color: %s\n  \
  label: \"%s %d\n",
! 	       current_function_name, XINT (tmp_rtx, 0),
  	       GET_CODE (tmp_rtx) == NOTE ? "lightgrey"
  	       : GET_CODE (tmp_rtx) == INSN ? "green"
  	       : GET_CODE (tmp_rtx) == JUMP_INSN ? "darkgreen"
*************** draw_edge (FILE *fp, int from, int to, i
*** 184,194 ****
  	color = "color: green ";
        fprintf (fp,
  	       "edge: { sourcename: \"%s.%d\" targetname: \"%s.%d\" %s",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       from,
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2),
! 	       to,
! 	       color);
        if (class)
  	fprintf (fp, "class: %d ", class);
        fputs ("}\n", fp);
--- 178,185 ----
  	color = "color: green ";
        fprintf (fp,
  	       "edge: { sourcename: \"%s.%d\" targetname: \"%s.%d\" %s",
! 	       current_function_name, from,
! 	       current_function_name, to, color);
        if (class)
  	fprintf (fp, "class: %d ", class);
        fputs ("}\n", fp);
*************** end_fct (FILE *fp)
*** 218,224 ****
      {
      case vcg:
        fprintf (fp, "node: { title: \"%s.999999\" label: \"END\" }\n}\n",
! 	       (*lang_hooks.decl_printable_name) (current_function_decl, 2));
        break;
      case no_graph:
        break;
--- 209,215 ----
      {
      case vcg:
        fprintf (fp, "node: { title: \"%s.999999\" label: \"END\" }\n}\n",
! 	       current_function_name);
        break;
      case no_graph:
        break;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]