DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lua_cpcall(). Duplicate save corrupted C frame chain.

Browse Source
This commit is contained in:
Mike Pall
2010-08-06 14:34:54 +02:00
parent 0a3329c581
commit 3d81368331
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/buildvm_x86.dasc
View File

@@ -650,7 +650,6 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
| mov RA, INARG_BASE // Caveat: overlaps SAVE_CFRAME!
|.endif
|
|2: // Entry point for vm_cpcall below (RA = base, RB = L, PC = ftype).
| mov KBASEa, L:RB->cframe // Add our C frame to cframe chain.
| mov SAVE_CFRAME, KBASEa
| mov SAVE_PC, L:RB // Any value outside of bytecode is ok.
@@ -660,6 +659,7 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
| mov L:RB->cframe, esp
|.endif
|
|2: // Entry point for vm_cpcall below (RA = base, RB = L, PC = ftype).
| mov DISPATCH, L:RB->glref // Setup pointer to dispatch table.
| add DISPATCH, GG_G2DISP
|