From 6d854c04fe7fba94307ced6f4ad5522c8779a415 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 14 Sep 2011 15:52:21 +0200
Subject: [PATCH] ARM: Fix GC barrier for TSETM.

---
 src/buildvm_arm.dasc | 2 +-
 src/buildvm_arm.h    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/buildvm_arm.dasc b/src/buildvm_arm.dasc
index 9b6b5aed..9b40ad18 100644
--- a/src/buildvm_arm.dasc
+++ b/src/buildvm_arm.dasc
@@ -3321,7 +3321,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |  b <1
     |
     |7:  // Possible table write barrier for any value. Skip valiswhite check.
-    |  barrierback TAB:RB, CARG1, CARG2
+    |  barrierback TAB:CARG2, CARG1, CARG3
     |  b <4
     break;
 
diff --git a/src/buildvm_arm.h b/src/buildvm_arm.h
index b450f5df..0c2d9f39 100644
--- a/src/buildvm_arm.h
+++ b/src/buildvm_arm.h
@@ -4944,15 +4944,15 @@ static const unsigned int build_actionlist[5706] = {
 0xea000000,
 0x0005000b,
 0x00060011,
-0xe5171000,
+0xe5172000,
 0x000d8180,
 0xe3c00000,
 0x000a0000,
-0xe507c000,
+0xe5071000,
 0x000d8180,
-0xe54c0000,
+0xe5410000,
 0x000d8180,
-0xe50c1000,
+0xe5012000,
 0x000d8180,
 0xea000000,
 0x0005000e,
-- 
2.11.4.GIT