diff options
author | Steven Bosscher <steven@gcc.gnu.org> | 2012-05-07 12:29:05 +0000 |
---|---|---|
committer | Steven Bosscher <steven@gcc.gnu.org> | 2012-05-07 12:29:05 +0000 |
commit | 75647adecab60e14e0d5473245c338ed2c3a846e (patch) | |
tree | c93350e13588b280b9f58d91331133dfd1ef95ec /gcc/config/m68k | |
parent | 7d7f7fb7700f62ae33d9a74acac060818842e6b8 (diff) | |
download | gcc-75647adecab60e14e0d5473245c338ed2c3a846e.tar.gz |
m68k.c (m68k_sched_branch_type): Remove.
* config/m68k/m68k.c (m68k_sched_branch_type): Remove.
(sched_branch_type): Remove.
(m68k_sched_md_init_global): Don't allocate it.
(m68k_sched_md_finish_global): Don't free it.
* config/m68k/m68k.h (m68k_sched_branch_type): Remove prototype.
* config/m68k/m68k.md: Set the type of insns using m68k_sched_branch_type
to bcc directly.
From-SVN: r187234
Diffstat (limited to 'gcc/config/m68k')
-rw-r--r-- | gcc/config/m68k/m68k-protos.h | 1 | ||||
-rw-r--r-- | gcc/config/m68k/m68k.c | 37 | ||||
-rw-r--r-- | gcc/config/m68k/m68k.md | 8 |
3 files changed, 4 insertions, 42 deletions
diff --git a/gcc/config/m68k/m68k-protos.h b/gcc/config/m68k/m68k-protos.h index df1888628cc..c77958812dc 100644 --- a/gcc/config/m68k/m68k-protos.h +++ b/gcc/config/m68k/m68k-protos.h @@ -81,7 +81,6 @@ extern enum attr_opx_type m68k_sched_attr_opx_type (rtx, int); extern enum attr_opy_type m68k_sched_attr_opy_type (rtx, int); extern enum attr_size m68k_sched_attr_size (rtx); extern enum attr_op_mem m68k_sched_attr_op_mem (rtx); -extern enum attr_type m68k_sched_branch_type (rtx); #endif /* HAVE_ATTR_cpu */ #endif /* RTX_CODE */ diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c index 8b21419bd31..c6b2ce3aff3 100644 --- a/gcc/config/m68k/m68k.c +++ b/gcc/config/m68k/m68k.c @@ -5882,26 +5882,6 @@ m68k_sched_attr_op_mem (rtx insn) return OP_MEM_I1; } -/* Jump instructions types. Indexed by INSN_UID. - The same rtl insn can be expanded into different asm instructions - depending on the cc0_status. To properly determine type of jump - instructions we scan instruction stream and map jumps types to this - array. */ -static enum attr_type *sched_branch_type; - -/* Return the type of the jump insn. */ -enum attr_type -m68k_sched_branch_type (rtx insn) -{ - enum attr_type type; - - type = sched_branch_type[INSN_UID (insn)]; - - gcc_assert (type != 0); - - return type; -} - /* Data for ColdFire V4 index bypass. Producer modifies register that is used as index in consumer with specified scale. */ @@ -6125,20 +6105,6 @@ m68k_sched_md_init_global (FILE *sched_dump ATTRIBUTE_UNUSED, int sched_verbose ATTRIBUTE_UNUSED, int n_insns ATTRIBUTE_UNUSED) { - /* Init branch types. */ - { - rtx insn; - - sched_branch_type = XCNEWVEC (enum attr_type, get_max_uid () + 1); - - for (insn = get_insns (); insn != NULL_RTX; insn = NEXT_INSN (insn)) - { - if (JUMP_P (insn)) - /* !!! FIXME: Implement real scan here. */ - sched_branch_type[INSN_UID (insn)] = TYPE_BCC; - } - } - #ifdef ENABLE_CHECKING /* Check that all instructions have DFA reservations and that all instructions can be issued from a clean state. */ @@ -6220,9 +6186,6 @@ m68k_sched_md_finish_global (FILE *dump ATTRIBUTE_UNUSED, sched_ib.records.adjust = NULL; sched_ib.records.n_insns = 0; max_insn_size = 0; - - free (sched_branch_type); - sched_branch_type = NULL; } /* Implementation of targetm.sched.init () hook. diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md index cc59d45a3bc..8fc81b53e09 100644 --- a/gcc/config/m68k/m68k.md +++ b/gcc/config/m68k/m68k.md @@ -6346,7 +6346,7 @@ { OUTPUT_JUMP ("jeq %l0", "fjeq %l0", "jeq %l0"); } - [(set (attr "type") (symbol_ref "m68k_sched_branch_type (insn)"))]) + [(set_attr "type" "bcc")]) (define_insn "bne" [(set (pc) @@ -6358,7 +6358,7 @@ { OUTPUT_JUMP ("jne %l0", "fjne %l0", "jne %l0"); } - [(set (attr "type") (symbol_ref "m68k_sched_branch_type (insn)"))]) + [(set_attr "type" "bcc")]) (define_insn "bgt" [(set (pc) @@ -6376,7 +6376,7 @@ OUTPUT_JUMP ("jgt %l0", "fjgt %l0", 0); } - [(set (attr "type") (symbol_ref "m68k_sched_branch_type (insn)"))]) + [(set_attr "type" "bcc")]) (define_insn "bgtu" [(set (pc) @@ -6412,7 +6412,7 @@ OUTPUT_JUMP ("jlt %l0", "fjlt %l0", "jmi %l0"); } - [(set (attr "type") (symbol_ref "m68k_sched_branch_type (insn)"))]) + [(set_attr "type" "bcc")]) (define_insn "bltu" [(set (pc) |