diff options
author | Mike Pall <mike> | 2011-10-25 12:41:38 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2011-10-25 12:42:13 +0200 |
commit | ca2b923026fb6ce2cf40bc2527d8234ef7263ea4 (patch) | |
tree | 66ee8539306c177db878f940236ba834da15033e /src | |
parent | 9df9c7ef730c6af4c3b3f137f8070be29a9bd946 (diff) | |
download | luajit-ca2b923026fb6ce2cf40bc2527d8234ef7263ea4.tar.gz luajit-ca2b923026fb6ce2cf40bc2527d8234ef7263ea4.tar.bz2 luajit-ca2b923026fb6ce2cf40bc2527d8234ef7263ea4.zip |
PPC/e500: Fix write barrier in USETS.
Diffstat (limited to 'src')
-rw-r--r-- | src/buildvm_ppcspe.dasc | 3 | ||||
-rw-r--r-- | 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) | |||
2549 | break; | 2549 | break; |
2550 | case BC_USETS: | 2550 | case BC_USETS: |
2551 | | // RA = uvnum*8, RD = str_const*8 (~) | 2551 | | // RA = uvnum*8, RD = str_const*8 (~) |
2552 | | ins_next1 | ||
2553 | | lwz LFUNC:RB, FRAME_FUNC(BASE) | 2552 | | lwz LFUNC:RB, FRAME_FUNC(BASE) |
2554 | | srwi TMP1, RD, 1 | 2553 | | srwi TMP1, RD, 1 |
2555 | | srwi RA, RA, 1 | 2554 | | srwi RA, RA, 1 |
@@ -2566,7 +2565,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
2566 | | evstdd STR:TMP1, 0(CARG2) | 2565 | | evstdd STR:TMP1, 0(CARG2) |
2567 | | bne >2 | 2566 | | bne >2 |
2568 | |1: | 2567 | |1: |
2569 | | ins_next2 | 2568 | | ins_next |
2570 | | | 2569 | | |
2571 | |2: // Check if string is white and ensure upvalue is closed. | 2570 | |2: // Check if string is white and ensure upvalue is closed. |
2572 | | andi. TMP3, TMP3, LJ_GC_WHITES // iswhite(str) | 2571 | | 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] = { | |||
3575 | 0x48000000, | 3575 | 0x48000000, |
3576 | 0x0005000b, | 3576 | 0x0005000b, |
3577 | 0x00000000, | 3577 | 0x00000000, |
3578 | 0x80f00000, | ||
3579 | 0x3a100004, | ||
3580 | 0x814efffc, | 3578 | 0x814efffc, |
3581 | 0x5588007e, | 3579 | 0x5588007e, |
3582 | 0x000900ab, | 3580 | 0x000900ab, |
@@ -3602,6 +3600,8 @@ static const unsigned int build_actionlist[4995] = { | |||
3602 | 0x40820000, | 3600 | 0x40820000, |
3603 | 0x00050802, | 3601 | 0x00050802, |
3604 | 0x0006000b, | 3602 | 0x0006000b, |
3603 | 0x80f00000, | ||
3604 | 0x3a100004, | ||
3605 | 0x54e815ba, | 3605 | 0x54e815ba, |
3606 | 0x54ea5d78, | 3606 | 0x54ea5d78, |
3607 | 0x54ec9b78, | 3607 | 0x54ec9b78, |