sync.md (sync_compare_and_swap<mode>, [...]): Rewrite calls to mips_output_sync_loop.

2009-08-05  David Daney  <ddaney@caviumnetworks.com>

	* gcc/config/mips/sync.md (sync_compare_and_swap<mode>,
	compare_and_swap_12, sync_add<mode>, sync_<optab>_12,
	sync_old_<optab>_12, sync_new_<optab>_12, sync_nand_12,
	sync_old_nand_12, sync_new_nand_12, sync_sub<mode>,
	sync_old_add<mode>, sync_old_sub<mode>, sync_new_add<mode>,
	sync_new_sub<mode>, sync_<optab><mode>, sync_old_<optab><mode>,
	sync_new_<optab><mode>, sync_nand<mode>, sync_old_nand<mode>,
	sync_new_nand<mode>, sync_lock_test_and_set<mode>,
	test_and_set_12): Rewrite calls to mips_output_sync_loop.
	* gcc/config/mips/mips-protos.h (mips_output_sync_loop): Make
	the prototype declaration match the definition.
	* gcc/config/mips/mips.c (mips_output_sync_loop):  Emit sync
	instructions explicitly.  Add barrier_before and operands
	parameters.
	* gcc/config/mips/mips.h (MIPS_COMPARE_AND_SWAP,
	MIPS_COMPARE_AND_SWAP_12, MIPS_SYNC_OP, MIPS_SYNC_OP_12,
	MIPS_SYNC_OLD_OP_12, MIPS_SYNC_NEW_OP_12, MIPS_SYNC_OLD_OP,
	MIPS_SYNC_NEW_OP, MIPS_SYNC_NAND, MIPS_SYNC_OLD_NAND,
	MIPS_SYNC_NEW_NAND, MIPS_SYNC_EXCHANGE,
	MIPS_SYNC_EXCHANGE_12): Remove sync instructions.

From-SVN: r150512

5 files changed, 130 insertions, 100 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aa5d192..077929d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,26 @@
+2009-08-05  David Daney  <ddaney@caviumnetworks.com>
+
+	* gcc/config/mips/sync.md (sync_compare_and_swap<mode>,
+	compare_and_swap_12, sync_add<mode>, sync_<optab>_12,
+	sync_old_<optab>_12, sync_new_<optab>_12, sync_nand_12,
+	sync_old_nand_12, sync_new_nand_12, sync_sub<mode>,
+	sync_old_add<mode>, sync_old_sub<mode>, sync_new_add<mode>,
+	sync_new_sub<mode>, sync_<optab><mode>, sync_old_<optab><mode>,
+	sync_new_<optab><mode>, sync_nand<mode>, sync_old_nand<mode>,
+	sync_new_nand<mode>, sync_lock_test_and_set<mode>,
+	test_and_set_12): Rewrite calls to mips_output_sync_loop.
+	* gcc/config/mips/mips-protos.h (mips_output_sync_loop): Make
+	the prototype declaration match the definition.
+	* gcc/config/mips/mips.c (mips_output_sync_loop):  Emit sync
+	instructions explicitly.  Add barrier_before and operands
+	parameters.
+	* gcc/config/mips/mips.h (MIPS_COMPARE_AND_SWAP,
+	MIPS_COMPARE_AND_SWAP_12, MIPS_SYNC_OP, MIPS_SYNC_OP_12,
+	MIPS_SYNC_OLD_OP_12, MIPS_SYNC_NEW_OP_12, MIPS_SYNC_OLD_OP,
+	MIPS_SYNC_NEW_OP, MIPS_SYNC_NAND, MIPS_SYNC_OLD_NAND,
+	MIPS_SYNC_NEW_NAND, MIPS_SYNC_EXCHANGE,
+	MIPS_SYNC_EXCHANGE_12): Remove sync instructions.
+
 2009-08-05  Andrew Pinski  <pinskia@gmail.com>
 
 	* tree-ssa-alias.c: Fix intervals to use [) syntax.
