win64: fix JIT

Repairs commit 558b03034a.
This commit is contained in:
Matthew Flatt 2011-12-18 16:29:01 -07:00 committed by Matthew Flatt
parent d00b93cdff
commit 67f83bfd6d
3 changed files with 3 additions and 1 deletions

View File

@ -799,7 +799,7 @@ void scheme_jit_prolog_again(mz_jit_state *jitter, int n, int ret_addr_reg)
# ifdef JIT_X86_64 # ifdef JIT_X86_64
# define mz_pop_threadlocal() mz_get_local_p(JIT_R14, JIT_LOCAL4) # define mz_pop_threadlocal() mz_get_local_p(JIT_R14, JIT_LOCAL4)
# define mz_push_threadlocal(in) /* empty */ # define mz_push_threadlocal(in) /* empty */
# define mz_push_threadlocal_early() (mz_set_local_p(JIT_R14, JIT_LOCAL4), jit_movr_p(JIT_R14, JIT_R1)) # define mz_push_threadlocal_early() (mz_set_local_p(JIT_R14, JIT_LOCAL4), jit_movr_p(JIT_R14, JIT_R_ARG4))
# define mz_repush_threadlocal() mz_set_local_p(JIT_R14, JIT_LOCAL4) # define mz_repush_threadlocal() mz_set_local_p(JIT_R14, JIT_LOCAL4)
# else # else
# define mz_pop_threadlocal() /* empty */ # define mz_pop_threadlocal() /* empty */

View File

@ -368,11 +368,13 @@ struct jit_local_state {
# define jit_getprearg_pip_p(r) (MOVQrr(JIT_R(9), r)) # define jit_getprearg_pip_p(r) (MOVQrr(JIT_R(9), r))
# define jit_getprearg_pipp_p(r) (jit_ldxi_p(r, JIT_SP, 40)) # define jit_getprearg_pipp_p(r) (jit_ldxi_p(r, JIT_SP, 40))
# define jit_getprearg_pippp_p(r) (jit_ldxi_p(r, JIT_SP, 48)) # define jit_getprearg_pippp_p(r) (jit_ldxi_p(r, JIT_SP, 48))
# define JIT_R_ARG4 JIT_R(9)
# else # else
# define jit_getprearg__p(r) (MOVQrr(_EDI, r)) # define jit_getprearg__p(r) (MOVQrr(_EDI, r))
# define jit_getprearg_pip_p(r) (MOVQrr(_ECX, r)) # define jit_getprearg_pip_p(r) (MOVQrr(_ECX, r))
# define jit_getprearg_pipp_p(r) (MOVQrr(JIT_R(8), r)) # define jit_getprearg_pipp_p(r) (MOVQrr(JIT_R(8), r))
# define jit_getprearg_pippp_p(r) (MOVQrr(JIT_R(9), r)) # define jit_getprearg_pippp_p(r) (MOVQrr(JIT_R(9), r))
# define JIT_R_ARG4 _ECX
# endif # endif
#else #else
# define jit_getprearg__p(r) (jit_ldxi_p(r, JIT_SP, 4)) # define jit_getprearg__p(r) (jit_ldxi_p(r, JIT_SP, 4))

View File