From 6e37f6d40e022a814b1a73fa1da5ec60435a507b Mon Sep 17 00:00:00 2001
From: Trevor Smigiel <Trevor_Smigiel@playstation.sony.com>
Date: Mon, 27 Apr 2009 19:33:20 +0000
Subject: [PATCH] spu.c (spu_machine_dependent_reorg): Make sure branch label
on hint instruction is correct.
* spu.c (spu_machine_dependent_reorg): Make sure branch label on hint
instruction is correct.
From-SVN: r146852
---
gcc/ChangeLog | 6 ++++++
gcc/config/spu/spu.c | 19 +++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 013c0fcea4e2..b8d331be1e2a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-27 Trevor Smigiel <trevor_smigiel@playstation.sony.com>
+
+ * spu.c (spu_machine_dependent_reorg): Make sure branch label on hint
+ instruction is correct.
+
+
2009-04-27 Trevor Smigiel <trevor_smigiel@playstation.sony.com>
Allow non-constant arguments to conversion intrinsics.
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 56abdf8deb38..20d769e9e16c 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -2764,6 +2764,25 @@ spu_machine_dependent_reorg (void)
pad_bb ();
+ for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
+ if (NONJUMP_INSN_P (insn) && INSN_CODE (insn) == CODE_FOR_hbr)
+ {
+ /* Adjust the LABEL_REF in a hint when we have inserted a nop
+ between its branch label and the branch . We don't move the
+ label because GCC expects it at the beginning of the block. */
+ rtx unspec = SET_SRC (XVECEXP (PATTERN (insn), 0, 0));
+ rtx label_ref = XVECEXP (unspec, 0, 0);
+ rtx label = XEXP (label_ref, 0);
+ rtx branch;
+ int offset = 0;
+ for (branch = NEXT_INSN (label);
+ !JUMP_P (branch) && !CALL_P (branch);
+ branch = NEXT_INSN (branch))
+ if (NONJUMP_INSN_P (branch))
+ offset += get_attr_length (branch);
+ if (offset > 0)
+ XVECEXP (unspec, 0, 0) = plus_constant (label_ref, offset);
+ }
if (spu_flag_var_tracking)
{
--
GitLab