summaryrefslogtreecommitdiff
path: root/dynasm
diff options
context:
space:
mode:
authorMike Pall <mike>2011-07-02 00:43:19 +0200
committerMike Pall <mike>2011-07-02 00:43:19 +0200
commitfe1f9137a92ee3c0e89e2f0a0b0abbeddcaf81fd (patch)
tree54ee451f720c67e5dcd6f16cab7b6f25d1c304ed /dynasm
parent8ccf89718c2aedabcc5009db1d372574e802966e (diff)
downloadluajit2-fe1f9137a92ee3c0e89e2f0a0b0abbeddcaf81fd.tar.gz
PPC: Fix range check for scaled immediates in DynASM.
Diffstat (limited to 'dynasm')
-rw-r--r--dynasm/dasm_ppc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h
index e928ffed..1c8580fb 100644
--- a/dynasm/dasm_ppc.h
+++ b/dynasm/dasm_ppc.h
@@ -233,6 +233,9 @@ void dasm_put(Dst_DECL, int start, ...)
case DASM_IMM:
#ifdef DASM_CHECKS
CK((n & ((1<<((ins>>10)&31))-1)) == 0, RANGE_I);
+#endif
+ n >>= ((ins>>10)&31);
+#ifdef DASM_CHECKS
if (ins & 0x8000)
CK(((n + (1<<(((ins>>5)&31)-1)))>>((ins>>5)&31)) == 0, RANGE_I);
else
@@ -360,7 +363,7 @@ int dasm_encode(Dst_DECL, void *buffer)
break;
case DASM_LABEL_PC: break;
case DASM_IMM:
- cp[-1] |= ((n>>((ins>>10)&31)) & ((1<<((ins>>5)&31))-1)) << (ins&31);
+ cp[-1] |= (n & ((1<<((ins>>5)&31))-1)) << (ins&31);
break;
default: *cp++ = ins; break;
}