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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2014-01-19 13:12:23 +01:00
commit 4e78b9bb12
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lj_snap.c
View File

@ -709,7 +709,7 @@ static void snap_unsink(jit_State *J, GCtrace *T, ExitState *ex,
ir->o == IR_CNEW || ir->o == IR_CNEWI); ir->o == IR_CNEW || ir->o == IR_CNEWI);
#if LJ_HASFFI #if LJ_HASFFI
if (ir->o == IR_CNEW || ir->o == IR_CNEWI) { if (ir->o == IR_CNEW || ir->o == IR_CNEWI) {
CTState *cts = ctype_ctsG(J2G(J)); CTState *cts = ctype_cts(J->L);
CTypeID id = (CTypeID)T->ir[ir->op1].i; CTypeID id = (CTypeID)T->ir[ir->op1].i;
CTSize sz = lj_ctype_size(cts, id); CTSize sz = lj_ctype_size(cts, id);
GCcdata *cd = lj_cdata_new(cts, id, sz); GCcdata *cd = lj_cdata_new(cts, id, sz);

4
src/vm_x86.dasc
View File

@ -5950,12 +5950,12 @@ static void emit_asm_debug(BuildCtx *ctx)
#if LJ_64 #if LJ_64
"\t.byte 0xe\n\t.byte 16\n" /* def_cfa_offset */ "\t.byte 0xe\n\t.byte 16\n" /* def_cfa_offset */
"\t.byte 0x86\n\t.byte 0x2\n" /* offset rbp */ "\t.byte 0x86\n\t.byte 0x2\n" /* offset rbp */
"\t.byte 0xd\n\t.uleb128 0x6\n" /* def_cfa_register rbp */ "\t.byte 0xd\n\t.byte 0x6\n" /* def_cfa_register rbp */
"\t.byte 0x83\n\t.byte 0x3\n" /* offset rbx */ "\t.byte 0x83\n\t.byte 0x3\n" /* offset rbx */
#else #else
"\t.byte 0xe\n\t.byte 8\n" /* def_cfa_offset */ "\t.byte 0xe\n\t.byte 8\n" /* def_cfa_offset */
"\t.byte 0x84\n\t.byte 0x2\n" /* offset ebp (4 for MACH-O)*/ "\t.byte 0x84\n\t.byte 0x2\n" /* offset ebp (4 for MACH-O)*/
"\t.byte 0xd\n\t.uleb128 0x4\n" /* def_cfa_register ebp */ "\t.byte 0xd\n\t.byte 0x4\n" /* def_cfa_register ebp */
"\t.byte 0x83\n\t.byte 0x3\n" /* offset ebx */ "\t.byte 0x83\n\t.byte 0x3\n" /* offset ebx */
#endif #endif
"\t.align " BSZPTR "\n" "\t.align " BSZPTR "\n"