mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-27 05:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

update allocretregs() for AArch64

Browse source
This commit is contained in:
Walter Bright 2025-02-03 22:48:49 -08:00 • committed by The Dlang Bot
parent fd8b00b58c
commit 89b93e8b09
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/src/dmd/backend/arm/cod1.d
View file

@ -2029,7 +2029,7 @@ static if (0)
} }
reg_t reg1, reg2; reg_t reg1, reg2;
retregs = allocretregs(e.Ety, e.ET, tym1, reg1, reg2); retregs = allocretregs(cgstate, e.Ety, e.ET, tym1, reg1, reg2);
assert(retregs || !pretregs); assert(retregs || !pretregs);

2
compiler/src/dmd/backend/x86/cod1.d
View file

@ -4080,7 +4080,7 @@ static if (0)
} }
reg_t reg1, reg2; reg_t reg1, reg2;
retregs = allocretregs(e.Ety, e.ET, tym1, reg1, reg2); retregs = allocretregs(cgstate, e.Ety, e.ET, tym1, reg1, reg2);
assert(retregs || !pretregs); assert(retregs || !pretregs);

22
compiler/src/dmd/backend/x86/cod3.d
View file

@ -1140,11 +1140,12 @@ static if (NTEXCEPTIONS)
} }
case BC.retexp: case BC.retexp:
reg_t reg1, reg2, lreg, mreg; reg_t reg1, reg2;
retregs = allocretregs(e.Ety, e.ET, funcsym_p.ty(), reg1, reg2); retregs = allocretregs(cgstate, e.Ety, e.ET, funcsym_p.ty(), reg1, reg2);
//printf("allocretregs returns %s\n", regm_str(mask(reg1) | mask(reg2))); //printf("allocretregs returns %s\n", regm_str(mask(reg1) | mask(reg2)));
lreg = mreg = NOREG; reg_t lreg = NOREG;
reg_t mreg = NOREG;
if (reg1 == NOREG) if (reg1 == NOREG)
{} {}
else if (tybasic(e.Ety) == TYcfloat) else if (tybasic(e.Ety) == TYcfloat)
@ -1362,6 +1363,7 @@ static if (NTEXCEPTIONS)
* Allocate registers for function return values. * Allocate registers for function return values.
* *
* Params: * Params:
* cgstate = code generator state
* ty = return type * ty = return type
* t = return type extended info * t = return type extended info
* tyf = function type * tyf = function type
@ -1373,10 +1375,11 @@ static if (NTEXCEPTIONS)
* 0 if function returns on the stack or returns void. * 0 if function returns on the stack or returns void.
*/ */
@trusted @trusted
regm_t allocretregs(const tym_t ty, type* t, const tym_t tyf, out reg_t reg1, out reg_t reg2) regm_t allocretregs(ref CGstate cgstate, const tym_t ty, type* t, const tym_t tyf, out reg_t reg1, out reg_t reg2)
{ {
//printf("allocretregs() ty: %s\n", tym_str(ty)); //printf("allocretregs() ty: %s\n", tym_str(ty));
reg1 = reg2 = NOREG; reg1 = reg2 = NOREG;
auto AArch64 = cgstate.AArch64;
if (!(config.exe & EX_posix)) if (!(config.exe & EX_posix))
return regmask(ty, tyf); // for non-Posix ABI return regmask(ty, tyf); // for non-Posix ABI
@ -1484,12 +1487,15 @@ regm_t allocretregs(const tym_t ty, type* t, const tym_t tyf, out reg_t reg1, ou
nothrow: nothrow:
static immutable reg_t[2] gpr_regs = [AX, DX]; static immutable reg_t[2] gpr_regs = [AX, DX];
static immutable reg_t[2] xmm_regs = [XMM0, XMM1]; static immutable reg_t[2] xmm_regs = [XMM0, XMM1];
static immutable reg_t[2] fpt_regs = [32, 33]; // AArch64 V0, V1
uint cntgpr = 0, uint cntgpr = 0,
cntxmm = 0; cntxmm = 0,
cntfpt = 0;
reg_t gpr() { return gpr_regs[cntgpr++]; } reg_t gpr() { return gpr_regs[cntgpr++]; }
reg_t xmm() { return xmm_regs[cntxmm++]; } reg_t xmm() { return xmm_regs[cntxmm++]; }
reg_t fpt() { return fpt_regs[cntfpt++]; }
} }
RetRegsAllocator rralloc; RetRegsAllocator rralloc;
@ -1504,13 +1510,18 @@ regm_t allocretregs(const tym_t ty, type* t, const tym_t tyf, out reg_t reg1, ou
case 2: case 2:
case 4: case 4:
if (tyfloating(tym)) if (tyfloating(tym))
{
if (AArch64)
return rralloc.fpt();
return I64 ? rralloc.xmm() : ST0; return I64 ? rralloc.xmm() : ST0;
}
else else
return rralloc.gpr(); return rralloc.gpr();
case 8: case 8:
if (tycomplex(tym)) if (tycomplex(tym))
{ {
assert(!AArch64);
assert(tyfb == TYjfunc && I32); assert(tyfb == TYjfunc && I32);
return ST01; return ST01;
} }
@ -1522,6 +1533,7 @@ regm_t allocretregs(const tym_t ty, type* t, const tym_t tyf, out reg_t reg1, ou
goto case 4; goto case 4;
default: default:
assert(!AArch64);
if (tybasic(tym) == TYldouble || tybasic(tym) == TYildouble) if (tybasic(tym) == TYldouble || tybasic(tym) == TYildouble)
{ {
return ST0; return ST0;