diff options
-rw-r--r-- | src/lj_snap.c | 2 | ||||
-rw-r--r-- | src/vm_x86.dasc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_snap.c b/src/lj_snap.c index 4ca8cb15..cc498c89 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c | |||
@@ -709,7 +709,7 @@ static void snap_unsink(jit_State *J, GCtrace *T, ExitState *ex, | |||
709 | ir->o == IR_CNEW || ir->o == IR_CNEWI); | 709 | ir->o == IR_CNEW || ir->o == IR_CNEWI); |
710 | #if LJ_HASFFI | 710 | #if LJ_HASFFI |
711 | if (ir->o == IR_CNEW || ir->o == IR_CNEWI) { | 711 | if (ir->o == IR_CNEW || ir->o == IR_CNEWI) { |
712 | CTState *cts = ctype_ctsG(J2G(J)); | 712 | CTState *cts = ctype_cts(J->L); |
713 | CTypeID id = (CTypeID)T->ir[ir->op1].i; | 713 | CTypeID id = (CTypeID)T->ir[ir->op1].i; |
714 | CTSize sz = lj_ctype_size(cts, id); | 714 | CTSize sz = lj_ctype_size(cts, id); |
715 | GCcdata *cd = lj_cdata_new(cts, id, sz); | 715 | GCcdata *cd = lj_cdata_new(cts, id, sz); |
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index bae85bdf..bbe341ff 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc | |||
@@ -5950,12 +5950,12 @@ static void emit_asm_debug(BuildCtx *ctx) | |||
5950 | #if LJ_64 | 5950 | #if LJ_64 |
5951 | "\t.byte 0xe\n\t.byte 16\n" /* def_cfa_offset */ | 5951 | "\t.byte 0xe\n\t.byte 16\n" /* def_cfa_offset */ |
5952 | "\t.byte 0x86\n\t.byte 0x2\n" /* offset rbp */ | 5952 | "\t.byte 0x86\n\t.byte 0x2\n" /* offset rbp */ |
5953 | "\t.byte 0xd\n\t.uleb128 0x6\n" /* def_cfa_register rbp */ | 5953 | "\t.byte 0xd\n\t.byte 0x6\n" /* def_cfa_register rbp */ |
5954 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset rbx */ | 5954 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset rbx */ |
5955 | #else | 5955 | #else |
5956 | "\t.byte 0xe\n\t.byte 8\n" /* def_cfa_offset */ | 5956 | "\t.byte 0xe\n\t.byte 8\n" /* def_cfa_offset */ |
5957 | "\t.byte 0x84\n\t.byte 0x2\n" /* offset ebp (4 for MACH-O)*/ | 5957 | "\t.byte 0x84\n\t.byte 0x2\n" /* offset ebp (4 for MACH-O)*/ |
5958 | "\t.byte 0xd\n\t.uleb128 0x4\n" /* def_cfa_register ebp */ | 5958 | "\t.byte 0xd\n\t.byte 0x4\n" /* def_cfa_register ebp */ |
5959 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset ebx */ | 5959 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset ebx */ |
5960 | #endif | 5960 | #endif |
5961 | "\t.align " BSZPTR "\n" | 5961 | "\t.align " BSZPTR "\n" |