diff options
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/function.c | 1 | ||||
| -rw-r--r-- | gcc/gengenrtl.c | 4 | ||||
| -rw-r--r-- | gcc/global.c | 16 | ||||
| -rw-r--r-- | gcc/predict.c | 3 | ||||
| -rw-r--r-- | gcc/profile.c | 3 | ||||
| -rw-r--r-- | gcc/sched-rgn.c | 3 | ||||
| -rw-r--r-- | gcc/simplify-rtx.c | 20 |
8 files changed, 15 insertions, 45 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 29dad05254c..90096f63ddf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,15 @@ 2002-07-21 Neil Booth <neil@daikokuya.co.uk> + * gengenrtl.c (gencode): Don't define obstack_alloc_rtx. + * function.c (SYMBOL__MAIN): Remove definition. + * global.c (SET_CONFLICT, REGBITP, ALLOCNO_LIVE_P): Remove. + * predict.c (PROB_NEVER, PROB_LIKELY, PROB_UNLIKELY): Remove. + * profile.c (GCOV_INDEX_TO_BB): Remove. + * sched-rgn.c (ABS_VALUE, MIN_DIFF_PRIORITY, MIN_PROB_DIFF): Remove. + * simplify-rtx.c (FIXED_BASE_PLUS_P): Remove. + +2002-07-21 Neil Booth <neil@daikokuya.co.uk> + * c-lex.c (GET_ENVIRONMENT): Remove. * collect2.c (GET_ENV_PATH_LIST): Remove. (prefix_from_env): Use GET_ENVIRONMENT. diff --git a/gcc/function.c b/gcc/function.c index cd25804fb30..2a59d59459b 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -75,7 +75,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA must define both, or neither. */ #ifndef NAME__MAIN #define NAME__MAIN "__main" -#define SYMBOL__MAIN __main #endif /* Round a value to the lowest integer less than it that is a multiple of diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c index 126be8ead28..6bfd0ff77ee 100644 --- a/gcc/gengenrtl.c +++ b/gcc/gengenrtl.c @@ -337,10 +337,6 @@ gencode () puts ("#include \"rtl.h\""); puts ("#include \"ggc.h\"\n"); puts ("extern struct obstack *rtl_obstack;\n"); - puts ("#define obstack_alloc_rtx(n) \\"); - puts (" ((rtx) obstack_alloc (rtl_obstack, \\"); - puts (" sizeof (struct rtx_def) \\"); - puts (" + ((n) - 1) * sizeof (rtunion)))\n"); for (fmt = formats; *fmt != 0; fmt++) gendef (*fmt); diff --git a/gcc/global.c b/gcc/global.c index aaa789607c0..50a1648c1f8 100644 --- a/gcc/global.c +++ b/gcc/global.c @@ -171,10 +171,6 @@ static int allocno_row_words; (conflicts[(I) * allocno_row_words + (unsigned) (J) / INT_BITS] \ & ((INT_TYPE) 1 << ((unsigned) (J) % INT_BITS))) -#define SET_CONFLICT(I, J) \ - (conflicts[(I) * allocno_row_words + (unsigned) (J) / INT_BITS] \ - |= ((INT_TYPE) 1 << ((unsigned) (J) % INT_BITS))) - /* For any allocno set in ALLOCNO_SET, set ALLOCNO to that allocno, and execute CODE. */ #define EXECUTE_IF_SET_IN_ALLOCNO_SET(ALLOCNO_SET, ALLOCNO, CODE) \ @@ -231,12 +227,8 @@ static int local_reg_freq[FIRST_PSEUDO_REGISTER]; static int local_reg_live_length[FIRST_PSEUDO_REGISTER]; -/* Test a bit in TABLE, a vector of HARD_REG_SETs, - for vector element I, and hard register number J. */ - -#define REGBITP(TABLE, I, J) TEST_HARD_REG_BIT (allocno[I].TABLE, J) - -/* Set to 1 a bit in a vector of HARD_REG_SETs. Works like REGBITP. */ +/* Set to 1 a bit in a vector TABLE of HARD_REG_SETs, for vector + element I, and hard register number J. */ #define SET_REGBIT(TABLE, I, J) SET_HARD_REG_BIT (allocno[I].TABLE, J) @@ -247,10 +239,6 @@ static INT_TYPE *allocnos_live; /* Test, set or clear bit number I in allocnos_live, a bit vector indexed by allocno. */ -#define ALLOCNO_LIVE_P(I) \ - (allocnos_live[(unsigned) (I) / INT_BITS] \ - & ((INT_TYPE) 1 << ((unsigned) (I) % INT_BITS))) - #define SET_ALLOCNO_LIVE(I) \ (allocnos_live[(unsigned) (I) / INT_BITS] \ |= ((INT_TYPE) 1 << ((unsigned) (I) % INT_BITS))) diff --git a/gcc/predict.c b/gcc/predict.c index 71950ee6766..7d94deafa8d 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -57,11 +57,8 @@ static REAL_VALUE_TYPE real_zero, real_one, real_almost_one, real_br_prob_base, real_one_half, real_bb_freq_max; /* Random guesstimation given names. */ -#define PROB_NEVER (0) #define PROB_VERY_UNLIKELY (REG_BR_PROB_BASE / 10 - 1) -#define PROB_UNLIKELY (REG_BR_PROB_BASE * 4 / 10 - 1) #define PROB_EVEN (REG_BR_PROB_BASE / 2) -#define PROB_LIKELY (REG_BR_PROB_BASE - PROB_UNLIKELY) #define PROB_VERY_LIKELY (REG_BR_PROB_BASE - PROB_VERY_UNLIKELY) #define PROB_ALWAYS (REG_BR_PROB_BASE) diff --git a/gcc/profile.c b/gcc/profile.c index c5b903f0461..9e95e667ab3 100644 --- a/gcc/profile.c +++ b/gcc/profile.c @@ -72,9 +72,6 @@ struct bb_info /* Keep all basic block indexes nonnegative in the gcov output. Index 0 is used for entry block, last block exit block. */ -#define GCOV_INDEX_TO_BB(i) ((i) == 0 ? ENTRY_BLOCK_PTR \ - : (((i) == last_basic_block + 1) \ - ? EXIT_BLOCK_PTR : BASIC_BLOCK ((i)-1))) #define BB_TO_GCOV_INDEX(bb) ((bb) == ENTRY_BLOCK_PTR ? 0 \ : ((bb) == EXIT_BLOCK_PTR \ ? last_basic_block + 1 : (bb)->index + 1)) diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c index 4a9989758c8..f9b762ee932 100644 --- a/gcc/sched-rgn.c +++ b/gcc/sched-rgn.c @@ -270,16 +270,13 @@ static edgeset *ancestor_edges; static void compute_dom_prob_ps PARAMS ((int)); -#define ABS_VALUE(x) (((x)<0)?(-(x)):(x)) #define INSN_PROBABILITY(INSN) (SRC_PROB (BLOCK_TO_BB (BLOCK_NUM (INSN)))) #define IS_SPECULATIVE_INSN(INSN) (IS_SPECULATIVE (BLOCK_TO_BB (BLOCK_NUM (INSN)))) #define INSN_BB(INSN) (BLOCK_TO_BB (BLOCK_NUM (INSN))) /* Parameters affecting the decision of rank_for_schedule(). ??? Nope. But MIN_PROBABILITY is used in copmute_trg_info. */ -#define MIN_DIFF_PRIORITY 2 #define MIN_PROBABILITY 40 -#define MIN_PROB_DIFF 10 /* Speculative scheduling functions. */ static int check_live_1 PARAMS ((int, rtx)); diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index b98c47581f1..c69084f7027 100644 --- a/gcc/simplify-rtx.c +++ b/gcc/simplify-rtx.c @@ -43,26 +43,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA virtual regs here because the simplify_*_operation routines are called by integrate.c, which is called before virtual register instantiation. - ?!? FIXED_BASE_PLUS_P and NONZERO_BASE_PLUS_P need to move into + ?!? NONZERO_BASE_PLUS_P needs to move into a header file so that their definitions can be shared with the simplification routines in simplify-rtx.c. Until then, do not - change these macros without also changing the copy in simplify-rtx.c. */ + change this macro without also changing the copy in simplify-rtx.c. */ -#define FIXED_BASE_PLUS_P(X) \ - ((X) == frame_pointer_rtx || (X) == hard_frame_pointer_rtx \ - || ((X) == arg_pointer_rtx && fixed_regs[ARG_POINTER_REGNUM])\ - || (X) == virtual_stack_vars_rtx \ - || (X) == virtual_incoming_args_rtx \ - || (GET_CODE (X) == PLUS && GET_CODE (XEXP (X, 1)) == CONST_INT \ - && (XEXP (X, 0) == frame_pointer_rtx \ - || XEXP (X, 0) == hard_frame_pointer_rtx \ - || ((X) == arg_pointer_rtx \ - && fixed_regs[ARG_POINTER_REGNUM]) \ - || XEXP (X, 0) == virtual_stack_vars_rtx \ - || XEXP (X, 0) == virtual_incoming_args_rtx)) \ - || GET_CODE (X) == ADDRESSOF) - -/* Similar, but also allows reference to the stack pointer. +/* Allows reference to the stack pointer. This used to include FIXED_BASE_PLUS_P, however, we can't assume that arg_pointer_rtx by itself is nonzero, because on at least one machine, |