d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

riscv: rewrite parameter passing

Browse source 
this fixes the ret_mixed_test of abitest.c, now everything of the
testsuite works.

The generic code for returns is good enough for our use, except in
the specific case of a mixed int/float structures returned in registers,
so instead of duplicating the whole generic gfunc_return function, add
another modus for gfunc_sret: returning -1 makes the actual register
transfer by a new backend function.
This commit is contained in:
Michael Matz 2019-08-10 21:21:43 +02:00
parent 9b0efa9346
commit c505074a9f
3 changed files with 212 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

290
riscv64-gen.c
View file

@ -433,32 +433,36 @@ static void gcall_or_jmp(int docall)
} }
} }
static int pass_in_freg(CType *type, int regs) static void reg_pass(CType *type, int *rc, int *fieldofs, int ofs)
{ {
int tr;
int toplevel = !regs;
if ((type->t & VT_BTYPE) == VT_STRUCT) { if ((type->t & VT_BTYPE) == VT_STRUCT) {
Sym *f; Sym *f;
if (type->ref->type.t == VT_UNION) if (type->ref->type.t == VT_UNION)
return toplevel ? 0 : -1; rc[0] = -1;
for (f = type->ref->next; f; f = f->next) { else for (f = type->ref->next; f; f = f->next)
tr = pass_in_freg(&f->type, regs); reg_pass(&f->type, rc, fieldofs, ofs + f->c);
if (tr < 0 || (regs + tr) > 2)
return toplevel ? 0 : -1;
regs += tr;
}
return regs;
} else if (type->t & VT_ARRAY) { } else if (type->t & VT_ARRAY) {
if (type->ref->c < 0 || type->ref->c > 2) if (type->ref->c < 0 || type->ref->c > 2)
return toplevel ? 0 : -1; rc[0] = -1;
tr = pass_in_freg(&type->ref->type, regs); else {
tr *= type->ref->c; int a, sz = type_size(&type->ref->type, &a);
if (tr < 0 || (regs + tr) > 2) reg_pass(&type->ref->type, rc, fieldofs, ofs);
return toplevel ? 0 : -1; if (rc[0] > 2 || (rc[0] == 2 && type->ref->c > 1))
return regs + tr; rc[0] = -1;
else if (type->ref->c == 2 && rc[0] && rc[1] == RC_FLOAT) {
rc[++rc[0]] = RC_FLOAT;
fieldofs[rc[0]] = ((ofs + sz) << 4)
| (type->ref->type.t & VT_BTYPE);
} else if (type->ref->c == 2)
rc[0] = -1;
} }
return is_float(type->t) && (type->t & VT_BTYPE) != VT_LDOUBLE } else if (rc[0] == 2 || rc[0] < 0 || (type->t & VT_BTYPE) == VT_LDOUBLE)
? 1 : toplevel ? 0 : -1; rc[0] = -1;
else if (!rc[0] || rc[1] == RC_FLOAT || is_float(type->t)) {
rc[++rc[0]] = is_float(type->t) ? RC_FLOAT : RC_INT;
fieldofs[rc[0]] = (ofs << 4) | (type->t & VT_BTYPE);
} else
rc[0] = -1;
} }
ST_FUNC void gfunc_call(int nb_args) ST_FUNC void gfunc_call(int nb_args)
@ -472,7 +476,9 @@ ST_FUNC void gfunc_call(int nb_args)
aireg = afreg = 0; aireg = afreg = 0;
sa = vtop[-nb_args].type.ref->next; sa = vtop[-nb_args].type.ref->next;
for (i = 0; i < nb_args; i++) { for (i = 0; i < nb_args; i++) {
int *pareg, nregs, infreg = 0, byref = 0, tempofs; int *pareg, nregs, byref = 0, tempofs;
int prc[3], fieldofs[3];
prc[0] = 0;
sv = &vtop[1 + i - nb_args]; sv = &vtop[1 + i - nb_args];
sv->type.t &= ~VT_ARRAY; // XXX this should be done in tccgen.c sv->type.t &= ~VT_ARRAY; // XXX this should be done in tccgen.c
size = type_size(&sv->type, &align); size = type_size(&sv->type, &align);
@ -490,31 +496,43 @@ ST_FUNC void gfunc_call(int nb_args)
else else
nregs = 1; nregs = 1;
if (!sa) { if (!sa) {
infreg = 0; prc[0] = nregs, prc[1] = prc[2] = RC_INT;
} else { } else {
infreg = pass_in_freg(&sv->type, 0); reg_pass(&sv->type, prc, fieldofs, 0);
if (prc[0] < 0)
prc[0] = nregs, prc[1] = prc[2] = RC_INT;
} }
if (!infreg && !sa && align == 2*XLEN && size <= 2*XLEN) if (!sa && align == 2*XLEN && size <= 2*XLEN)
aireg = (aireg + 1) & ~1; aireg = (aireg + 1) & ~1;
pareg = infreg ? &afreg : &aireg; nregs = prc[0];
if ((*pareg < 8 && (!infreg || (*pareg + nregs) <= 8)) && !force_stack) { assert(nregs);
info[i] = *pareg + (infreg ? 8 : 0); if (!nregs
(*pareg)++; || (prc[1] == RC_INT && aireg >= 8)
if (nregs == 1) || (prc[1] == RC_FLOAT && afreg >= 8)
; || (nregs == 2 && prc[2] == RC_FLOAT && afreg >= 7)
else if (*pareg < 8) || (nregs == 2 && prc[1] != prc[2] && (afreg >= 8 || aireg >= 8))
(*pareg)++; || force_stack) {
else {
info[i] |= 16;
stack_adj += 8;
}
} else {
info[i] = 32; info[i] = 32;
if (align < XLEN) if (align < XLEN)
align = XLEN; align = XLEN;
stack_adj += (size + align - 1) & -align; stack_adj += (size + align - 1) & -align;
if (!sa) if (!sa)
force_stack = 1; force_stack = 1;
} else {
if (prc[1] == RC_FLOAT)
info[i] = 8 + afreg++;
else
info[i] = aireg++;
if (nregs == 2) {
if (prc[2] == RC_FLOAT)
info[i] |= (1 + 8 + afreg++) << 7;
else if (aireg < 8)
info[i] |= (1 + aireg++) << 7;
else {
info[i] |= 16;
stack_adj += 8;
}
}
} }
if (byref) if (byref)
info[i] |= 64 | (tempofs << 7); info[i] |= 64 | (tempofs << 7);
@ -569,62 +587,72 @@ ST_FUNC void gfunc_call(int nb_args)
} }
} }
for (i = 0; i < nb_args; i++) { for (i = 0; i < nb_args; i++) {
int r = info[nb_args - 1 - i]; int r = info[nb_args - 1 - i], r2 = r;
if (!(r & 32)) { if (!(r & 32)) {
CType origtype; CType origtype;
int prc[3], fieldofs[3], loadt;
prc[0] = 0;
r &= 15; r &= 15;
r2 = r2 & 64 ? 0 : r2 >> 7;
vrotb(i+1); vrotb(i+1);
origtype = vtop->type; origtype = vtop->type;
size = type_size(&vtop->type, &align); size = type_size(&vtop->type, &align);
if (r >= 8 && (vtop->r & VT_LVAL)) { reg_pass(&vtop->type, prc, fieldofs, 0);
int infreg = pass_in_freg(&vtop->type, 0); if (prc[0] <= 0 || (!r2 && prc[0] > 1)) {
int loadt = vtop->type.t & VT_BTYPE; prc[0] = (size + 7) >> 3;
prc[1] = prc[2] = RC_INT;
fieldofs[1] = (0 << 4) | (size <= 1 ? VT_BYTE : size <= 2 ? VT_SHORT : size <= 4 ? VT_INT : VT_LLONG);
fieldofs[2] = (8 << 4) | (size <= 9 ? VT_BYTE : size <= 10 ? VT_SHORT : size <= 12 ? VT_INT : VT_LLONG);
}
loadt = vtop->type.t & VT_BTYPE;
if (loadt == VT_STRUCT) { if (loadt == VT_STRUCT) {
if (infreg == 1) loadt = fieldofs[1] & VT_BTYPE;
loadt = size == 4 ? VT_FLOAT : VT_DOUBLE; }
else if (info[nb_args - 1 - i] & 16) {
loadt = size == 8 ? VT_FLOAT : VT_DOUBLE; assert(!r2);
r2 = 1 + TREG_RA;
}
if (loadt == VT_LDOUBLE) {
assert(r2);
r2--;
} else if (r2) {
test_lvalue();
vpushv(vtop);
} }
vtop->type.t = loadt; vtop->type.t = loadt;
assert (infreg && infreg <= 2);
save_reg_upstack(r, 1);
if (infreg > 1) {
save_reg_upstack(r + 1, 1);
test_lvalue();
}
load(r, vtop);
vset(&origtype, r, 0);
vswap();
if (infreg > 1) {
assert(r + 1 < 16);
gaddrof();
mk_pointer(&vtop->type);
vpushi(1);
gen_op('+');
indir();
load(r + 1, vtop);
vtop[-1].r2 = r + 1;
}
vtop--;
} else {
if (r < 8 && size > 8 && (vtop->type.t & VT_BTYPE) == VT_STRUCT)
vtop->type.t = VT_LDOUBLE; // force loading a pair of regs
gv(r < 8 ? RC_R(r) : RC_F(r - 8)); gv(r < 8 ? RC_R(r) : RC_F(r - 8));
vtop->type = origtype; vtop->type = origtype;
if (size > 8) {
assert((vtop->type.t & VT_BTYPE) == VT_LDOUBLE if (r2 && loadt != VT_LDOUBLE) {
|| (vtop->type.t & VT_BTYPE) == VT_STRUCT); r2--;
assert(vtop->r2 < VT_CONST); assert(r2 < 16 || r2 == TREG_RA);
vswap();
gaddrof();
vtop->type = char_pointer_type;
vpushi(fieldofs[2] >> 4);
gen_op('+');
indir();
vtop->type = origtype;
loadt = vtop->type.t & VT_BTYPE;
if (loadt == VT_STRUCT) {
loadt = fieldofs[2] & VT_BTYPE;
}
save_reg_upstack(r2, 1);
vtop->type.t = loadt;
load(r2, vtop);
assert(r2 < VT_CONST);
vtop--;
vtop->r2 = r2;
}
if (info[nb_args - 1 - i] & 16) { if (info[nb_args - 1 - i] & 16) {
ES(0x23, 3, 2, ireg(vtop->r2), splitofs); // sd t0, ofs(sp) ES(0x23, 3, 2, ireg(vtop->r2), splitofs); // sd t0, ofs(sp)
} else if (vtop->r2 != 1 + vtop->r) { vtop->r2 = VT_CONST;
assert(vtop->r < 7); } else if (loadt == VT_LDOUBLE && vtop->r2 != r2) {
assert(vtop->r2 <= 7 && r2 <= 7);
/* XXX we'd like to have 'gv' move directly into /* XXX we'd like to have 'gv' move directly into
the right class instead of us fixing it up. */ the right class instead of us fixing it up. */
EI(0x13, 0, ireg(vtop->r) + 1, ireg(vtop->r2), 0); // mv Ra+1, RR2 EI(0x13, 0, ireg(r2), ireg(vtop->r2), 0); // mv Ra+1, RR2
vtop->r2 = 1 + vtop->r; vtop->r2 = r2;
}
}
} }
vrott(i+1); vrott(i+1);
} }
@ -681,19 +709,29 @@ ST_FUNC void gfunc_prolog(CType *func_type)
param_addr = addr; param_addr = addr;
addr += size; addr += size;
} else { } else {
int regcount = 1, *pareg = &aireg; int regcount, *pareg;
if ((regcount = pass_in_freg(type, 0))) int prc[3], fieldofs[3];
pareg = &afreg; prc[0] = 0;
else { reg_pass(type, prc, fieldofs, 0);
regcount = 1; if (prc[0] <= 0) {
prc[0] = (size + 7) >> 3;
prc[1] = prc[2] = RC_INT;
fieldofs[1] = (0 << 4) | (size <= 1 ? VT_BYTE : size <= 2 ? VT_SHORT : size <= 4 ? VT_INT : VT_LLONG);
fieldofs[2] = (8 << 4) | (size <= 9 ? VT_BYTE : size <= 10 ? VT_SHORT : size <= 12 ? VT_INT : VT_LLONG);
} }
if (regcount + *pareg > 8) regcount = prc[0];
if (!regcount
|| (prc[1] == RC_INT && aireg >= 8)
|| (prc[1] == RC_FLOAT && afreg >= 8)
|| (regcount == 2 && prc[2] == RC_FLOAT && afreg >= 7)
|| (regcount == 2 && prc[1] != prc[2] && (afreg >= 8 || aireg >= 8)))
goto from_stack; goto from_stack;
if (size > XLEN && pareg == &aireg) if (size > XLEN)
regcount++; assert(regcount == 2);
loc -= regcount * 8; // XXX could reserve only 'size' bytes loc -= regcount * 8; // XXX could reserve only 'size' bytes
param_addr = loc; param_addr = loc;
for (i = 0; i < regcount; i++) { for (i = 0; i < regcount; i++) {
pareg = prc[1+i] == RC_INT ? &aireg : &afreg;
if (*pareg >= 8) { if (*pareg >= 8) {
assert(i == 1 && regcount == 2 && !(addr & 7)); assert(i == 1 && regcount == 2 && !(addr & 7));
EI(0x03, 3, 5, 8, addr); // ld t0, addr(s0) EI(0x03, 3, 5, 8, addr); // ld t0, addr(s0)
@ -703,11 +741,10 @@ ST_FUNC void gfunc_prolog(CType *func_type)
} }
if (pareg == &afreg) { if (pareg == &afreg) {
//assert(type->t == VT_FLOAT || type->t == VT_DOUBLE); //assert(type->t == VT_FLOAT || type->t == VT_DOUBLE);
ES(0x27, (size / regcount) == 4 ? 2 : 3, 8, 10 + *pareg, loc + i*(size / regcount)); // fs[wd] FAi, loc(s0) ES(0x27, (size / regcount) == 4 ? 2 : 3, 8, 10 + afreg++, loc + (fieldofs[i+1] >> 4)); // fs[wd] FAi, loc(s0)
} else { } else {
ES(0x23, 3, 8, 10 + *pareg, loc + i*8); // sd aX, loc(s0) // XXX ES(0x23, 3, 8, 10 + aireg++, loc + i*8); // sd aX, loc(s0) // XXX
} }
(*pareg)++;
} }
} }
sym_push(sym->v & ~SYM_FIELD, &sym->type, sym_push(sym->v & ~SYM_FIELD, &sym->type,
@ -727,57 +764,50 @@ ST_FUNC void gfunc_prolog(CType *func_type)
ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret, ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret,
int *ret_align, int *regsize) int *ret_align, int *regsize)
{ {
/* generic code can only deal with structs of pow(2) sizes int align, size = type_size(vt, &align), infreg, nregs;
(it always deals with whole registers), so go through our own int prc[3], fieldofs[3];
code. */
int align, size = type_size(vt, &align), infreg;
*ret_align = 1; *ret_align = 1;
*regsize = 8; *regsize = 8;
if (size > 16) if (size > 16)
return 0; return 0;
infreg = pass_in_freg(vt, 0); prc[0] = 0;
if (infreg) { reg_pass(vt, prc, fieldofs, 0);
*regsize = size / infreg; if (prc[0] <= 0) {
ret->t = (size / infreg) == 4 ? VT_FLOAT : VT_DOUBLE; prc[0] = (size + 7) >> 3;
return infreg; prc[1] = prc[2] = RC_INT;
fieldofs[1] = (0 << 4) | (size <= 1 ? VT_BYTE : size <= 2 ? VT_SHORT : size <= 4 ? VT_INT : VT_LLONG);
fieldofs[2] = (8 << 4) | (size <= 9 ? VT_BYTE : size <= 10 ? VT_SHORT : size <= 12 ? VT_INT : VT_LLONG);
} }
if (size > 8) nregs = prc[0];
ret->t = VT_LLONG; assert(nregs > 0);
else if (size > 4) if (nregs == 2 && prc[1] != prc[2])
ret->t = VT_LLONG; return -1; /* generic code can't deal with this case */
else if (size > 2) if (prc[1] == RC_FLOAT) {
ret->t = VT_INT; *regsize = size / nregs;
else if (size > 1) }
ret->t = VT_SHORT; ret->t = fieldofs[1] & VT_BTYPE;
else return nregs;
ret->t = VT_BYTE;
return (size + 7) / 8;
} }
ST_FUNC void gfunc_return2(CType *func_type) ST_FUNC void arch_transfer_ret_regs(int aftercall)
{ {
int align, size = type_size(func_type, &align), nregs; int prc[3], fieldofs[3];
CType type = *func_type; prc[0] = 0;
if (size > 2 * XLEN) { reg_pass(&vtop->type, prc, fieldofs, 0);
mk_pointer(&type); assert(prc[0] == 2 && prc[1] != prc[2] && !(fieldofs[1] >> 4));
vset(&type, VT_LOCAL | VT_LVAL, func_vc); assert(vtop->r == (VT_LOCAL | VT_LVAL));
indir(); vpushv(vtop);
vswap(); vtop->type.t = fieldofs[1] & VT_BTYPE;
vstore(); if (aftercall)
vpop(); store(prc[1] == RC_INT ? REG_IRET : REG_FRET, vtop);
return;
}
nregs = pass_in_freg(func_type, 0);
if (!nregs) {
nregs = (size + 7) / 8;
if (nregs == 2)
vtop->type.t = VT_LDOUBLE;
}
if (is_float(func_type->t) && (vtop->type.t & VT_BTYPE) != VT_LDOUBLE)
gv(RC_FRET);
else else
gv(RC_IRET); load(prc[1] == RC_INT ? REG_IRET : REG_FRET, vtop);
vtop->c.i += fieldofs[2] >> 4;
vtop->type.t = fieldofs[2] & VT_BTYPE;
if (aftercall)
store(prc[2] == RC_INT ? REG_IRET : REG_FRET, vtop);
else
load(prc[2] == RC_INT ? REG_IRET : REG_FRET, vtop);
vtop--; vtop--;
} }

