From 4e8ef448eda713f0b54d8ff02b2c195c6f66dccb Mon Sep 17 00:00:00 2001 From: "J. Gareth \"Curious Kit\" Moreton" Date: Tue, 17 Jan 2023 01:37:12 +0000 Subject: [PATCH] * i386: Bug fix where EBP was marked as preserved when it wasn't, causing faulty optimisations --- compiler/i386/cgcpu.pas | 12 ++++++++++-- compiler/x86/aoptx86.pas | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/compiler/i386/cgcpu.pas b/compiler/i386/cgcpu.pas index 91696a39d5..f825e44bc3 100644 --- a/compiler/i386/cgcpu.pas +++ b/compiler/i386/cgcpu.pas @@ -82,10 +82,18 @@ unit cgcpu; procedure tcg386.init_register_allocators; begin inherited init_register_allocators; - if (cs_useebp in current_settings.optimizerswitches) and assigned(current_procinfo) and (current_procinfo.framepointer<>NR_EBP) then - rg[R_INTREGISTER]:=trgcpu.create(R_INTREGISTER,R_SUBWHOLE,[RS_EAX,RS_EDX,RS_ECX,RS_EBX,RS_ESI,RS_EDI,RS_EBP],first_int_imreg,[]) + + if assigned(current_procinfo) and (current_procinfo.framepointer<>NR_EBP) then + begin + { Sometimes, whole program optimization will forego a frame pointer on leaf functions } + if (cs_useebp in current_settings.optimizerswitches) then + rg[R_INTREGISTER]:=trgcpu.create(R_INTREGISTER,R_SUBWHOLE,[RS_EAX,RS_EDX,RS_ECX,RS_EBX,RS_ESI,RS_EDI,RS_EBP],first_int_imreg,[]) + else + rg[R_INTREGISTER]:=trgcpu.create(R_INTREGISTER,R_SUBWHOLE,[RS_EAX,RS_EDX,RS_ECX,RS_EBX,RS_ESI,RS_EDI],first_int_imreg,[]); + end else rg[R_INTREGISTER]:=trgcpu.create(R_INTREGISTER,R_SUBWHOLE,[RS_EAX,RS_EDX,RS_ECX,RS_EBX,RS_ESI,RS_EDI],first_int_imreg,[RS_EBP]); + rg[R_MMXREGISTER]:=trgcpu.create(R_MMXREGISTER,R_SUBNONE,[RS_XMM0,RS_XMM1,RS_XMM2,RS_XMM3,RS_XMM4,RS_XMM5,RS_XMM6,RS_XMM7],first_mm_imreg,[]); rg[R_MMREGISTER]:=trgcpu.create(R_MMREGISTER,R_SUBWHOLE,[RS_XMM0,RS_XMM1,RS_XMM2,RS_XMM3,RS_XMM4,RS_XMM5,RS_XMM6,RS_XMM7],first_mm_imreg,[]); rgfpu:=Trgx86fpu.create; diff --git a/compiler/x86/aoptx86.pas b/compiler/x86/aoptx86.pas index f8959e9e7f..9b10e9bdab 100644 --- a/compiler/x86/aoptx86.pas +++ b/compiler/x86/aoptx86.pas @@ -1362,7 +1362,11 @@ unit aoptx86; RegSet := paramanager.get_volatile_registers_int(current_procinfo.procdef.proccalloption) + current_procinfo.saved_regs_int; - +(* + { Don't use the frame register unless explicitly allowed (fixes i40111) } + if ([cs_useebp, cs_userbp] * current_settings.optimizerswitches) = [] then + Exclude(RegSet, RS_FRAME_POINTER_REG); +*) for CurrentSuperReg in RegSet do begin CurrentReg := newreg(R_INTREGISTER, TSuperRegister(CurrentSuperReg), RegSize);