Hi, Thanks for your patch, I think the same comments apply as the ones I just sent for your other patch (https://gcc.gnu.org/pipermail/gcc-patches/2025-July/689121.html)
Christophe On Thu, 26 Jun 2025 at 01:35, Matt Parks <matt.pa...@go-aps.com> wrote: > > Fixing issue with thumb1 code generation clobbering register. Detailed in > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117468 > > Test case included; run with: > make check-c RUNTESTFLAGS="--target-board='arm-sim/-march=armv5t' > arm.exp=pr117468.c" > > gcc/ChangeLog: > * arm.cc: fix thumb1 prologue high reg restore violates -ffixed-rX > > --- > diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc > index bde06f3fa86..73b7aed7f59 100644 > --- a/gcc/config/arm/arm.cc > +++ b/gcc/config/arm/arm.cc > @@ -8274,7 +8274,7 @@ thumb1_prologue_unused_call_clobbered_lo_regs (void) > bitmap prologue_live_out = df_get_live_out (ENTRY_BLOCK_PTR_FOR_FN (cfun)); > for (int reg = FIRST_LO_REGNUM; reg <= LAST_LO_REGNUM; reg++) > - if (!callee_saved_reg_p (reg) && !REGNO_REG_SET_P (prologue_live_out, > reg)) > + if (!callee_saved_reg_p (reg) && !REGNO_REG_SET_P (prologue_live_out, > reg) && !fixed_regs[reg]) > mask |= 1 << (reg - FIRST_LO_REGNUM); > return mask; > } > @@ -8287,7 +8287,7 @@ thumb1_epilogue_unused_call_clobbered_lo_regs (void) > bitmap epilogue_live_in = df_get_live_in (EXIT_BLOCK_PTR_FOR_FN (cfun)); > > > for (int reg = FIRST_LO_REGNUM; reg <= LAST_LO_REGNUM; reg++) > - if (!callee_saved_reg_p (reg) && !REGNO_REG_SET_P (epilogue_live_in, > reg)) > + if (!callee_saved_reg_p (reg) && !REGNO_REG_SET_P (epilogue_live_in, > reg) && !fixed_regs[reg]) > mask |= 1 << (reg - FIRST_LO_REGNUM); > return mask; > } > diff --git a/gcc/testsuite/gcc.target/arm/pr117468.c > b/gcc/testsuite/gcc.target/arm/pr117468.c > new file mode 100644 > index 00000000000..9cfc53cd8ef > --- /dev/null > +++ b/gcc/testsuite/gcc.target/arm/pr117468.c > @@ -0,0 +1,13 @@ > + > +/* { dg-do compile } */ > +/* { dg-options "-O2 -ffixed-r7" } */ > +/* { dg-require-effective-target arm_thumb1_ok } */ > +/* { dg-additional-options "-march=armv5t -mthumb" {target arm_arch_v5t_ok} > } */ > +void ext_func(int e1, int e2, int e3, int e4); > + > +int bad_func(int p1, int p2, int p3, int p4) { > + ext_func(p4, p3, p2, p1); > + return p1 + p2 + p3 + p4; > +} > + > +/* { dg-final { scan-assembler-not "pop.*r7" } } */ >
