From 376bef93cfadf5d0f778ac887500ee8d5d70fbcc Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sun, 7 Apr 2019 00:06:29 -0700 Subject: Get 64-bit builds working for Windows target --- gen_x86.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gen_x86.c') diff --git a/gen_x86.c b/gen_x86.c index 33a9a0e..5d8b51a 100644 --- a/gen_x86.c +++ b/gen_x86.c @@ -2111,7 +2111,12 @@ uint32_t prep_args(code_info *code, uint32_t num_args, va_list args) } #ifdef X86_64 uint32_t stack_args = 0; +#ifdef _WIN32 + //Microsoft is too good for the ABI that everyone else uses on x86-64 apparently + uint8_t abi_regs[] = {RCX, RDX, R8, R9}; +#else uint8_t abi_regs[] = {RDI, RSI, RDX, RCX, R8, R9}; +#endif int8_t reg_swap[R15+1]; uint32_t usage = 0; memset(reg_swap, -1, sizeof(reg_swap)); @@ -2153,6 +2158,11 @@ uint32_t prep_args(code_info *code, uint32_t num_args, va_list args) push_r(code, arg_arr[i]); } free(arg_arr); +#if defined(X86_64) && defined(_WIN32) + sub_ir(code, 32, RSP, SZ_PTR); + code->stack_off += 32; + adjust += 32; +#endif return stack_args * sizeof(void *) + adjust; } -- cgit v1.2.3 From 00b3328fa2c8aaad2583e496f14b08d8e8bbec0f Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sun, 7 Apr 2019 22:48:58 -0700 Subject: Fix callee saved regs for Win64 --- gen_x86.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gen_x86.c') diff --git a/gen_x86.c b/gen_x86.c index 5d8b51a..18f1d24 100644 --- a/gen_x86.c +++ b/gen_x86.c @@ -2228,7 +2228,8 @@ void save_callee_save_regs(code_info *code) push_r(code, R13); push_r(code, R14); push_r(code, R15); -#else +#endif +#if !defined(X86_64) || defined(_WIN32) push_r(code, RDI); push_r(code, RSI); #endif @@ -2236,14 +2237,15 @@ void save_callee_save_regs(code_info *code) void restore_callee_save_regs(code_info *code) { +#if !defined(X86_64) || defined(_WIN32) + pop_r(code, RSI); + pop_r(code, RDI); +#endif #ifdef X86_64 pop_r(code, R15); pop_r(code, R14); pop_r(code, R13); pop_r(code, R12); -#else - pop_r(code, RSI); - pop_r(code, RDI); #endif pop_r(code, RBP); pop_r(code, RBX); -- cgit v1.2.3