diff --git a/gcc/config/mips/mips-protos.h b/gcc/config/mips/mips-protos.h
index 222cb89..c96ecae 100644
--- a/gcc/config/mips/mips-protos.h
+++ b/gcc/config/mips/mips-protos.h
@@ -298,7 +298,7 @@ extern const char *mips_output_load_label (void);
 extern const char *mips_output_conditional_branch (rtx, rtx *, const char *,
 						   const char *);
 extern const char *mips_output_order_conditional_branch (rtx, rtx *, bool);
-extern const char *mips_output_sync_loop (const char *);
+extern const char *mips_output_sync_loop (bool, const char *, rtx *);
 extern const char *mips_output_division (const char *, rtx *);
 extern unsigned int mips_hard_regno_nregs (int, enum machine_mode);
 extern bool mips_linked_madd_p (rtx, rtx);
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 658d2da..ade652c 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -10750,15 +10750,23 @@ mips_output_order_conditional_branch (rtx insn, rtx *operands, bool inverted_p)
   return mips_output_conditional_branch (insn, operands, branch[1], branch[0]);
 }
 
-/* Return the assembly code for __sync_*() loop LOOP.  The loop should support
-   both normal and likely branches, using %? and %~ where appropriate.  */
+/* Return or emit the assembly code for __sync_*() loop LOOP.  The
+   loop should support both normal and likely branches, using %? and
+   %~ where appropriate.  If BARRIER_BEFORE is true a sync sequence is
+   emitted before the loop.  A sync is always emitted after the loop.
+   OPERANDS are the insn operands.  */
 
 const char *
-mips_output_sync_loop (const char *loop)
+mips_output_sync_loop (bool barrier_before,
+		       const char *loop, rtx *operands)
 {
+  if (barrier_before)
+    output_asm_insn ("sync", NULL);
   /* Use branch-likely instructions to work around the LL/SC R10000 errata.  */
   mips_branch_likely = TARGET_FIX_R10000;
-  return loop;
+  output_asm_insn (loop, operands);
+
+  return "sync";
 }
 
 /* Return the assembly code for DIV or DDIV instruction DIVISION, which has
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index e28e4c1..4ce9be3 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -3144,14 +3144,12 @@ while (0)
    and OP is the instruction that should be used to load %3 into a
    register.  */
 #define MIPS_COMPARE_AND_SWAP(SUFFIX, OP)	\
-  "%(%<%[%|sync\n"				\
-  "1:\tll" SUFFIX "\t%0,%1\n"			\
+  "%(%<%[%|1:\tll" SUFFIX "\t%0,%1\n"		\
   "\tbne\t%0,%z2,2f\n"				\
   "\t" OP "\t%@,%3\n"				\
   "\tsc" SUFFIX "\t%@,%1\n"			\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)\n"				\
+  "\tnop%-%]%>%)\n"				\
   "2:\n"
 
 /* Return an asm string that atomically:
@@ -3167,16 +3165,14 @@ while (0)
 
     OPS are the instructions needed to OR %5 with %@.  */
 #define MIPS_COMPARE_AND_SWAP_12(OPS)		\
-  "%(%<%[%|sync\n"				\
-  "1:\tll\t%0,%1\n"				\
+  "%(%<%[%|1:\tll\t%0,%1\n"			\
   "\tand\t%@,%0,%2\n"				\
   "\tbne\t%@,%z4,2f\n"				\
   "\tand\t%@,%0,%3\n"				\
   OPS						\
   "\tsc\t%@,%1\n"				\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)\n"				\
+  "\tnop%-%]%>%)\n"				\
   "2:\n"
 
 #define MIPS_COMPARE_AND_SWAP_12_ZERO_OP ""
@@ -3190,13 +3186,11 @@ while (0)
    SUFFIX is the suffix that should be added to "ll" and "sc"
    instructions.  */
 #define MIPS_SYNC_OP(SUFFIX, INSN)		\
-  "%(%<%[%|sync\n"				\
-  "1:\tll" SUFFIX "\t%@,%0\n"			\
+  "%(%<%[%|1:\tll" SUFFIX "\t%@,%0\n"		\
   "\t" INSN "\t%@,%@,%1\n"			\
   "\tsc" SUFFIX "\t%@,%0\n"			\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 /* Return an asm string that atomically:
 
@@ -3213,16 +3207,14 @@ while (0)
     INSN is already correctly masked -- it instead performs a bitwise
     not.  */
 #define MIPS_SYNC_OP_12(INSN, AND_OP)		\
