From 610fd4751023f573d9baa3357eab6259b18a3f6a Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Wed, 17 Jun 2009 02:11:13 +0200
Subject: [PATCH] win32: structure return GCC compatible (ret 4 with cdecl)
---
i386-gen.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/i386-gen.c b/i386-gen.c
index f958ab54..2edbe2fd 100644
--- a/i386-gen.c
+++ b/i386-gen.c
@@ -402,6 +402,11 @@ void gfunc_call(int nb_args)
}
}
gcall_or_jmp(0);
+
+#ifdef TCC_TARGET_PE
+ if ((func_sym->type.t & VT_BTYPE) == VT_STRUCT)
+ args_size -= 4;
+#endif
if (args_size && func_call != FUNC_STDCALL)
gadd_sp(args_size);
vtop--;
@@ -426,6 +431,8 @@ void gfunc_prolog(CType *func_type)
func_call = FUNC_CALL(sym->r);
addr = 8;
loc = 0;
+ func_vc = 0;
+
if (func_call >= FUNC_FASTCALL1 && func_call <= FUNC_FASTCALL3) {
fastcall_nb_regs = func_call - FUNC_FASTCALL1 + 1;
fastcall_regs_ptr = fastcall_regs;
@@ -478,6 +485,10 @@ void gfunc_prolog(CType *func_type)
/* pascal type call ? */
if (func_call == FUNC_STDCALL)
func_ret_sub = addr - 8;
+#ifdef TCC_TARGET_PE
+ else if (func_vc)
+ func_ret_sub = 4;
+#endif
/* leave some room for bound checking code */
if (tcc_state->do_bounds_check) {