diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2013-06-26 06:43:33 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2013-06-26 06:43:33 +0000 |
| commit | 3a22258109384ac509f26ecd022ce97687eca0ec (patch) | |
| tree | bef3fc490991a443126ec1db5cf1187b2a532512 /src/runtime | |
| parent | ebc4d2173b0af18d2a18032470527236d33a994f (diff) | |
fix for x86_64
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/c/pgf/jit.c | 2 | ||||
| -rw-r--r-- | src/runtime/c/pgf/lightning/i386/core-32.h | 1 | ||||
| -rw-r--r-- | src/runtime/c/pgf/lightning/i386/core-64.h | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/runtime/c/pgf/jit.c b/src/runtime/c/pgf/jit.c index 16f72139d..88363e73b 100644 --- a/src/runtime/c/pgf/jit.c +++ b/src/runtime/c/pgf/jit.c @@ -283,7 +283,7 @@ pgf_jit_done(PgfJitState* state, PgfAbstr* abstr) gu_map_get(abstr->cats, &patch->cid, PgfAbsCat*); gu_assert(arg != NULL); - jit_patch_at(patch->ref,(jit_insn*) arg->predicate); + jit_patch_calli(patch->ref,(jit_insn*) arg->predicate); } jit_flush_code(state->buf, jit_get_ip().ptr); diff --git a/src/runtime/c/pgf/lightning/i386/core-32.h b/src/runtime/c/pgf/lightning/i386/core-32.h index 6d5e8b6ab..a94682def 100644 --- a/src/runtime/c/pgf/lightning/i386/core-32.h +++ b/src/runtime/c/pgf/lightning/i386/core-32.h @@ -121,6 +121,7 @@ struct jit_local_state { #define jit_movi_p(d, is) (MOVLir (((long)(is)), (d)), _jit.x.pc) #define jit_patch_long_at(jump_pc,v) (*_PSL((jump_pc) - sizeof(long)) = _jit_SL((jit_insn *)(v) - (jump_pc))) #define jit_patch_at(jump_pc,v) jit_patch_long_at(jump_pc, v) +#define jit_patch_calli(jump_pc,v) jit_patch_long_at(jump_pc, v) /* Memory */ #define jit_replace(s, rep, op) \ diff --git a/src/runtime/c/pgf/lightning/i386/core-64.h b/src/runtime/c/pgf/lightning/i386/core-64.h index 46f2daf02..4a856d96c 100644 --- a/src/runtime/c/pgf/lightning/i386/core-64.h +++ b/src/runtime/c/pgf/lightning/i386/core-64.h @@ -156,7 +156,7 @@ struct jit_local_state { #define jit_prolog(n) (_jitl.framesize = ((n) & 1) ? 56 : 48, _jitl.nextarg_getfp = _jitl.nextarg_geti = 0, _jitl.alloca_offset = 0, \ PUSHQr(_EBX), PUSHQr(_R12), PUSHQr(_R13), PUSHQr(_R14), PUSHQr(_EBP), MOVQrr(_ESP, _EBP)) -#define jit_calli(sub) (MOVQir((long) (sub), JIT_REXTMP), CALLsr(JIT_REXTMP)) +#define jit_calli(sub) (MOVQir((long) (sub), JIT_REXTMP), _jitl.finish_ref = _jit.x.pc, CALLsr(JIT_REXTMP), _jitl.finish_ref) #define jit_callr(reg) CALLsr((reg)) #define jit_prepare_i(ni) (_jitl.nextarg_puti = (ni), \ @@ -170,7 +170,7 @@ struct jit_local_state { : MOVBir(0, _AL), \ ((_jitl.argssize & 1) \ ? (PUSHQr(_EAX), ++_jitl.argssize) : 0), \ - _jitl.finish_ref = jit_calli(sub), \ + jit_calli(sub), \ (_jitl.argssize \ ? (ADDQir(sizeof(long) * _jitl.argssize, JIT_SP), _jitl.argssize = 0) \ : 0), \ @@ -263,6 +263,7 @@ static int jit_arg_reg_order[] = { _EDI, _ESI, _EDX, _ECX, _R8D, _R9D }; #define jit_patch_long_at(jump_pc,v) (*_PSL((jump_pc) - sizeof(long)) = _jit_SL((jit_insn *)(v))) #define jit_patch_short_at(jump_pc,v) (*_PSI((jump_pc) - sizeof(int)) = _jit_SI((jit_insn *)(v) - (jump_pc))) #define jit_patch_at(jump_pc,v) (_jitl.long_jumps ? jit_patch_long_at((jump_pc)-3, v) : jit_patch_short_at(jump_pc, v)) +#define jit_patch_calli(pa,pv) (*_PSL((pa) - sizeof(long)) = _jit_SL((pv))) #define jit_ret() (LEAVE_(), POPQr(_R14), POPQr(_R13), POPQr(_R12), POPQr(_EBX), RET_()) /* Memory */ |