-  "%(%<%[%|sync\n"				\
-  "1:\tll\t%4,%0\n"				\
+  "%(%<%[%|1:\tll\t%4,%0\n"			\
   "\tand\t%@,%4,%2\n"				\
   "\t" INSN "\t%4,%4,%z3\n"			\
   AND_OP					\
   "\tor\t%@,%@,%4\n"				\
   "\tsc\t%@,%0\n"				\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 #define MIPS_SYNC_OP_12_AND "\tand\t%4,%4,%1\n"
 #define MIPS_SYNC_OP_12_XOR "\txor\t%4,%4,%1\n"
@@ -3244,16 +3236,14 @@ while (0)
     INSN is already correctly masked -- it instead performs a bitwise
     not.  */
 #define MIPS_SYNC_OLD_OP_12(INSN, AND_OP)	\
-  "%(%<%[%|sync\n"				\
-  "1:\tll\t%0,%1\n"				\
+  "%(%<%[%|1:\tll\t%0,%1\n"			\
   "\tand\t%@,%0,%3\n"				\
   "\t" INSN "\t%5,%0,%z4\n"			\
   AND_OP					\
   "\tor\t%@,%@,%5\n"				\
   "\tsc\t%@,%1\n"				\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 #define MIPS_SYNC_OLD_OP_12_AND "\tand\t%5,%5,%2\n"
 #define MIPS_SYNC_OLD_OP_12_XOR "\txor\t%5,%5,%2\n"
@@ -3273,16 +3263,14 @@ while (0)
     INSN is already correctly masked -- it instead performs a bitwise
     not.  */
 #define MIPS_SYNC_NEW_OP_12(INSN, AND_OP)	\
-  "%(%<%[%|sync\n"				\
-  "1:\tll\t%0,%1\n"				\
+  "%(%<%[%|1:\tll\t%0,%1\n"				\
   "\tand\t%@,%0,%3\n"				\
   "\t" INSN "\t%0,%0,%z4\n"			\
   AND_OP					\
   "\tor\t%@,%@,%0\n"				\
   "\tsc\t%@,%1\n"				\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 #define MIPS_SYNC_NEW_OP_12_AND "\tand\t%0,%0,%2\n"
 #define MIPS_SYNC_NEW_OP_12_XOR "\txor\t%0,%0,%2\n"
@@ -3296,13 +3284,11 @@ while (0)
    SUFFIX is the suffix that should be added to "ll" and "sc"
    instructions.  */
 #define MIPS_SYNC_OLD_OP(SUFFIX, INSN)		\
-  "%(%<%[%|sync\n"				\
-  "1:\tll" SUFFIX "\t%0,%1\n"			\
+  "%(%<%[%|1:\tll" SUFFIX "\t%0,%1\n"		\
   "\t" INSN "\t%@,%0,%2\n"			\
   "\tsc" SUFFIX "\t%@,%1\n"			\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 /* Return an asm string that atomically:
 
@@ -3313,13 +3299,11 @@ while (0)
    SUFFIX is the suffix that should be added to "ll" and "sc"
    instructions.  */
 #define MIPS_SYNC_NEW_OP(SUFFIX, INSN)		\
-  "%(%<%[%|sync\n"				\
-  "1:\tll" SUFFIX "\t%0,%1\n"			\
+  "%(%<%[%|1:\tll" SUFFIX "\t%0,%1\n"		\
   "\t" INSN "\t%@,%0,%2\n"			\
   "\tsc" SUFFIX "\t%@,%1\n"			\
   "\tbeq%?\t%@,%.,1b%~\n"			\
-  "\t" INSN "\t%0,%0,%2\n"			\
-  "\tsync%-%]%>%)"
+  "\t" INSN "\t%0,%0,%2%-%]%>%)"
 
 /* Return an asm string that atomically:
 
@@ -3329,14 +3313,12 @@ while (0)
    instructions.  INSN is the and instruction needed to and a register
    with %2.  */
 #define MIPS_SYNC_NAND(SUFFIX, INSN)		\
