paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 09:26:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix division of constants on ARM thumb without long multiplication.

Browse Source 
git-svn-id: trunk@42158 -
This commit is contained in:
Jeppe Johansen 2019-06-01 20:30:09 +00:00
parent 2f501be2a0
commit cba4aeaca5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/arm/narmmat.pas
View File

@ -164,7 +164,7 @@ implementation
cg.a_op_const_reg_reg(current_asmdata.CurrAsmList,OP_SAR,OS_INT,31,numerator,helper1); cg.a_op_const_reg_reg(current_asmdata.CurrAsmList,OP_SAR,OS_INT,31,numerator,helper1);
if GenerateThumbCode then if GenerateThumbCode then
begin begin
cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_SAR,OS_INT,32-power,helper1); cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_SHR,OS_INT,32-power,helper1);
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg(A_ADD,helper2,numerator,helper1)); current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg(A_ADD,helper2,numerator,helper1));
end end
else else
@ -179,9 +179,12 @@ implementation
else else
cg.a_op_const_reg_reg(current_asmdata.CurrAsmList,OP_SHR,OS_INT,power,numerator,resultreg) cg.a_op_const_reg_reg(current_asmdata.CurrAsmList,OP_SHR,OS_INT,power,numerator,resultreg)
end end
else {Everything else is handled the generic code} else if CPUARM_HAS_UMULL in cpu_capabilities[current_settings.cputype] then
{Everything else is handled the generic code}
cg.g_div_const_reg_reg(current_asmdata.CurrAsmList,def_cgsize(resultdef), cg.g_div_const_reg_reg(current_asmdata.CurrAsmList,def_cgsize(resultdef),
tordconstnode(right).value.svalue,numerator,resultreg); tordconstnode(right).value.svalue,numerator,resultreg)
else
internalerror(2019012601);
end; end;
{ {
@ -286,8 +289,7 @@ implementation
resultreg:=cg.getintregister(current_asmdata.CurrAsmList,size); resultreg:=cg.getintregister(current_asmdata.CurrAsmList,size);
end; end;
if (right.nodetype=ordconstn) and if (right.nodetype=ordconstn) then
(CPUARM_HAS_UMULL in cpu_capabilities[current_settings.cputype]) then
begin begin
if nodetype=divn then if nodetype=divn then
genOrdConstNodeDiv genOrdConstNodeDiv