diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 784128f44a8..90a3e6b7956 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,21 @@ +2010-07-12 Richard Sandiford + + * Makefile.in (gcse.o, target-globals.o): Depend on gcse.h.. + * gcse.h: New file. + * gcse.c: Include gcse.h. + (default_target_gcse): New variable. + (this_target_gcse): New conditional variable. + (can_copy): Redefine as a macro. + (can_copy_init_p): New macro. + (can_copy_p): Remove can_copy_init_p. + * target-globals.h (this_target_gcse): Declare. + (target_globals): Add a gcse field. + (restore_target_globals): Copy the gcse field to + this_target_gcse. + * target-globals.c: Include gcse.h. + (default_target_globals): Initialize the gcse field. + (save_target_globals): Likewise. + 2010-07-12 Richard Sandiford * ira-int.h (target_ira_int): Add x_ira_prohibited_mode_move_regs diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 1db2ecbda56..c093623eaf8 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3097,7 +3097,7 @@ gcse.o : gcse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) $(FUNCTION_H) output.h $(TOPLEV_H) $(DIAGNOSTIC_CORE_H) \ $(TM_P_H) $(PARAMS_H) cselib.h $(EXCEPT_H) gt-gcse.h $(TREE_H) $(TIMEVAR_H) \ intl.h $(OBSTACK_H) $(TREE_PASS_H) $(DF_H) $(DBGCNT_H) $(TARGET_H) \ - $(DF_H) + $(DF_H) gcse.h store-motion.o : store-motion.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ $(REGS_H) hard-reg-set.h $(FLAGS_H) insn-config.h $(GGC_H) \ $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) $(FUNCTION_H) output.h $(TOPLEV_H) $(DIAGNOSTIC_CORE_H) \ @@ -3483,7 +3483,7 @@ lower-subreg.o : lower-subreg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ target-globals.o : target-globals.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) insn-config.h $(MACHMODE_H) $(GGC_H) $(TOPLEV_H) target-globals.h \ $(FLAGS_H) $(REGS_H) $(RTL_H) reload.h expmed.h $(EXPR_H) $(OPTABS_H) \ - $(LIBFUNCS_H) $(CFGLOOP_H) $(IRA_INT_H) builtins.h + $(LIBFUNCS_H) $(CFGLOOP_H) $(IRA_INT_H) builtins.h gcse.h $(out_object_file): $(out_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) \ $(RTL_H) $(REGS_H) hard-reg-set.h insn-config.h conditions.h \ diff --git a/gcc/gcse.c b/gcc/gcse.c index 0fb2a2c37d0..6f345ccbce6 100644 --- a/gcc/gcse.c +++ b/gcc/gcse.c @@ -170,6 +170,7 @@ along with GCC; see the file COPYING3. If not see #include "df.h" #include "dbgcnt.h" #include "target.h" +#include "gcse.h" /* We support GCSE via Partial Redundancy Elimination. PRE optimizations are a superset of those done by classic GCSE. @@ -263,6 +264,11 @@ along with GCC; see the file COPYING3. If not see /* GCSE global vars. */ +struct target_gcse default_target_gcse; +#if SWITCHABLE_TARGET +struct target_gcse *this_target_gcse = &default_target_gcse; +#endif + /* Set to non-zero if CSE should run after all GCSE optimizations are done. */ int flag_rerun_cse_after_global_opts; @@ -539,10 +545,10 @@ static bool is_too_expensive (const char *); /* Misc. utilities. */ -/* Nonzero for each mode that supports (set (reg) (reg)). - This is trivially true for integer and floating point values. - It may or may not be true for condition codes. */ -static char can_copy[(int) NUM_MACHINE_MODES]; +#define can_copy \ + (this_target_gcse->x_can_copy) +#define can_copy_init_p \ + (this_target_gcse->x_can_copy_init_p) /* Compute which modes support reg/reg copy operations. */ @@ -579,8 +585,6 @@ compute_can_copy (void) bool can_copy_p (enum machine_mode mode) { - static bool can_copy_init_p = false; - if (! can_copy_init_p) { compute_can_copy (); diff --git a/gcc/gcse.h b/gcc/gcse.h new file mode 100644 index 00000000000..b4ed7f22fa1 --- /dev/null +++ b/gcc/gcse.h @@ -0,0 +1,43 @@ +/* Global common subexpression elimination/Partial redundancy elimination + and global constant/copy propagation for GNU compiler. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC 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 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +. */ + +#ifndef GCC_GCSE_H +#define GCC_GCSE_H + +/* Target-dependent globals. */ +struct target_gcse { + /* Nonzero for each mode that supports (set (reg) (reg)). + This is trivially true for integer and floating point values. + It may or may not be true for condition codes. */ + char x_can_copy[(int) NUM_MACHINE_MODES]; + + /* True if the previous field has been initialized. */ + bool x_can_copy_init_p; +}; + +extern GTY(()) struct target_gcse default_target_gcse; +#if SWITCHABLE_TARGET +extern struct target_gcse *this_target_gcse; +#else +#define this_target_gcse (&default_target_gcse) +#endif + +#endif diff --git a/gcc/target-globals.c b/gcc/target-globals.c index cca93a53f91..02aa5d873c1 100644 --- a/gcc/target-globals.c +++ b/gcc/target-globals.c @@ -38,6 +38,7 @@ along with GCC; see the file COPYING3. If not see #include "cfgloop.h" #include "ira-int.h" #include "builtins.h" +#include "gcse.h" #if SWITCHABLE_TARGET struct target_globals default_target_globals = { @@ -52,7 +53,8 @@ struct target_globals default_target_globals = { &default_target_cfgloop, &default_target_ira, &default_target_ira_int, - &default_target_builtins + &default_target_builtins, + &default_target_gcse }; struct target_globals * @@ -73,6 +75,7 @@ save_target_globals (void) g->ira = XCNEW (struct target_ira); g->ira_int = XCNEW (struct target_ira_int); g->builtins = XCNEW (struct target_builtins); + g->gcse = XCNEW (struct target_gcse); restore_target_globals (g); target_reinit (); return g; diff --git a/gcc/target-globals.h b/gcc/target-globals.h index a0cf73730c2..cdad7085e9a 100644 --- a/gcc/target-globals.h +++ b/gcc/target-globals.h @@ -33,6 +33,7 @@ extern struct target_cfgloop *this_target_cfgloop; extern struct target_ira *this_target_ira; extern struct target_ira_int *this_target_ira_int; extern struct target_builtins *this_target_builtins; +extern struct target_gcse *this_target_gcse; struct GTY(()) target_globals { struct target_flag_state *GTY((skip)) flag_state; @@ -47,6 +48,7 @@ struct GTY(()) target_globals { struct target_ira *GTY((skip)) ira; struct target_ira_int *GTY((skip)) ira_int; struct target_builtins *GTY((skip)) builtins; + struct target_gcse *GTY((skip)) gcse; }; extern struct target_globals default_target_globals; @@ -68,6 +70,7 @@ restore_target_globals (struct target_globals *g) this_target_ira = g->ira; this_target_ira_int = g->ira_int; this_target_builtins = g->builtins; + this_target_gcse = g->gcse; } #endif