-  "%(%<%[%|sync\n"				\
-  "1:\tll" SUFFIX "\t%@,%0\n"			\
+  "%(%<%[%|1:\tll" SUFFIX "\t%@,%0\n"		\
   "\t" INSN "\t%@,%@,%1\n"			\
   "\tnor\t%@,%@,%.\n"				\
   "\tsc" SUFFIX "\t%@,%0\n"			\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 /* Return an asm string that atomically:
 
@@ -3348,14 +3330,12 @@ while (0)
    instructions.  INSN is the and instruction needed to and a register
    with %2.  */
 #define MIPS_SYNC_OLD_NAND(SUFFIX, INSN)	\
-  "%(%<%[%|sync\n"				\
-  "1:\tll" SUFFIX "\t%0,%1\n"			\
+  "%(%<%[%|1:\tll" SUFFIX "\t%0,%1\n"			\
   "\t" INSN "\t%@,%0,%2\n"			\
   "\tnor\t%@,%@,%.\n"				\
   "\tsc" SUFFIX "\t%@,%1\n"			\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 /* Return an asm string that atomically:
 
@@ -3367,14 +3347,12 @@ while (0)
    instructions.  INSN is the and instruction needed to and a register
    with %2.  */
 #define MIPS_SYNC_NEW_NAND(SUFFIX, INSN)	\
-  "%(%<%[%|sync\n"				\
-  "1:\tll" SUFFIX "\t%0,%1\n"			\
+  "%(%<%[%|1:\tll" SUFFIX "\t%0,%1\n"			\
   "\t" INSN "\t%0,%0,%2\n"			\
   "\tnor\t%@,%0,%.\n"				\
   "\tsc" SUFFIX "\t%@,%1\n"			\
   "\tbeq%?\t%@,%.,1b%~\n"			\
