paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-06 07:47:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ in_min/max_dword/longint support for aarch64

Browse Source
This commit is contained in:
florian 2021-12-19 16:16:44 +01:00
parent 77b9d62520
commit e443936e12
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
compiler/aarch64/ncpuinl.pas
View File

@ -357,6 +357,11 @@ implementation
expectloc:=LOC_MMREGISTER;
Result:=nil;
end
else if is_32bitint(resultdef) then
begin
expectloc:=LOC_REGISTER;
Result:=nil;
end
else
Result:=inherited first_minmax;
end;
@ -369,18 +374,18 @@ implementation
ai: taicpu;
op: TAsmOp;
begin
if is_single(resultdef) or is_double(resultdef) then
paraarray[1]:=tcallparanode(tcallparanode(parameters).nextpara).paravalue;
paraarray[2]:=tcallparanode(parameters).paravalue;
for i:=low(paraarray) to high(paraarray) do
secondpass(paraarray[i]);
if is_single(resultdef) or is_double(resultdef) then
begin
paraarray[1]:=tcallparanode(tcallparanode(parameters).nextpara).paravalue;
paraarray[2]:=tcallparanode(parameters).paravalue;
for i:=low(paraarray) to high(paraarray) do
secondpass(paraarray[i]);
{ no memory operand is allowed }
for i:=low(paraarray) to high(paraarray) do
begin
if not(paraarray[i].location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
if not(paraarray[i].location.loc in [LOC_MMREGISTER,LOC_CMMREGISTER]) then
hlcg.location_force_mmregscalar(current_asmdata.CurrAsmList,paraarray[i].location,
paraarray[i].resultdef,true);
end;
@ -406,6 +411,35 @@ implementation
cg.maybe_check_for_fpu_exception(current_asmdata.CurrAsmList);
end
else if is_32bitint(resultdef) then
begin
{ no memory operand is allowed }
for i:=low(paraarray) to high(paraarray) do
begin
if not(paraarray[i].location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
hlcg.location_force_reg(current_asmdata.CurrAsmList,paraarray[i].location,
paraarray[i].resultdef,paraarray[i].resultdef,true);
end;
location_reset(location,LOC_REGISTER,paraarray[1].location.size);
location.register:=cg.getintregister(current_asmdata.CurrAsmList,location.size);
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg(A_CMP,
paraarray[1].location.register,paraarray[2].location.register));
case inlinenumber of
in_min_dword,
in_min_longint:
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg_cond(A_CSEL,
location.register,paraarray[1].location.register,paraarray[2].location.register,C_LT));
in_max_dword,
in_max_longint:
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg_cond(A_CSEL,
location.register,paraarray[1].location.register,paraarray[2].location.register,C_GT));
else
Internalerror(2021121901);
end;
end
else
internalerror(2021121801);
end;

3
compiler/nflw.pas
View File

@ -1629,7 +1629,8 @@ implementation
(CPUXTENSA_HAS_MINMAX in cpu_capabilities[current_settings.cputype]) and is_32bitint(tassignmentnode(thenstmnt).right.resultdef) and
{$endif defined(xtensa)}
{$if defined(aarch64)}
(is_single(tassignmentnode(thenstmnt).left.resultdef) or is_double(tassignmentnode(thenstmnt).left.resultdef)) and
(is_single(tassignmentnode(thenstmnt).left.resultdef) or is_double(tassignmentnode(thenstmnt).left.resultdef) or
is_32bitint(tassignmentnode(thenstmnt).right.resultdef)) and
{$endif defined(aarch64)}
(
{ the right size of the assignment in the then clause must either }