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

* overflow checking for generic abs(<int64>)

Browse Source 
* fix overflow checking on arm for 64 bit signed numbers
  * arm uses generic abs(<int64>)
This commit is contained in:
florian 2024-03-29 20:06:23 +01:00
parent 8132ccd42b
commit c87213085f
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/arm/cgcpu.pas
View File

@ -3663,10 +3663,10 @@ unit cgcpu;
else else
internalerror(2003083102); internalerror(2003083102);
end; end;
ovloc.loc:=LOC_FLAGS;
if size=OS_64 then if size=OS_64 then
begin begin
{ the arm has an weired opinion how flags for SUB/ADD are handled } { arm has a weired opinion how flags for SUB/ADD are handled }
ovloc.loc:=LOC_FLAGS;
case op of case op of
OP_ADD: OP_ADD:
ovloc.resflags:=F_CS; ovloc.resflags:=F_CS;
@ -3675,7 +3675,9 @@ unit cgcpu;
else else
internalerror(2019050917); internalerror(2019050917);
end; end;
end; end
else
ovloc.resflags:=F_VS;
end end
else else
begin begin

43
compiler/arm/narminl.pas
View File

@ -414,7 +414,7 @@ implementation
opsize : tcgsize; opsize : tcgsize;
ovloc: tlocation; ovloc: tlocation;
begin begin
if GenerateThumbCode then if GenerateThumbCode or is_64bitint(left.resultdef) then
begin begin
inherited second_abs_long; inherited second_abs_long;
exit; exit;
@ -422,35 +422,24 @@ implementation
secondpass(left); secondpass(left);
opsize:=def_cgsize(left.resultdef); opsize:=def_cgsize(left.resultdef);
if is_64bitint(left.resultdef) then hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,left.resultdef,true);
location:=left.location;
location.register:=cg.getintregister(current_asmdata.CurrAsmList,opsize);
cg.a_reg_alloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS);
current_asmdata.CurrAsmList.concat(setoppostfix(taicpu.op_reg_reg(A_MOV,location.register,left.location.register), PF_S));
if GenerateThumb2Code then
current_asmdata.CurrAsmList.concat(taicpu.op_cond(A_IT,C_MI));
if cs_check_overflow in current_settings.localswitches then
begin begin
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,left.resultdef,false); current_asmdata.CurrAsmList.concat(setoppostfix(setcondition(taicpu.op_reg_reg_const(A_RSB,location.register,location.register, 0), C_MI),PF_S));
location:=left.location; location_reset(ovloc,LOC_VOID,opsize);
location.register64.reglo:=cg.getintregister(current_asmdata.CurrAsmList,OS_32); cg.g_overflowCheck_loc(current_asmdata.CurrAsmList,ovloc,resultdef,ovloc);
location.register64.reghi:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
cg64.a_load64_reg_reg(current_asmdata.CurrAsmList,left.location.register64,location.register64);
cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_SAR,OS_32,31,left.location.register64.reghi);
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_XOR,OS_32,left.location.register64.reghi,location.register64.reglo);
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_XOR,OS_32,left.location.register64.reghi,location.register64.reghi);
current_asmdata.CurrAsmList.concat(setoppostfix(taicpu.op_reg_reg_reg(A_SUB,location.register64.reglo,location.register64.reglo,left.location.register64.reghi), PF_S));
current_asmdata.CurrAsmList.concat(setoppostfix(taicpu.op_reg_reg_reg(A_SBC,location.register64.reghi,location.register64.reghi,left.location.register64.reghi), PF_S));
end end
else else
begin current_asmdata.CurrAsmList.concat(setcondition(taicpu.op_reg_reg_const(A_RSB,location.register,location.register, 0), C_MI));
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,left.resultdef,true);
location:=left.location;
location.register:=cg.getintregister(current_asmdata.CurrAsmList,opsize);
cg.a_reg_alloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS);
current_asmdata.CurrAsmList.concat(setoppostfix(taicpu.op_reg_reg(A_MOV,location.register,left.location.register), PF_S));
if GenerateThumb2Code then
current_asmdata.CurrAsmList.concat(taicpu.op_cond(A_IT,C_MI));
current_asmdata.CurrAsmList.concat(setoppostfix(setcondition(taicpu.op_reg_reg_const(A_RSB,location.register,location.register, 0), C_MI),PF_S));
end;
location_reset(ovloc,LOC_VOID,opsize);
cg.g_overflowCheck_loc(current_asmdata.CurrAsmList,ovloc,resultdef,ovloc);
cg.a_reg_dealloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS); cg.a_reg_dealloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS);
end; end;

11
compiler/ncginl.pas
View File

@ -759,6 +759,7 @@ implementation
tempreg1, tempreg2: tregister; tempreg1, tempreg2: tregister;
{$if not(defined(cpu64bitalu))} {$if not(defined(cpu64bitalu))}
tempreg64: tregister64; tempreg64: tregister64;
ovloc: tlocation;
{$endif not(defined(cpu64bitalu))} {$endif not(defined(cpu64bitalu))}
begin begin
secondpass(left); secondpass(left);
@ -774,8 +775,14 @@ implementation
cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_SAR,OS_32,31,left.location.register64.reghi); cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_SAR,OS_32,31,left.location.register64.reghi);
tempreg64.reghi:=left.location.register64.reghi; tempreg64.reghi:=left.location.register64.reghi;
tempreg64.reglo:=left.location.register64.reghi; tempreg64.reglo:=left.location.register64.reghi;
cg64.a_op64_reg_reg(current_asmdata.CurrAsmList,OP_XOR,OS_64,tempreg64,location.register64); cg64.a_op64_reg_reg(current_asmdata.CurrAsmList,OP_XOR,def_cgsize(resultdef),tempreg64,location.register64);
cg64.a_op64_reg_reg_reg(current_asmdata.CurrAsmList,OP_SUB,OS_64,tempreg64,location.register64,location.register64); if cs_check_overflow in current_settings.localswitches then
begin
cg64.a_op64_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,def_cgsize(resultdef),tempreg64,location.register64,location.register64,true,ovloc);
hlcg.g_overflowcheck_loc(current_asmdata.CurrAsmList,Location,resultdef,ovloc);
end
else
cg64.a_op64_reg_reg_reg(current_asmdata.CurrAsmList,OP_SUB,def_cgsize(resultdef),tempreg64,location.register64,location.register64);
end end
else else
{$endif not(defined(cpu64bitalu))} {$endif not(defined(cpu64bitalu))}