MahnoKropotkinvich/tinycc
1
0
Fork 0
mirror of git://repo.or.cz/tinycc.git synced 2026-06-17 15:44:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arm64-win32 support: improve HFA & struct

Browse Source
This commit is contained in:
Benjamin Oldenburg 2026-04-04 16:29:28 +02:00 committed by grischka
parent 90d17c9748
commit 5c728d6506
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
arm64-gen.c
View File

@ -754,14 +754,8 @@ static int arm64_hfa_aux(CType *type, int *fsize, int num)
return num + 1; return num + 1;
} }
else if ((type->t & VT_BTYPE) == VT_STRUCT) { else if ((type->t & VT_BTYPE) == VT_STRUCT) {
int is_struct = 0; // rather than union
Sym *field; Sym *field;
for (field = type->ref->next; field; field = field->next) if (!IS_UNION(type->t)) {
if (field->c) {
is_struct = 1;
break;
}
if (is_struct) {
int num0 = num; int num0 = num;
for (field = type->ref->next; field; field = field->next) { for (field = type->ref->next; field; field = field->next) {
if (field->c != (num - num0) * *fsize) if (field->c != (num - num0) * *fsize)
@ -1026,8 +1020,10 @@ ST_FUNC void gfunc_call(int nb_args)
unsigned long *a, *a1; unsigned long *a, *a1;
unsigned long stack; unsigned long stack;
int i; int i;
int variadic = (vtop[-nb_args].type.ref->f.func_type == FUNC_ELLIPSIS); int func_type = vtop[-nb_args].type.ref->f.func_type;
int var_nb_arg = n_func_args(&vtop[-nb_args].type); int variadic = (func_type == FUNC_ELLIPSIS);
int old_style = (func_type == FUNC_OLD);
int var_nb_arg = variadic ? n_func_args(&vtop[-nb_args].type) : 0;
save_regs(nb_args + 1); save_regs(nb_args + 1);
@ -1113,7 +1109,14 @@ ST_FUNC void gfunc_call(int nb_args)
for (i = nb_args; i; i--, vtop--) { for (i = nb_args; i; i--, vtop--) {
if (a[i] < 16 && !(a[i] & 1)) { if (a[i] < 16 && !(a[i] & 1)) {
// value in general-purpose registers // value in general-purpose registers
if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) { if ((variadic || old_style) && i > var_nb_arg && is_float(vtop->type.t)) {
gv(RC_FLOAT);
if ((vtop->type.t & VT_BTYPE) == VT_DOUBLE)
o(ARM64_FMOV_XD | intr(a[i] / 2) | fltr(vtop->r) << 5); // fmov xN,dM
else
o(ARM64_FMOV_WS | intr(a[i] / 2) | fltr(vtop->r) << 5); // fmov wN,sM
}
else if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) {
int align, size = type_size(&vtop->type, &align); int align, size = type_size(&vtop->type, &align);
if (size) { if (size) {
vtop->type.t = VT_PTR; vtop->type.t = VT_PTR;
@ -1132,14 +1135,20 @@ ST_FUNC void gfunc_call(int nb_args)
// value in floating-point registers // value in floating-point registers
if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) { if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) {
uint32_t j, sz, n = arm64_hfa(&vtop->type, &sz); uint32_t j, sz, n = arm64_hfa(&vtop->type, &sz);
vtop->type.t = VT_PTR; if (n > 0) {
gaddrof(); /* HFA struct - load from memory into float registers */
gv(RC_R30); vtop->type.t = VT_PTR;
for (j = 0; j < n; j++) gaddrof();
o(0x3d4003c0 | gv(RC_R30);
(sz & 16) << 19 | -(sz & 8) << 27 | (sz & 4) << 29 | for (j = 0; j < n; j++)
(a[i] / 2 - 8 + j) | o(0x3d4003c0 |
j << 10); // ldr ([sdq])(*),[x30,#(j * sz)] (sz & 16) << 19 | -(sz & 8) << 27 | (sz & 4) << 29 |
(a[i] / 2 - 8 + j) |
j << 10); // ldr ([sdq])(*),[x30,#(j * sz)]
} else {
/* Non-HFA struct in float register slot - shouldn't happen */
gv(RC_F(a[i] / 2 - 8));
}
} }
else else
gv(RC_F(a[i] / 2 - 8)); gv(RC_F(a[i] / 2 - 8));
@ -1181,6 +1190,7 @@ ST_FUNC void gfunc_call(int nb_args)
} }
else if (a[0] == 16) { else if (a[0] == 16) {
/* HFA struct return - store from float registers to the address in x8 */
uint32_t j, sz, n = arm64_hfa(return_type, &sz); uint32_t j, sz, n = arm64_hfa(return_type, &sz);
for (j = 0; j < n; j++) for (j = 0; j < n; j++)
o(0x3d000100 | o(0x3d000100 |
@ -1292,11 +1302,11 @@ ST_FUNC void gfunc_prolog(Sym *func_sym)
// HFAs of float and double need to be written differently: // HFAs of float and double need to be written differently:
if (16 <= a[i] && a[i] < 32 && (sym->type.t & VT_BTYPE) == VT_STRUCT) { if (16 <= a[i] && a[i] < 32 && (sym->type.t & VT_BTYPE) == VT_STRUCT) {
uint32_t j, sz, k = arm64_hfa(&sym->type, &sz); uint32_t j, sz, k = arm64_hfa(&sym->type, &sz);
if (sz < 16) if (k > 0 && sz < 16)
for (j = 0; j < k; j++) { for (j = 0; j < k; j++) {
o(0x3d0003e0 | -(sz & 8) << 27 | (sz & 4) << 29 | o(0x3d0003e0 | -(sz & 8) << 27 | (sz & 4) << 29 |
((a[i] - 16) / 2 + j) | (off / sz + j) << 10); ((a[i] - 16) / 2 + j) | (off / sz + j) << 10);
// str ([sdq])(*),[sp,#(j * sz)] // str ([sdq])(j),[sp,#(j * sz)]
} }
} }
} }
@ -1479,7 +1489,8 @@ ST_FUNC void gfunc_return(CType *func_type)
} }
case 16: case 16:
if ((func_type->t & VT_BTYPE) == VT_STRUCT) { if ((func_type->t & VT_BTYPE) == VT_STRUCT) {
uint32_t j, sz, n = arm64_hfa(&vtop->type, &sz); /* HFA struct return - load from the address on vtop into float registers */
uint32_t j, sz, n = arm64_hfa(func_type, &sz);
gaddrof(); gaddrof();
gv(RC_R(0)); gv(RC_R(0));
for (j = 0; j < n; j++) for (j = 0; j < n; j++)