From ca2b923026fb6ce2cf40bc2527d8234ef7263ea4 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 25 Oct 2011 12:41:38 +0200
Subject: [PATCH] PPC/e500: Fix write barrier in USETS.

---
 src/buildvm_ppcspe.dasc | 3 +--
 src/buildvm_ppcspe.h    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/buildvm_ppcspe.dasc b/src/buildvm_ppcspe.dasc
index f96f7fb6..3ec36f76 100644
--- a/src/buildvm_ppcspe.dasc
+++ b/src/buildvm_ppcspe.dasc
@@ -2549,7 +2549,6 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     break;
   case BC_USETS:
     |  // RA = uvnum*8, RD = str_const*8 (~)
-    |  ins_next1
     |  lwz LFUNC:RB, FRAME_FUNC(BASE)
     |   srwi TMP1, RD, 1
     |    srwi RA, RA, 1
@@ -2566,7 +2565,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |   evstdd STR:TMP1, 0(CARG2)
     |  bne >2
     |1:
-    |  ins_next2
+    |  ins_next
     |
     |2:  // Check if string is white and ensure upvalue is closed.
     |  andi. TMP3, TMP3, LJ_GC_WHITES	// iswhite(str)
diff --git a/src/buildvm_ppcspe.h b/src/buildvm_ppcspe.h
index 78d49377..32571ebe 100644
--- a/src/buildvm_ppcspe.h
+++ b/src/buildvm_ppcspe.h
@@ -3575,8 +3575,6 @@ static const unsigned int build_actionlist[4995] = {
 0x48000000,
 0x0005000b,
 0x00000000,
-0x80f00000,
-0x3a100004,
 0x814efffc,
 0x5588007e,
 0x000900ab,
@@ -3602,6 +3600,8 @@ static const unsigned int build_actionlist[4995] = {
 0x40820000,
 0x00050802,
 0x0006000b,
+0x80f00000,
+0x3a100004,
 0x54e815ba,
 0x54ea5d78,
 0x54ec9b78,