diff options
| author | tbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-22 13:16:35 +0000 |
|---|---|---|
| committer | tbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-22 13:16:35 +0000 |
| commit | 15b80194f4288462742b1c89a98031f7dd6a91c1 (patch) | |
| tree | d6909c3f9e76c396339eb33e04190c171dbd81db /gcc/config | |
| parent | 4067fcc6112d91a1e9f39d2c2d93b1a10628297f (diff) | |
| download | gcc-15b80194f4288462742b1c89a98031f7dd6a91c1.tar.gz | |
make next/prev nonnote_nondebug_insn take rtx_insn *
gcc/ChangeLog:
2016-09-22 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* config/cris/cris.c (cris_asm_output_case_end): Change argument
type to rtx_insn *.
* emit-rtl.c (next_nonnote_nondebug_insn): Likewise.
(prev_nonnote_nondebug_insn): Likewise.
* config/cris/cris-protos.h: Adjust prototype.
* rtl.h: Likewise.
* jump.c (rtx_renumbered_equal_p): Adjust.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240360 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config')
| -rw-r--r-- | gcc/config/cris/cris-protos.h | 2 | ||||
| -rw-r--r-- | gcc/config/cris/cris.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h index 5e0ae61d231..028c2b7120d 100644 --- a/gcc/config/cris/cris-protos.h +++ b/gcc/config/cris/cris-protos.h @@ -44,7 +44,7 @@ extern bool cris_store_multiple_op_p (rtx); extern bool cris_movem_load_rest_p (rtx, int); extern void cris_asm_output_symbol_ref (FILE *, rtx); extern int cris_cfun_uses_pic_table (void); -extern void cris_asm_output_case_end (FILE *, int, rtx); +extern void cris_asm_output_case_end (FILE *, int, rtx_insn *); extern rtx cris_gen_movem_load (rtx, rtx, int); extern rtx cris_emit_movem_store (rtx, rtx, int, bool); extern void cris_expand_pic_call_address (rtx *, rtx *); diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index 1026aad328d..c909453006d 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -2588,11 +2588,11 @@ cris_asm_output_ident (const char *string) /* The ASM_OUTPUT_CASE_END worker. */ void -cris_asm_output_case_end (FILE *stream, int num, rtx table) +cris_asm_output_case_end (FILE *stream, int num, rtx_insn *table) { /* Step back, over the label for the table, to the actual casejump and assert that we find only what's expected. */ - rtx whole_jump_insn = prev_nonnote_nondebug_insn (table); + rtx_insn *whole_jump_insn = prev_nonnote_nondebug_insn (table); gcc_assert (whole_jump_insn != NULL_RTX && LABEL_P (whole_jump_insn)); whole_jump_insn = prev_nonnote_nondebug_insn (whole_jump_insn); gcc_assert (whole_jump_insn != NULL_RTX @@ -2600,15 +2600,15 @@ cris_asm_output_case_end (FILE *stream, int num, rtx table) || (TARGET_V32 && INSN_P (whole_jump_insn) && GET_CODE (PATTERN (whole_jump_insn)) == SEQUENCE))); /* Get the pattern of the casejump, so we can extract the default label. */ - whole_jump_insn = PATTERN (whole_jump_insn); + rtx whole_jump_pat = PATTERN (whole_jump_insn); if (TARGET_V32) { /* This can be a SEQUENCE, meaning the delay-slot of the jump is filled. We also output the offset word a little differently. */ rtx parallel_jump - = (GET_CODE (whole_jump_insn) == SEQUENCE - ? PATTERN (XVECEXP (whole_jump_insn, 0, 0)) : whole_jump_insn); + = (GET_CODE (whole_jump_pat) == SEQUENCE + ? PATTERN (XVECEXP (whole_jump_pat, 0, 0)) : whole_jump_pat); asm_fprintf (stream, "\t.word %LL%d-.%s\n", @@ -2623,7 +2623,7 @@ cris_asm_output_case_end (FILE *stream, int num, rtx table) "\t.word %LL%d-%LL%d%s\n", CODE_LABEL_NUMBER (XEXP (XEXP - (XEXP (XVECEXP (whole_jump_insn, 0, 0), 1), + (XEXP (XVECEXP (whole_jump_pat, 0, 0), 1), 2), 0)), num, (TARGET_PDEBUG ? "; default" : "")); |