From 4362e8e01f85cece729ba69b22fe137f0b452cf3 Mon Sep 17 00:00:00 2001 From: kazu Date: Wed, 25 Feb 2004 00:54:30 +0000 Subject: [PATCH] * cse.c (cse_change_cc_mode_insns): Stop at any instruction which modifies NEWREG. (cse_condition_code_reg): Update the mode of CC_REG in CC_SRC_INSN on our own. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78413 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/cse.c | 22 ++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6b9ac6ed1a2..bff9fd89a99 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-02-24 Kazu Hirata + + * cse.c (cse_change_cc_mode_insns): Stop at any instruction + which modifies NEWREG. + (cse_condition_code_reg): Update the mode of CC_REG in + CC_SRC_INSN on our own. + 2004-02-24 Michael Matz * config/i386/i386.c (ix86_comp_type_attributes): Check for diff --git a/gcc/cse.c b/gcc/cse.c index 2d560e0d408..20a4b698ab8 100644 --- a/gcc/cse.c +++ b/gcc/cse.c @@ -7704,7 +7704,7 @@ cse_change_cc_mode (rtx *loc, void *data) /* Change the mode of any reference to the register REGNO (NEWREG) to GET_MODE (NEWREG), starting at START. Stop before END. Stop at - any instruction after START which modifies NEWREG. */ + any instruction which modifies NEWREG. */ static void cse_change_cc_mode_insns (rtx start, rtx end, rtx newreg) @@ -7716,7 +7716,7 @@ cse_change_cc_mode_insns (rtx start, rtx end, rtx newreg) if (! INSN_P (insn)) continue; - if (insn != start && reg_set_p (newreg, insn)) + if (reg_set_p (newreg, insn)) return; for_each_rtx (&PATTERN (insn), cse_change_cc_mode, newreg); @@ -8008,8 +8008,22 @@ cse_condition_code_reg (void) if (mode != GET_MODE (cc_src)) abort (); if (mode != orig_mode) - cse_change_cc_mode_insns (cc_src_insn, NEXT_INSN (last_insn), - gen_rtx_REG (mode, REGNO (cc_reg))); + { + rtx newreg = gen_rtx_REG (mode, REGNO (cc_reg)); + + /* Change the mode of CC_REG in CC_SRC_INSN to + GET_MODE (NEWREG). */ + for_each_rtx (&PATTERN (cc_src_insn), cse_change_cc_mode, + newreg); + for_each_rtx (®_NOTES (cc_src_insn), cse_change_cc_mode, + newreg); + + /* Do the same in the following insns that use the + current value of CC_REG within BB. */ + cse_change_cc_mode_insns (NEXT_INSN (cc_src_insn), + NEXT_INSN (last_insn), + newreg); + } } } } -- 2.11.0