# HG changeset patch # User Michael Pavone # Date 1554702538 25200 # Node ID a79e929290445da49846d3754c3019f4ed245d24 # Parent 37afb9cf58be8414c515258b7ccede0ea15c988c Fix callee saved regs for Win64 diff -r 37afb9cf58be -r a79e92929044 gen_x86.c --- a/gen_x86.c Sun Apr 07 00:06:29 2019 -0700 +++ b/gen_x86.c Sun Apr 07 22:48:58 2019 -0700 @@ -2228,7 +2228,8 @@ 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 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);