Merge branch 'master' into v2.1

2015-01-05 00:07:14 +01:00
parent 7bdadeb3c6 4d9e8e245a
commit fcae87e315
2 changed files with 4 additions and 6 deletions
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -4649,8 +4649,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
    |  jnz <4
    |  movzx RA, PC_RA
    |  not RAa
-    |  lea RA, [BASE+RA*8]
-    |  mov LFUNC:KBASE, [RA-8]		// Need to prepare KBASE.
+    |  mov LFUNC:KBASE, [BASE+RA*8-8]	// Need to prepare KBASE.
    |  mov KBASE, LFUNC:KBASE->pc
    |  mov KBASE, [KBASE+PC2PROTO(k)]
    |  jmp <4