-  "\tnor\t%0,%0,%.\n"				\
-  "\tsync%-%]%>%)"
+  "\tnor\t%0,%0,%.%-%]%>%)"
 
 /* Return an asm string that atomically:
 
@@ -3391,8 +3369,7 @@ while (0)
   "\t" OP "\t%@,%2\n"				\
   "\tsc" SUFFIX "\t%@,%1\n"			\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 /* Return an asm string that atomically:
 
@@ -3415,8 +3392,7 @@ while (0)
   OPS						\
   "\tsc\t%@,%1\n"				\
   "\tbeq%?\t%@,%.,1b\n"				\
-  "\tnop\n"					\
-  "\tsync%-%]%>%)"
+  "\tnop%-%]%>%)"
 
 #define MIPS_SYNC_EXCHANGE_12_ZERO_OP ""
 #define MIPS_SYNC_EXCHANGE_12_NONZERO_OP "\tor\t%@,%@,%4\n"
diff --git a/gcc/config/mips/sync.md b/gcc/config/mips/sync.md
index cd3fdc6..affb3fa 100644
--- a/gcc/config/mips/sync.md
+++ b/gcc/config/mips/sync.md
@@ -51,10 +51,12 @@
 	 UNSPEC_COMPARE_AND_SWAP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_COMPARE_AND_SWAP ("<d>", "li"));
+    loop = MIPS_COMPARE_AND_SWAP ("<d>", "li");
   else
-    return mips_output_sync_loop (MIPS_COMPARE_AND_SWAP ("<d>", "move"));
+    loop = MIPS_COMPARE_AND_SWAP ("<d>", "move");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "32")])
 
@@ -84,12 +86,12 @@
 			    UNSPEC_COMPARE_AND_SWAP_12))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return (mips_output_sync_loop
-	    (MIPS_COMPARE_AND_SWAP_12 (MIPS_COMPARE_AND_SWAP_12_NONZERO_OP)));
+    loop = MIPS_COMPARE_AND_SWAP_12 (MIPS_COMPARE_AND_SWAP_12_NONZERO_OP);
   else
-    return (mips_output_sync_loop
-	    (MIPS_COMPARE_AND_SWAP_12 (MIPS_COMPARE_AND_SWAP_12_ZERO_OP)));
+    loop = MIPS_COMPARE_AND_SWAP_12 (MIPS_COMPARE_AND_SWAP_12_ZERO_OP);
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "40,36")])
 
@@ -101,10 +103,12 @@
 	  UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_OP ("<d>", "<d>addiu"));
+    loop = MIPS_SYNC_OP ("<d>", "<d>addiu");
   else
-    return mips_output_sync_loop (MIPS_SYNC_OP ("<d>", "<d>addu"));
+    loop = MIPS_SYNC_OP ("<d>", "<d>addu");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -135,8 +139,8 @@
    (clobber (match_scratch:SI 4 "=&d"))]
   "GENERATE_LL_SC"
 {
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_OP_12 ("<insn>", MIPS_SYNC_OP_12_AND)));
+  const char *loop = MIPS_SYNC_OP_12 ("<insn>", MIPS_SYNC_OP_12_AND);
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "40")])
 
@@ -172,8 +176,8 @@
    (clobber (match_scratch:SI 5 "=&d"))]
   "GENERATE_LL_SC"
 {
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_OLD_OP_12 ("<insn>", MIPS_SYNC_OLD_OP_12_AND)));
+  const char *loop = MIPS_SYNC_OLD_OP_12 ("<insn>", MIPS_SYNC_OLD_OP_12_AND);
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "40")])
 
@@ -214,8 +218,8 @@
 	   (match_dup 4)] UNSPEC_SYNC_NEW_OP_12))]
   "GENERATE_LL_SC"
 {
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_NEW_OP_12 ("<insn>", MIPS_SYNC_NEW_OP_12_AND)));
+  const char *loop = MIPS_SYNC_NEW_OP_12 ("<insn>", MIPS_SYNC_NEW_OP_12_AND);
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "40")])
 
@@ -246,8 +250,8 @@
    (clobber (match_scratch:SI 4 "=&d"))]
   "GENERATE_LL_SC"
 {
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_OP_12 ("and", MIPS_SYNC_OP_12_XOR)));
+  const char *loop = MIPS_SYNC_OP_12 ("and", MIPS_SYNC_OP_12_XOR);
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "40")])
 
@@ -281,8 +285,8 @@
    (clobber (match_scratch:SI 5 "=&d"))]
   "GENERATE_LL_SC"
 {
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_OLD_OP_12 ("and", MIPS_SYNC_OLD_OP_12_XOR)));
+  const char *loop = MIPS_SYNC_OLD_OP_12 ("and", MIPS_SYNC_OLD_OP_12_XOR);
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "40")])
 
@@ -321,8 +325,8 @@
 	   (match_dup 4)] UNSPEC_SYNC_NEW_OP_12))]
   "GENERATE_LL_SC"
 {
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_NEW_OP_12 ("and", MIPS_SYNC_NEW_OP_12_XOR)));
+  const char *loop = MIPS_SYNC_NEW_OP_12 ("and", MIPS_SYNC_NEW_OP_12_XOR);
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "40")])
 
@@ -334,7 +338,8 @@
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
-  return mips_output_sync_loop (MIPS_SYNC_OP ("<d>", "<d>subu"));
+  const char *loop = MIPS_SYNC_OP ("<d>", "<d>subu");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -348,10 +353,12 @@
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_OLD_OP ("<d>", "<d>addiu"));
+    loop = MIPS_SYNC_OLD_OP ("<d>", "<d>addiu");
   else
-    return mips_output_sync_loop (MIPS_SYNC_OLD_OP ("<d>", "<d>addu"));
+    loop = MIPS_SYNC_OLD_OP ("<d>", "<d>addu");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -365,7 +372,8 @@
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
-  return mips_output_sync_loop (MIPS_SYNC_OLD_OP ("<d>", "<d>subu"));
+  const char *loop = MIPS_SYNC_OLD_OP ("<d>", "<d>subu");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -379,10 +387,12 @@
 	 UNSPEC_SYNC_NEW_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_NEW_OP ("<d>", "<d>addiu"));
+    loop = MIPS_SYNC_NEW_OP ("<d>", "<d>addiu");
   else
-    return mips_output_sync_loop (MIPS_SYNC_NEW_OP ("<d>", "<d>addu"));
+    loop = MIPS_SYNC_NEW_OP ("<d>", "<d>addu");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -396,7 +406,8 @@
 	 UNSPEC_SYNC_NEW_OP))]
   "GENERATE_LL_SC"
 {
-  return mips_output_sync_loop (MIPS_SYNC_NEW_OP ("<d>", "<d>subu"));
+  const char *loop = MIPS_SYNC_NEW_OP ("<d>", "<d>subu");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -408,10 +419,12 @@
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_OP ("<d>", "<immediate_insn>"));
+    loop = MIPS_SYNC_OP ("<d>", "<immediate_insn>");
   else
-    return mips_output_sync_loop (MIPS_SYNC_OP ("<d>", "<insn>"));
+    loop = MIPS_SYNC_OP ("<d>", "<insn>");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -425,11 +438,12 @@
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_OLD_OP ("<d>", "<immediate_insn>")));
+    loop = MIPS_SYNC_OLD_OP ("<d>", "<immediate_insn>");
   else
-    return mips_output_sync_loop (MIPS_SYNC_OLD_OP ("<d>", "<insn>"));
+    loop = MIPS_SYNC_OLD_OP ("<d>", "<insn>");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -443,11 +457,12 @@
 	 UNSPEC_SYNC_NEW_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_NEW_OP ("<d>", "<immediate_insn>")));
+    loop = MIPS_SYNC_NEW_OP ("<d>", "<immediate_insn>");
   else
-    return mips_output_sync_loop (MIPS_SYNC_NEW_OP ("<d>", "<insn>"));
+    loop = MIPS_SYNC_NEW_OP ("<d>", "<insn>");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "28")])
 
@@ -457,10 +472,12 @@
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_NAND ("<d>", "andi"));
+    loop = MIPS_SYNC_NAND ("<d>", "andi");
   else
-    return mips_output_sync_loop (MIPS_SYNC_NAND ("<d>", "and"));
+    loop = MIPS_SYNC_NAND ("<d>", "and");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "32")])
 
@@ -472,10 +489,12 @@
 	 UNSPEC_SYNC_OLD_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_OLD_NAND ("<d>", "andi"));
+    loop = MIPS_SYNC_OLD_NAND ("<d>", "andi");
   else
-    return mips_output_sync_loop (MIPS_SYNC_OLD_NAND ("<d>", "and"));
+    loop = MIPS_SYNC_OLD_NAND ("<d>", "and");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "32")])
 
@@ -487,10 +506,12 @@
 	 UNSPEC_SYNC_NEW_OP))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_NEW_NAND ("<d>", "andi"));
+    loop = MIPS_SYNC_NEW_NAND ("<d>", "andi");
   else
-    return mips_output_sync_loop (MIPS_SYNC_NEW_NAND ("<d>", "and"));
+    loop = MIPS_SYNC_NEW_NAND ("<d>", "and");
+  return mips_output_sync_loop (true, loop, operands);
 }
   [(set_attr "length" "32")])
 
@@ -502,10 +523,12 @@
 	 UNSPEC_SYNC_EXCHANGE))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return mips_output_sync_loop (MIPS_SYNC_EXCHANGE ("<d>", "li"));
+    loop = MIPS_SYNC_EXCHANGE ("<d>", "li");
   else
-    return mips_output_sync_loop (MIPS_SYNC_EXCHANGE ("<d>", "move"));
+    loop = MIPS_SYNC_EXCHANGE ("<d>", "move");
+  return mips_output_sync_loop (false, loop, operands);
 }
   [(set_attr "length" "24")])
 
@@ -532,11 +555,11 @@
 	  UNSPEC_SYNC_EXCHANGE_12))]
   "GENERATE_LL_SC"
 {
+  const char *loop;
   if (which_alternative == 0)
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_EXCHANGE_12 (MIPS_SYNC_EXCHANGE_12_NONZERO_OP)));
+    loop = MIPS_SYNC_EXCHANGE_12 (MIPS_SYNC_EXCHANGE_12_NONZERO_OP);
   else
-    return (mips_output_sync_loop
-	    (MIPS_SYNC_EXCHANGE_12 (MIPS_SYNC_EXCHANGE_12_ZERO_OP)));
+    loop = MIPS_SYNC_EXCHANGE_12 (MIPS_SYNC_EXCHANGE_12_ZERO_OP);
+  return mips_output_sync_loop (false, loop, operands);
 }
   [(set_attr "length" "28,24")])