From 8c368ee2188b8630efeab672d3bb9f2bfc61e922 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Fri, 23 Oct 1998 20:51:02 +0000 Subject: [PATCH] loop.c (loop_has_tablejump): New variable. * loop.c (loop_has_tablejump): New variable. (prescan_loop): Scan for it. (insert_bct): Replace explicit scan with use of it. * regclass.c (regclass): Restore loop variable j. (record_reg_classes): Deterine op_types modifiers and initialize classes[i] before matching constraints. Handle matching constraints 5-9. From-SVN: r23263 --- gcc/ChangeLog | 10 ++++++++++ gcc/loop.c | 38 +++++++++++++++++++++----------------- gcc/regclass.c | 30 ++++++++++++++++-------------- 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 76ff258a51f..09616d2ba92 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +Fri Oct 23 23:42:03 1998 David Edelsohn + + * loop.c (loop_has_tablejump): New variable. + (prescan_loop): Scan for it. + (insert_bct): Replace explicit scan with use of it. + * regclass.c (regclass): Restore loop variable j. + (record_reg_classes): Deterine op_types modifiers and initialize + classes[i] before matching constraints. Handle matching + constraints 5-9. + Fri Oct 23 13:55:48 1998 Jim Wilson * m32r/m32r.c (gen_split_move_double): Call alter_subreg. Delete diff --git a/gcc/loop.c b/gcc/loop.c index c8b0954e227..befecf110d5 100644 --- a/gcc/loop.c +++ b/gcc/loop.c @@ -135,6 +135,10 @@ static int loop_has_call; static int loop_has_volatile; +/* Nonzero if there is a tablejump in the current loop. */ + +static int loop_has_tablejump; + /* Added loop_continue which is the NOTE_INSN_LOOP_CONT of the current loop. A continue statement will generate a branch to NEXT_INSN (loop_continue). */ @@ -2367,9 +2371,9 @@ constant_high_bytes (p, loop_start) #endif /* Scan a loop setting the variables `unknown_address_altered', - `num_mem_sets', `loop_continue', loops_enclosed', `loop_has_call', - and `loop_has_volatile'. Also, fill in the arrays `loop_mems' and - `loop_store_mems'. */ + `num_mem_sets', `loop_continue', `loops_enclosed', `loop_has_call', + `loop_has_volatile', and `loop_has_tablejump'. + Also, fill in the arrays `loop_mems' and `loop_store_mems'. */ static void prescan_loop (start, end) @@ -2389,6 +2393,7 @@ prescan_loop (start, end) unknown_address_altered = 0; loop_has_call = 0; loop_has_volatile = 0; + loop_has_tablejump = 0; loop_store_mems_idx = 0; loop_mems_idx = 0; @@ -2435,10 +2440,15 @@ prescan_loop (start, end) if (volatile_refs_p (PATTERN (insn))) loop_has_volatile = 1; + + if (GET_CODE (insn) == JUMP_INSN + && (GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC + || GET_CODE (PATTERN (insn)) == ADDR_VEC)) + loop_has_tablejump = 1; note_stores (PATTERN (insn), note_addr_stored); - if (!loop_has_multiple_exit_targets + if (! loop_has_multiple_exit_targets && GET_CODE (insn) == JUMP_INSN && GET_CODE (PATTERN (insn)) == SET && SET_DEST (PATTERN (insn)) == pc_rtx) @@ -7948,7 +7958,6 @@ insert_bct (loop_start, loop_end) { int i; unsigned HOST_WIDE_INT n_iterations; - rtx insn; int increment_direction, compare_direction; @@ -8009,18 +8018,13 @@ insert_bct (loop_start, loop_end) /* Make sure that the loop does not jump via a table. (the count register might be used to perform the branch on table). */ - for (insn = loop_start; insn && insn != loop_end; insn = NEXT_INSN (insn)) + if (loop_has_tablejump) { - if (GET_CODE (insn) == JUMP_INSN - && (GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC - || GET_CODE (PATTERN (insn)) == ADDR_VEC)) - { - if (loop_dump_stream) - fprintf (loop_dump_stream, - "insert_bct %d: BCT instrumentation failed: computed branch in the loop\n", - loop_num); - return; - } + if (loop_dump_stream) + fprintf (loop_dump_stream, + "insert_bct %d: BCT instrumentation failed: computed branch in the loop\n", + loop_num); + return; } /* Account for loop unrolling in instrumented iteration count. */ @@ -8045,7 +8049,7 @@ insert_bct (loop_start, loop_end) if (n_iterations > 0) { /* Mark all enclosing loops that they cannot use count register. */ - for (i=loop_num; i != -1; i = loop_outer_loop[i]) + for (i = loop_num; i != -1; i = loop_outer_loop[i]) loop_used_count_register[i] = 1; instrument_loop_bct (loop_start, loop_end, GEN_INT (n_iterations)); return; diff --git a/gcc/regclass.c b/gcc/regclass.c index 75d73024885..8d873f95f5e 100644 --- a/gcc/regclass.c +++ b/gcc/regclass.c @@ -998,6 +998,7 @@ regclass (f, nregs) { rtx r = gen_rtx_REG (VOIDmode, 0); enum machine_mode m; + register int j; for (j = 0; j < FIRST_PSEUDO_REGISTER; j++) if (TEST_HARD_REG_BIT (reg_class_contents[i], j)) @@ -1210,8 +1211,19 @@ record_reg_classes (n_alts, n_ops, ops, modes, constraints, insn) continue; } - if (*p == '%') - p++; + /* Ascertain modifiers for line and skip any modifiers that might + occur before first constraint. */ + while (*p == '%' || *p == '=' || *p == '+' || *p == '&') + { + if (*p == '=') + op_types[i] = OP_WRITE; + else if (*p == '+') + op_types[i] = OP_READ_WRITE; + + p++; + } + + classes[i] = NO_REGS; /* If this alternative is only relevant when this operand matches a previous operand, we do different things depending @@ -1281,18 +1293,9 @@ record_reg_classes (n_alts, n_ops, ops, modes, constraints, insn) any of the constraints. Collect the valid register classes and see if this operand accepts memory. */ - classes[i] = NO_REGS; while (*p && (c = *p++) != ',') switch (c) { - case '=': - op_types[i] = OP_WRITE; - break; - - case '+': - op_types[i] = OP_READ_WRITE; - break; - case '*': /* Ignore the next letter for this pass. */ p++; @@ -1300,10 +1303,9 @@ record_reg_classes (n_alts, n_ops, ops, modes, constraints, insn) case '?': alt_cost += 2; - case '%': - case '!': case '#': - case '&': + case '!': case '#': case '&': case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': case 'p': break;