gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix return from pcall within active hook.

Browse Source
This commit is contained in:
Mike Pall 2010-08-07 20:26:00 +02:00
parent 44de7eb48c
commit be19218a6c
4 changed files with 2989 additions and 2978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2268
src/buildvm_x64.h
View File

File diff suppressed because it is too large Load Diff

2272
src/buildvm_x64win.h
View File

File diff suppressed because it is too large Load Diff

22
src/buildvm_x86.dasc
View File

@ -437,8 +437,9 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
| |
|->vm_return: |->vm_return:
| // BASE = base, RA = resultofs, RD = nresults+1 (= MULTRES), PC = return | // BASE = base, RA = resultofs, RD = nresults+1 (= MULTRES), PC = return
| test PC, FRAME_C | xor PC, FRAME_C
| jz ->vm_returnp | test PC, FRAME_TYPE
| jnz ->vm_returnp
| |
| // Return to C. | // Return to C.
| set_vmstate C | set_vmstate C
@ -4412,12 +4413,16 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
| jmp <4 | jmp <4
| |
|7: // Tailcall from a vararg function. |7: // Tailcall from a vararg function.
| jnp <1 // Vararg frame below? | sub PC, FRAME_VARG
| and PC, -8 | test PC, FRAME_TYPEP
| jnz >8 // Vararg frame below?
| sub BASE, PC // Need to relocate BASE/KBASE down. | sub BASE, PC // Need to relocate BASE/KBASE down.
| mov KBASE, BASE | mov KBASE, BASE
| mov PC, [BASE-4] | mov PC, [BASE-4]
| jmp <1 | jmp <1
|8:
| add PC, FRAME_VARG
| jmp <1
break; break;
case BC_ITERC: case BC_ITERC:
@ -4587,12 +4592,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
| jmp <5 | jmp <5
| |
|7: // Non-standard return case. |7: // Non-standard return case.
| jnp ->vm_return | lea RB, [PC-FRAME_VARG]
| test RB, FRAME_TYPEP
| jnz ->vm_return
| // Return from vararg function: relocate BASE down and RA up. | // Return from vararg function: relocate BASE down and RA up.
| and PC, -8 | sub BASE, RB
| sub BASE, PC
if (op != BC_RET0) { if (op != BC_RET0) {
| add RA, PC | add RA, RB
} }
| jmp <1 | jmp <1
break; break;

1425
src/buildvm_x86.h
View File

File diff suppressed because it is too large Load Diff