fix-mixed-struct (patch by Pip Cet)
Jsut for testing. It works for me (don't break anything)
Small fixes for x86_64-gen.c in "tccpp: fix issues, add tests"
are dropped in flavor of this patch.
Pip Cet:
Okay, here's a first patch that fixes the problem (but I've found
another bug, yet unfixed, in the process), though it's not
particularly pretty code (I tried hard to keep the changes to the
minimum necessary). If we decide to actually get rid of VT_QLONG and
VT_QFLOAT (please, can we?), there are some further simplifications in
tccgen.c that might offset some of the cost of this patch.
The idea is that an integer is no longer enough to describe how an
argument is stored in registers. There are a number of possibilities
(none, integer register, two integer registers, float register, two
float registers, integer register plus float register, float register
plus integer register), and instead of enumerating them I've
introduced a RegArgs type that stores the offsets for each of our
registers (for the other architectures, it's simply an int specifying
the number of registers). If someone strongly prefers an enum, we
could do that instead, but I believe this is a place where keeping
things general is worth it, because this way it should be doable to
add SSE or AVX support.
There is one line in the patch that looks suspicious:
} else {
addr = (addr + align - 1) & -align;
param_addr = addr;
addr += size;
- sse_param_index += reg_count;
}
break;
However, this actually fixes one half of a bug we have when calling a
function with eight double arguments "interrupted" by a two-double
structure after the seventh double argument:
f(double,double,double,double,double,double,double,struct { double
x,y; },double);
In this case, the last argument should be passed in %xmm7. This patch
fixes the problem in gfunc_prolog, but not the corresponding problem
in gfunc_call, which I'll try tackling next.
This commit is contained in:
22
arm-gen.c
22
arm-gen.c
@ -34,6 +34,8 @@
|
||||
#define NB_REGS 9
|
||||
#endif
|
||||
|
||||
typedef int RegArgs;
|
||||
|
||||
#ifndef TCC_ARM_VERSION
|
||||
# define TCC_ARM_VERSION 5
|
||||
#endif
|
||||
@ -867,9 +869,14 @@ int floats_in_core_regs(SValue *sval)
|
||||
}
|
||||
}
|
||||
|
||||
ST_FUNC int regargs_nregs(RegArgs *args)
|
||||
{
|
||||
return *args;
|
||||
}
|
||||
|
||||
/* Return the number of registers needed to return the struct, or 0 if
|
||||
returning via struct pointer. */
|
||||
ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret, int *ret_align, int *regsize) {
|
||||
ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret, int *ret_align, int *regsize, RegArgs *args) {
|
||||
#ifdef TCC_ARM_EABI
|
||||
int size, align;
|
||||
size = type_size(vt, &align);
|
||||
@ -879,18 +886,20 @@ ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret, int *ret_align, int
|
||||
*regsize = 8;
|
||||
ret->ref = NULL;
|
||||
ret->t = VT_DOUBLE;
|
||||
return (size + 7) >> 3;
|
||||
*args = (size + 7) >> 3;
|
||||
} else if (size <= 4) {
|
||||
*ret_align = 4;
|
||||
*regsize = 4;
|
||||
ret->ref = NULL;
|
||||
ret->t = VT_INT;
|
||||
return 1;
|
||||
*args = 1;
|
||||
} else
|
||||
return 0;
|
||||
*args = 0;
|
||||
#else
|
||||
return 0;
|
||||
*args = 0;
|
||||
#endif
|
||||
|
||||
return *args != 0;
|
||||
}
|
||||
|
||||
/* Parameters are classified according to how they are copied to their final
|
||||
@ -1260,6 +1269,7 @@ void gfunc_prolog(CType *func_type)
|
||||
int n, nf, size, align, rs, struct_ret = 0;
|
||||
int addr, pn, sn; /* pn=core, sn=stack */
|
||||
CType ret_type;
|
||||
RegArgs dummy;
|
||||
|
||||
#ifdef TCC_ARM_EABI
|
||||
struct avail_regs avregs = AVAIL_REGS_INITIALIZER;
|
||||
@ -1271,7 +1281,7 @@ void gfunc_prolog(CType *func_type)
|
||||
|
||||
n = nf = 0;
|
||||
if ((func_vt.t & VT_BTYPE) == VT_STRUCT &&
|
||||
!gfunc_sret(&func_vt, func_var, &ret_type, &align, &rs))
|
||||
!gfunc_sret(&func_vt, func_var, &ret_type, &align, &rs, &dummy))
|
||||
{
|
||||
n++;
|
||||
struct_ret = 1;
|
||||
|
||||
Reference in New Issue
Block a user