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

m68k: fix tw40182 test

Browse Source
This commit is contained in:
Karoly Balogh 2024-01-09 10:57:11 +01:00
parent 88ffc9e228
commit 19fe377455
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/m68k/n68kadd.pas
View File

@ -624,7 +624,6 @@ implementation
list:=current_asmdata.CurrAsmList;
pass_left_right;
location_reset(location,LOC_REGISTER,def_cgsize(resultdef));
hlcg.location_force_reg(list,left.location,left.resultdef,left.resultdef,true);
{ calculate 32-bit terms lo(right)*hi(left) and hi(left)*lo(right) }
hreg1:=NR_NO;
@ -632,6 +631,19 @@ implementation
tmpreg:=NR_NO;
if (right.location.loc=LOC_CONSTANT) then
begin
{ if left has side effects, it could be that this code is called with right.location.value64=0,
see also #40182 }
if right.location.value64=0 then
begin
location.register64.reglo:=cg.getintregister(list,OS_INT);
cg.a_load_const_reg(list,OS_INT,0,location.register64.reglo);
location.register64.reghi:=cg.getintregister(list,OS_INT);
cg.a_load_const_reg(list,OS_INT,0,location.register64.reghi);
exit;
end;
hlcg.location_force_reg(list,left.location,left.resultdef,left.resultdef,true);
//list.concat(tai_comment.create(strpnew('second_mul64bit: with const')));
{ Omit zero terms, if any }
if hi(right.location.value64)<>0 then
@ -652,6 +664,7 @@ implementation
else
begin
//list.concat(tai_comment.create(strpnew('second_mul64bit: no const')));
hlcg.location_force_reg(list,left.location,left.resultdef,left.resultdef,true);
hlcg.location_force_reg(list,right.location,right.resultdef,right.resultdef,true);
tmpreg:=right.location.register64.reglo;
hreg1:=cg.getintregister(list,OS_INT);