|
 |
006bc1 |
From 9c1b637898f38dd4606da08ba1a82a174c3e64b6 Mon Sep 17 00:00:00 2001
|
|
 |
006bc1 |
From: Mike Pall <mike>
|
|
 |
006bc1 |
Date: Sun, 14 Oct 2018 15:12:59 +0200
|
|
 |
006bc1 |
Subject: [PATCH 51/72] MIPS/MIPS64: Fix TSETR barrier (again).
|
|
 |
006bc1 |
|
|
 |
006bc1 |
---
|
|
 |
006bc1 |
src/vm_mips.dasc | 2 +-
|
|
 |
006bc1 |
src/vm_mips64.dasc | 2 +-
|
|
 |
006bc1 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
 |
006bc1 |
|
|
 |
006bc1 |
diff --git a/src/vm_mips.dasc b/src/vm_mips.dasc
|
|
 |
006bc1 |
index 1afd611..f324812 100644
|
|
 |
006bc1 |
--- a/src/vm_mips.dasc
|
|
 |
006bc1 |
+++ b/src/vm_mips.dasc
|
|
 |
006bc1 |
@@ -4317,7 +4317,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
|
|
 |
006bc1 |
| ins_next2
|
|
 |
006bc1 |
|
|
|
 |
006bc1 |
|7: // Possible table write barrier for the value. Skip valiswhite check.
|
|
 |
006bc1 |
- | barrierback TAB:CARG2, TMP3, TMP0, <2
|
|
 |
006bc1 |
+ | barrierback TAB:CARG2, TMP3, CRET1, <2
|
|
 |
006bc1 |
break;
|
|
 |
006bc1 |
|
|
 |
006bc1 |
case BC_TSETM:
|
|
 |
006bc1 |
diff --git a/src/vm_mips64.dasc b/src/vm_mips64.dasc
|
|
 |
006bc1 |
index 0a3f8e5..1682c81 100644
|
|
 |
006bc1 |
--- a/src/vm_mips64.dasc
|
|
 |
006bc1 |
+++ b/src/vm_mips64.dasc
|
|
 |
006bc1 |
@@ -4263,7 +4263,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
|
|
 |
006bc1 |
| ins_next2
|
|
 |
006bc1 |
|
|
|
 |
006bc1 |
|7: // Possible table write barrier for the value. Skip valiswhite check.
|
|
 |
006bc1 |
- | barrierback TAB:CARG2, TMP3, TMP0, <2
|
|
 |
006bc1 |
+ | barrierback TAB:CARG2, TMP3, CRET1, <2
|
|
 |
006bc1 |
break;
|
|
 |
006bc1 |
|
|
 |
006bc1 |
case BC_TSETM:
|
|
 |
006bc1 |
--
|
|
 |
006bc1 |
2.20.1
|
|
 |
006bc1 |
|