From 86fee241f7c026808dcba406f62751dfbeac8c1c Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Mon, 1 Jan 2001 01:04:01 +0000 Subject: [PATCH] loop.c (check_insn_for_bivs): Use ivs->n_regs to check array bounds. * loop.c (check_insn_for_bivs): Use ivs->n_regs to check array bounds. (find_mem_givs, record_biv, maybe_eliminate_biv): Likewise. (record_initial): Likewise. * unroll.c (copy_loop_body, loop_iterations): Likewise. (remap_split_bivs): Likewise. From-SVN: r38584 --- gcc/ChangeLog | 8 ++++++++ gcc/loop.c | 6 +++--- gcc/unroll.c | 11 ++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8207a7bf908..802678e8ede 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2001-01-01 Michael Hayes + * loop.c (check_insn_for_bivs): Use ivs->n_regs to check array bounds. + (find_mem_givs, record_biv, maybe_eliminate_biv): Likewise. + (record_initial): Likewise. + * unroll.c (copy_loop_body, loop_iterations): Likewise. + (remap_split_bivs): Likewise. + +2001-01-01 Michael Hayes + * loop.c (loop_ivs_free): New function. (strength_reduce): Break out from... diff --git a/gcc/loop.c b/gcc/loop.c index d6c24037f4a..652b5feb9ec 100644 --- a/gcc/loop.c +++ b/gcc/loop.c @@ -4651,7 +4651,7 @@ check_insn_for_bivs (loop, p, not_every_iteration, maybe_multiple) not_every_iteration, maybe_multiple); REG_IV_TYPE (ivs, REGNO (dest_reg)) = BASIC_INDUCT; } - else if (REGNO (dest_reg) < max_reg_before_loop) + else if (REGNO (dest_reg) < ivs->n_regs) REG_IV_TYPE (ivs, REGNO (dest_reg)) = NOT_BASIC_INDUCT; } } @@ -7842,7 +7842,7 @@ maybe_eliminate_biv (loop, bl, eliminate_p, threshold, insn_count) { unsigned int regno = REGNO (SET_DEST (set)); - if (regno < max_reg_before_loop + if (regno < ivs->n_regs && REG_IV_TYPE (ivs, regno) == GENERAL_INDUCT && REG_IV_INFO (ivs, regno)->src_reg == bl->biv->src_reg) p = last; @@ -8321,7 +8321,7 @@ record_initial (dest, set, data) struct iv_class *bl; if (GET_CODE (dest) != REG - || REGNO (dest) >= max_reg_before_loop + || REGNO (dest) >= ivs->n_regs || REG_IV_TYPE (ivs, REGNO (dest)) != BASIC_INDUCT) return; diff --git a/gcc/unroll.c b/gcc/unroll.c index 4597343fc3d..b22d01f7a86 100644 --- a/gcc/unroll.c +++ b/gcc/unroll.c @@ -1912,7 +1912,7 @@ copy_loop_body (loop, copy_start, copy_end, map, exit_label, last_iteration, for the biv was stored in the biv's first struct induction entry by find_splittable_regs. */ - if (regno < max_reg_before_loop + if (regno < ivs->n_regs && REG_IV_TYPE (ivs, regno) == BASIC_INDUCT) { giv_src_reg = REG_IV_CLASS (ivs, regno)->biv->src_reg; @@ -3591,10 +3591,7 @@ loop_iterations (loop) } else if (REG_IV_TYPE (ivs, REGNO (iteration_var)) == BASIC_INDUCT) { - /* When reg_iv_type / reg_iv_info is resized for biv increments - that are turned into givs, reg_biv_class is not resized. - So check here that we don't make an out-of-bounds access. */ - if (REGNO (iteration_var) >= max_reg_before_loop) + if (REGNO (iteration_var) >= ivs->n_regs) abort (); /* Grab initial value, only useful if it is a constant. */ @@ -3609,7 +3606,7 @@ loop_iterations (loop) struct induction *v = REG_IV_INFO (ivs, REGNO (iteration_var)); rtx biv_initial_value; - if (REGNO (v->src_reg) >= max_reg_before_loop) + if (REGNO (v->src_reg) >= ivs->n_regs) abort (); bl = REG_IV_CLASS (ivs, REGNO (v->src_reg)); @@ -4012,7 +4009,7 @@ remap_split_bivs (loop, x) /* If non-reduced/final-value givs were split, then this would also have to remap those givs also. */ #endif - if (REGNO (x) < max_reg_before_loop + if (REGNO (x) < ivs->n_regs && REG_IV_TYPE (ivs, REGNO (x)) == BASIC_INDUCT) return REG_IV_CLASS (ivs, REGNO (x))->biv->src_reg; break; -- 2.30.2