aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ChangeLog14
-rw-r--r--gcc/cfgrtl.c14
-rw-r--r--gcc/config/nds32/nds32.c2
-rw-r--r--gcc/config/sh/sh.c40
-rw-r--r--gcc/haifa-sched.c10
-rw-r--r--gcc/java/ChangeLog2
-rw-r--r--gcc/reload1.c3
-rw-r--r--gcc/reorg.c7
8 files changed, 58 insertions, 34 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cea26ec..c544878 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2013-11-13 Steven Bosscher <steven@gcc.gnu.org>
+
+ * cfgrtl.c (can_fallthru): Reorder code to move tablejump check up.
+ Make that check explicit. BB_HEAD cannot be NULL, remove check for it.
+ * haifa-sched.c (ready_remove_first_dispatch): Check INSN_P before
+ looking at INSN_CODE.
+ * reload1.c (delete_dead_insn) Do not expect JUMP_TABLE_DATA to be an
+ active_insn_p object, respect basic block boundaries.
+ * reorg.c (follow_jumps): Use invariant that JUMP_TABLE_DATA always
+ follows immediately after the jump table data label.
+ * config/nds32/nds32.c (nds32_output_casesi_pc_relative): Likewise.
+ * config/sh/sh.c (barrier_align): Likewise. Rearrange code such
+ that JUMP_TABLE_DATA is not expected to be an active_insn_p object.
+
2013-11-13 Teresa Johnson <tejohnson@google.com>
PR ipa/58862
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index d6733a2..c7ee7ee 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -610,7 +610,7 @@ forwarder_block_p (const_basic_block bb)
}
/* Return nonzero if we can reach target from src by falling through. */
-/* FIXME: Make this a cfg hook. */
+/* FIXME: Make this a cfg hook, the result is only valid in cfgrtl mode. */
bool
can_fallthru (basic_block src, basic_block target)
@@ -623,17 +623,21 @@ can_fallthru (basic_block src, basic_block target)
if (target == EXIT_BLOCK_PTR)
return true;
if (src->next_bb != target)
- return 0;
+ return false;
+
+ /* ??? Later we may add code to move jump tables offline. */
+ if (tablejump_p (insn, NULL, NULL))
+ return false;
+
FOR_EACH_EDGE (e, ei, src->succs)
if (e->dest == EXIT_BLOCK_PTR
&& e->flags & EDGE_FALLTHRU)
- return 0;
+ return false;
insn2 = BB_HEAD (target);
- if (insn2 && !active_insn_p (insn2))
+ if (!active_insn_p (insn2))
insn2 = next_active_insn (insn2);
- /* ??? Later we may add code to move jump tables offline. */
return next_active_insn (insn) == insn2;
}
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 2700a87..f039e27 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -4677,7 +4677,7 @@ nds32_output_casesi_pc_relative (rtx *operands)
enum machine_mode mode;
rtx diff_vec;
- diff_vec = PATTERN (next_active_insn (operands[1]));
+ diff_vec = PATTERN (NEXT_INSN (operands[1]));
gcc_assert (GET_CODE (diff_vec) == ADDR_DIFF_VEC);
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 6afeca9..973d25a 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -5774,24 +5774,18 @@ fixup_addr_diff_vecs (rtx first)
int
barrier_align (rtx barrier_or_label)
{
- rtx next = next_active_insn (barrier_or_label), pat, prev;
+ rtx next, pat;
- if (! next)
- return 0;
-
- pat = PATTERN (next);
-
- if (GET_CODE (pat) == ADDR_DIFF_VEC)
+ if (LABEL_P (barrier_or_label)
+ && NEXT_INSN (barrier_or_label)
+ && JUMP_TABLE_DATA_P (NEXT_INSN (barrier_or_label)))
return 2;
- if (GET_CODE (pat) == UNSPEC_VOLATILE && XINT (pat, 1) == UNSPECV_ALIGN)
- /* This is a barrier in front of a constant table. */
- return 0;
-
- prev = prev_active_insn (barrier_or_label);
- if (GET_CODE (PATTERN (prev)) == ADDR_DIFF_VEC)
+ if (BARRIER_P (barrier_or_label)
+ && PREV_INSN (barrier_or_label)
+ && JUMP_TABLE_DATA_P (PREV_INSN (barrier_or_label)))
{
- pat = PATTERN (prev);
+ pat = PATTERN (PREV_INSN (barrier_or_label));
/* If this is a very small table, we want to keep the alignment after
the table to the minimum for proper code alignment. */
return ((optimize_size
@@ -5800,6 +5794,17 @@ barrier_align (rtx barrier_or_label)
? 1 << TARGET_SHMEDIA : align_jumps_log);
}
+ next = next_active_insn (barrier_or_label);
+
+ if (! next)
+ return 0;
+
+ pat = PATTERN (next);
+
+ if (GET_CODE (pat) == UNSPEC_VOLATILE && XINT (pat, 1) == UNSPECV_ALIGN)
+ /* This is a barrier in front of a constant table. */
+ return 0;
+
if (optimize_size)
return 0;
@@ -5824,13 +5829,12 @@ barrier_align (rtx barrier_or_label)
(fill_eager_delay_slots) and the branch is to the insn after the insn
after the barrier. */
- /* PREV is presumed to be the JUMP_INSN for the barrier under
- investigation. Skip to the insn before it. */
-
int slot, credit;
bool jump_to_next = false;
- prev = prev_real_insn (prev);
+ /* Skip to the insn before the JUMP_INSN before the barrier under
+ investigation. */
+ rtx prev = prev_real_insn (prev_active_insn (barrier_or_label));
for (slot = 2, credit = (1 << (CACHE_LOG - 2)) + 2;
credit >= 0 && prev && NONJUMP_INSN_P (prev);
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 728d51b..5edf574 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -8589,8 +8589,8 @@ ready_remove_first_dispatch (struct ready_list *ready)
rtx insn = ready_element (ready, 0);
if (ready->n_ready == 1
- || INSN_CODE (insn) < 0
|| !INSN_P (insn)
+ || INSN_CODE (insn) < 0
|| !active_insn_p (insn)
|| targetm.sched.dispatch (insn, FITS_DISPATCH_WINDOW))
return ready_remove_first (ready);
@@ -8599,8 +8599,8 @@ ready_remove_first_dispatch (struct ready_list *ready)
{
insn = ready_element (ready, i);
- if (INSN_CODE (insn) < 0
- || !INSN_P (insn)
+ if (!INSN_P (insn)
+ || INSN_CODE (insn) < 0
|| !active_insn_p (insn))
continue;
@@ -8619,8 +8619,8 @@ ready_remove_first_dispatch (struct ready_list *ready)
{
insn = ready_element (ready, i);
- if (INSN_CODE (insn) < 0
- || !INSN_P (insn)
+ if (! INSN_P (insn)
+ || INSN_CODE (insn) < 0
|| !active_insn_p (insn))
continue;
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 04b3629..2b2d963 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -124,7 +124,7 @@
2012-07-16 Steven Bosscher <steven@gcc.gnu.org>
- * java-gimplify.c Include dumpfile.h instead of tree-dump.h
+ * java-gimplify.c: Include dumpfile.h instead of tree-dump.h
* Make-lang.in: Fix dependencies.
2012-07-11 Steven Bosscher <steven@gcc.gnu.org>
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 204685d..a40e16b 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -2123,7 +2123,8 @@ delete_dead_insn (rtx insn)
block local equivalences. Instead of trying to figure out the exact
circumstances where we can delete the potentially dead insns, just
let DCE do the job. */
- if (prev && GET_CODE (PATTERN (prev)) == SET
+ if (prev && BLOCK_FOR_INSN (prev) == BLOCK_FOR_INSN (insn)
+ && GET_CODE (PATTERN (prev)) == SET
&& (prev_dest = SET_DEST (PATTERN (prev)), REG_P (prev_dest))
&& reg_mentioned_p (prev_dest, PATTERN (insn))
&& find_regno_note (insn, REG_DEAD, REGNO (prev_dest))
diff --git a/gcc/reorg.c b/gcc/reorg.c
index e9aa889..a87979d 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -2302,15 +2302,16 @@ follow_jumps (rtx label, rtx jump, bool *crossing)
depth++)
{
rtx this_label = JUMP_LABEL (insn);
- rtx tem;
/* If we have found a cycle, make the insn jump to itself. */
if (this_label == label)
return label;
+
+ /* Cannot follow returns and cannot look through tablejumps. */
if (ANY_RETURN_P (this_label))
return this_label;
- tem = next_active_insn (this_label);
- if (tem && JUMP_TABLE_DATA_P (tem))
+ if (NEXT_INSN (this_label)
+ && JUMP_TABLE_DATA_P (NEXT_INSN (this_label)))
break;
if (!targetm.can_follow_jump (jump, insn))
generated by cgit v1.1 at 2024-10-01 07:47:53 +0000