diff options
| author | Mike Pall <mike> | 2015-01-05 00:07:14 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-01-05 00:07:27 +0100 |
| commit | fcae87e315ad8216e7237d524d41355baa8516b9 (patch) | |
| tree | f56bc66f59ace7b6419b9405f351c8f1df52e6a7 /src/vm_x86.dasc | |
| parent | 7bdadeb3c64ac0125275c8ee94181746103f2988 (diff) | |
| parent | 4d9e8e245a96b2ef30c9ec34ab1c98bca3dcccb8 (diff) | |
| download | luajit-fcae87e315ad8216e7237d524d41355baa8516b9.tar.gz luajit-fcae87e315ad8216e7237d524d41355baa8516b9.tar.bz2 luajit-fcae87e315ad8216e7237d524d41355baa8516b9.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/vm_x86.dasc')
| -rw-r--r-- | src/vm_x86.dasc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index 7b5abdd5..777985a4 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc | |||
| @@ -4649,8 +4649,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
| 4649 | | jnz <4 | 4649 | | jnz <4 |
| 4650 | | movzx RA, PC_RA | 4650 | | movzx RA, PC_RA |
| 4651 | | not RAa | 4651 | | not RAa |
| 4652 | | lea RA, [BASE+RA*8] | 4652 | | mov LFUNC:KBASE, [BASE+RA*8-8] // Need to prepare KBASE. |
| 4653 | | mov LFUNC:KBASE, [RA-8] // Need to prepare KBASE. | ||
| 4654 | | mov KBASE, LFUNC:KBASE->pc | 4653 | | mov KBASE, LFUNC:KBASE->pc |
| 4655 | | mov KBASE, [KBASE+PC2PROTO(k)] | 4654 | | mov KBASE, [KBASE+PC2PROTO(k)] |
| 4656 | | jmp <4 | 4655 | | jmp <4 |