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

* x86-64: Bug fix where RIP-relative references were made absolute in minmax optimisations by mistake.

Browse Source
This commit is contained in:
J. Gareth "Curious Kit" Moreton 2024-04-17 20:16:22 +01:00 committed by FPK
parent 7629cdb4a5
commit e601156b8c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/x86/nx86inl.pas
View File

@ -1776,15 +1776,14 @@ implementation
begin begin
tmpreg:=hlcg.getintregister(current_asmdata.CurrAsmList,resultdef); tmpreg:=hlcg.getintregister(current_asmdata.CurrAsmList,resultdef);
hlcg.a_load_const_reg(current_asmdata.CurrAsmList,resultdef,paraarray[1].location.value,tmpreg); hlcg.a_load_const_reg(current_asmdata.CurrAsmList,resultdef,paraarray[1].location.value,tmpreg);
current_asmdata.CurrAsmList.concat(taicpu.op_reg_ref(A_CMP,opsize, emit_reg_ref(A_CMP,opsize,tmpreg,paraarray[2].location.reference);
tmpreg,paraarray[2].location.reference));
end end
else else
{$endif x86_64} {$endif x86_64}
current_asmdata.CurrAsmList.concat(taicpu.op_const_ref(A_CMP,opsize, emit_const_ref(A_CMP,opsize,paraarray[1].location.value,paraarray[2].location.reference);
paraarray[1].location.value,paraarray[2].location.reference));
instr:=TAiCpu.op_ref_reg(A_CMOVcc,opsize,paraarray[2].location.reference,location.register); emit_ref_reg(A_CMOVcc,opsize,paraarray[2].location.reference,location.register);
instr:=TAiCpu(current_asmdata.CurrAsmList.Last); { The instruction just inserted; we need to modify its condition below }
end; end;
LOC_REGISTER,LOC_CREGISTER: LOC_REGISTER,LOC_CREGISTER:
begin begin
@ -1804,6 +1803,7 @@ implementation
paraarray[1].location.value,paraarray[2].location.register)); paraarray[1].location.value,paraarray[2].location.register));
instr:=TAiCpu.op_reg_reg(A_CMOVcc,opsize,paraarray[2].location.register,location.register); instr:=TAiCpu.op_reg_reg(A_CMOVcc,opsize,paraarray[2].location.register,location.register);
current_asmdata.CurrAsmList.concat(instr); { We need to modify the instruction's condition below }
end; end;
else else
InternalError(2021121907); InternalError(2021121907);
@ -1814,17 +1814,15 @@ implementation
LOC_REFERENCE,LOC_CREFERENCE: LOC_REFERENCE,LOC_CREFERENCE:
begin begin
{ The reference has already been stored at location.register, so use that } { The reference has already been stored at location.register, so use that }
current_asmdata.CurrAsmList.concat(taicpu.op_reg_ref(A_CMP,opsize, emit_reg_ref(A_CMP,opsize,location.register,paraarray[2].location.reference);
location.register,paraarray[2].location.reference)); emit_ref_reg(A_CMOVcc,opsize,paraarray[2].location.reference,location.register);
instr:=TAiCpu(current_asmdata.CurrAsmList.Last); { The instruction just inserted; we need to modify its condition below }
instr:=TAiCpu.op_ref_reg(A_CMOVcc,opsize,paraarray[2].location.reference,location.register);
end; end;
LOC_REGISTER,LOC_CREGISTER: LOC_REGISTER,LOC_CREGISTER:
begin begin
current_asmdata.CurrAsmList.concat(taicpu.op_ref_reg(A_CMP,opsize, emit_ref_reg(A_CMP,opsize,paraarray[1].location.reference,paraarray[2].location.register);
paraarray[1].location.reference,paraarray[2].location.register));
instr:=TAiCpu.op_reg_reg(A_CMOVcc,opsize,paraarray[2].location.register,location.register); instr:=TAiCpu.op_reg_reg(A_CMOVcc,opsize,paraarray[2].location.register,location.register);
current_asmdata.CurrAsmList.concat(instr); { We need to modify the instruction's condition below }
end; end;
else else
InternalError(2021121906); InternalError(2021121906);
@ -1837,7 +1835,8 @@ implementation
current_asmdata.CurrAsmList.concat(taicpu.op_reg_ref(A_CMP,opsize, current_asmdata.CurrAsmList.concat(taicpu.op_reg_ref(A_CMP,opsize,
paraarray[1].location.register,paraarray[2].location.reference)); paraarray[1].location.register,paraarray[2].location.reference));
instr:=TAiCpu.op_ref_reg(A_CMOVcc,opsize,paraarray[2].location.reference,location.register); emit_ref_reg(A_CMOVcc,opsize,paraarray[2].location.reference,location.register);
instr:=TAiCpu(current_asmdata.CurrAsmList.Last); { The instruction just inserted; we need to modify its condition below }
end; end;
LOC_REGISTER,LOC_CREGISTER: LOC_REGISTER,LOC_CREGISTER:
begin begin
@ -1845,6 +1844,7 @@ implementation
paraarray[1].location.register,paraarray[2].location.register)); paraarray[1].location.register,paraarray[2].location.register));
instr:=TAiCpu.op_reg_reg(A_CMOVcc,opsize,paraarray[2].location.register,location.register); instr:=TAiCpu.op_reg_reg(A_CMOVcc,opsize,paraarray[2].location.register,location.register);
current_asmdata.CurrAsmList.concat(instr); { We need to modify the instruction's condition below }
end; end;
else else
InternalError(2021121905); InternalError(2021121905);
@ -1871,7 +1871,6 @@ implementation
Internalerror(2021121903); Internalerror(2021121903);
end; end;
current_asmdata.CurrAsmList.concat(instr);
cg.a_reg_dealloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS); cg.a_reg_dealloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS);
end end
else else