1
tcc.h
View file

@ -1607,6 +1607,7 @@ ST_FUNC void gen_opl(int op);
//ST_FUNC void gfunc_return(CType *func_type); //ST_FUNC void gfunc_return(CType *func_type);
ST_FUNC void gen_va_start(void); ST_FUNC void gen_va_start(void);
ST_FUNC void gen_va_arg(CType *t); ST_FUNC void gen_va_arg(CType *t);
ST_FUNC void arch_transfer_ret_regs(int);
#endif #endif
/* ------------ c67-gen.c ------------ */ /* ------------ c67-gen.c ------------ */
#ifdef TCC_TARGET_C67 #ifdef TCC_TARGET_C67

20
tccgen.c
View file

@ -5490,7 +5490,7 @@ special_math_val:
variadic = (s->f.func_type == FUNC_ELLIPSIS); variadic = (s->f.func_type == FUNC_ELLIPSIS);
ret_nregs = gfunc_sret(&s->type, variadic, &ret.type, ret_nregs = gfunc_sret(&s->type, variadic, &ret.type,
&ret_align, &regsize); &ret_align, &regsize);
if (!ret_nregs) { if (ret_nregs <= 0) {
/* get some space for the returned structure */ /* get some space for the returned structure */
size = type_size(&s->type, &align); size = type_size(&s->type, &align);
#ifdef TCC_TARGET_ARM64 #ifdef TCC_TARGET_ARM64
@ -5509,6 +5509,9 @@ special_math_val:
problems */ problems */
vseti(VT_LOCAL, loc); vseti(VT_LOCAL, loc);
ret.c = vtop->c; ret.c = vtop->c;
if (ret_nregs < 0)
vtop--;
else
nb_args++; nb_args++;
} }
} else { } else {
@ -5516,7 +5519,7 @@ special_math_val:
ret.type = s->type; ret.type = s->type;
} }
if (ret_nregs) { if (ret_nregs > 0) {
/* return in register */ /* return in register */
if (is_float(ret.type.t)) { if (is_float(ret.type.t)) {
ret.r = reg_fret(ret.type.t); ret.r = reg_fret(ret.type.t);
@ -5559,6 +5562,12 @@ special_math_val:
skip(')'); skip(')');
gfunc_call(nb_args); gfunc_call(nb_args);
if (ret_nregs < 0) {
vsetc(&ret.type, ret.r, &ret.c);
#ifdef TCC_TARGET_RISCV64
arch_transfer_ret_regs(1);
#endif
} else {
/* return value */ /* return value */
for (r = ret.r + ret_nregs + !ret_nregs; r-- > ret.r;) { for (r = ret.r + ret_nregs + !ret_nregs; r-- > ret.r;) {
vsetc(&ret.type, r, &ret.c); vsetc(&ret.type, r, &ret.c);
@ -5588,6 +5597,7 @@ special_math_val:
} }
vset(&s->type, VT_LOCAL | VT_LVAL, addr); vset(&s->type, VT_LOCAL | VT_LVAL, addr);
} }
}
if (s->f.func_noreturn) if (s->f.func_noreturn)
CODE_OFF(); CODE_OFF();
} else { } else {
@ -6090,7 +6100,11 @@ static void gfunc_return(CType *func_type)
int ret_align, ret_nregs, regsize; int ret_align, ret_nregs, regsize;
ret_nregs = gfunc_sret(func_type, func_var, &ret_type, ret_nregs = gfunc_sret(func_type, func_var, &ret_type,
&ret_align, &regsize); &ret_align, &regsize);
if (0 == ret_nregs) { if (ret_nregs < 0) {
#ifdef TCC_TARGET_RISCV64
arch_transfer_ret_regs(0);
#endif
} else if (0 == ret_nregs) {
/* if returning structure, must copy it to implicit /* if returning structure, must copy it to implicit
first pointer arg location */ first pointer arg location */
type = *func_type; type = *func_type;