From 1464632be3927d37a6c8b0c188e967b426d84bda Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Tue, 13 Feb 2001 23:10:04 +0100 Subject: [PATCH] * regclass.c (init_reg_sets_1): Silence warning. From-SVN: r39646 --- gcc/ChangeLog | 4 ++ gcc/regclass.c | 100 +++++++++++++++++++++++++------------------------ 2 files changed, 56 insertions(+), 48 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d66d3704dea..8226cb8cb15 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 13 23:05:42 CET 2001 Jan Hubicka + + * regclass.c (init_reg_sets_1): Silence warning. + Tue Feb 13 22:03:07 CET 2001 Jan Hubicka * i386.md (sqrt?f2): Change to expander. diff --git a/gcc/regclass.c b/gcc/regclass.c index da16edc2988..8764cdb827b 100644 --- a/gcc/regclass.c +++ b/gcc/regclass.c @@ -288,7 +288,7 @@ init_reg_sets_1 () { register unsigned int i, j; register unsigned int /* enum machine_mode */ m; - char contains_reg_of_mode [LIM_REG_CLASSES] [MAX_MACHINE_MODE]; + char contains_reg_of_mode [N_REG_CLASSES] [MAX_MACHINE_MODE]; char allocatable_regs_of_mode [MAX_MACHINE_MODE]; /* This macro allows the fixed or call-used registers @@ -443,53 +443,57 @@ init_reg_sets_1 () for (m = 0; m < MAX_MACHINE_MODE; m++) if (allocatable_regs_of_mode [m]) - for (i = 0; i < N_REG_CLASSES; i++) - if (contains_reg_of_mode [i][m]) - for (j = 0; j < N_REG_CLASSES; j++) - { - int cost; - enum reg_class *p1, *p2; - - if (!contains_reg_of_mode [j][m]) - { - move_cost[m][i][j] = 65536; - may_move_in_cost[m][i][j] = 65536; - may_move_out_cost[m][i][j] = 65536; - } - else - { - cost = i == j ? 2 : REGISTER_MOVE_COST (m, i, j); - - for (p2 = ®_class_subclasses[j][0]; *p2 != LIM_REG_CLASSES; - p2++) - if (*p2 != i && contains_reg_of_mode [*p1][m]) - cost = MAX (cost, move_cost [m][i][*p2]); - - for (p1 = ®_class_subclasses[i][0]; *p1 != LIM_REG_CLASSES; - p1++) - if (*p1 != j && contains_reg_of_mode [*p1][m]) - cost = MAX (cost, move_cost [m][*p1][j]); - - move_cost[m][i][j] = cost; - - if (reg_class_subset_p (i, j)) - may_move_in_cost[m][i][j] = 0; - else - may_move_in_cost[m][i][j] = cost; - - if (reg_class_subset_p (j, i)) - may_move_out_cost[m][i][j] = 0; - else - may_move_out_cost[m][i][j] = cost; - } - } - else - for (j = 0; j < N_REG_CLASSES; j++) - { - move_cost[m][i][j] = 65536; - may_move_in_cost[m][i][j] = 65536; - may_move_out_cost[m][i][j] = 65536; - } + { + for (i = 0; i < N_REG_CLASSES; i++) + if (contains_reg_of_mode [i][m]) + for (j = 0; j < N_REG_CLASSES; j++) + { + int cost; + enum reg_class *p1, *p2; + + if (!contains_reg_of_mode [j][m]) + { + move_cost[m][i][j] = 65536; + may_move_in_cost[m][i][j] = 65536; + may_move_out_cost[m][i][j] = 65536; + } + else + { + cost = i == j ? 2 : REGISTER_MOVE_COST (m, i, j); + + for (p2 = ®_class_subclasses[j][0]; + *p2 != LIM_REG_CLASSES; + p2++) + if (*p2 != i && contains_reg_of_mode [*p1][m]) + cost = MAX (cost, move_cost [m][i][*p2]); + + for (p1 = ®_class_subclasses[i][0]; + *p1 != LIM_REG_CLASSES; + p1++) + if (*p1 != j && contains_reg_of_mode [*p1][m]) + cost = MAX (cost, move_cost [m][*p1][j]); + + move_cost[m][i][j] = cost; + + if (reg_class_subset_p (i, j)) + may_move_in_cost[m][i][j] = 0; + else + may_move_in_cost[m][i][j] = cost; + + if (reg_class_subset_p (j, i)) + may_move_out_cost[m][i][j] = 0; + else + may_move_out_cost[m][i][j] = cost; + } + } + else + for (j = 0; j < N_REG_CLASSES; j++) + { + move_cost[m][i][j] = 65536; + may_move_in_cost[m][i][j] = 65536; + may_move_out_cost[m][i][j] = 65536; + } + } #ifdef CLASS_CANNOT_CHANGE_MODE { -- 2.30.2