Skip to content

[llvm-readobj] [ARMWinEH] Fix printing of packed unwind with H=1, RegI=RegF=0, CR!=1 #170294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mstorsjo merged 2 commits into from
Dec 3, 2025
Merged

[llvm-readobj] [ARMWinEH] Fix printing of packed unwind with H=1, RegI=RegF=0, CR!=1 #170294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
362c71f
[llvm-readobj] [ARMWinEH] Fix printing of packed unwind with H=1, Reg…
mstorsjo Dec 2, 2025
ceb78b9
Add a testcase for FrameSize=528
mstorsjo Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions llvm/test/tools/llvm-readobj/COFF/arm64-packed-unwind.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,7 @@
// CHECK-NEXT: CR: 0
// CHECK-NEXT: FrameSize: 112
// CHECK-NEXT: Prologue [
// CHECK-NEXT: sub sp, sp, #48
// CHECK-NEXT: stp x6, x7, [sp, #48]
// CHECK-NEXT: stp x4, x5, [sp, #32]
// CHECK-NEXT: stp x2, x3, [sp, #16]
// CHECK-NEXT: stp x0, x1, [sp, #-64]!
// CHECK-NEXT: sub sp, sp, #112
// CHECK-NEXT: end
// CHECK-NEXT: ]
// CHECK-NEXT: }
Expand Down Expand Up @@ -276,6 +272,37 @@
// CHECK-NEXT: end
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: RuntimeFunction {
// CHECK-NEXT: Function: func17
// CHECK-NEXT: Fragment: No
// CHECK-NEXT: FunctionLength: 44
// CHECK-NEXT: RegF: 0
// CHECK-NEXT: RegI: 0
// CHECK-NEXT: HomedParameters: Yes
// CHECK-NEXT: CR: 3
// CHECK-NEXT: FrameSize: 96
// CHECK-NEXT: Prologue [
// CHECK-NEXT: mov x29, sp
// CHECK-NEXT: stp x29, lr, [sp, #-96]!
// CHECK-NEXT: end
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: RuntimeFunction {
// CHECK-NEXT: Function: func18
// CHECK-NEXT: Fragment: No
// CHECK-NEXT: FunctionLength: 44
// CHECK-NEXT: RegF: 0
// CHECK-NEXT: RegI: 0
// CHECK-NEXT: HomedParameters: Yes
// CHECK-NEXT: CR: 3
// CHECK-NEXT: FrameSize: 528
// CHECK-NEXT: Prologue [
// CHECK-NEXT: mov x29, sp
// CHECK-NEXT: stp x29, lr, [sp, #0]
// CHECK-NEXT: sub sp, sp, #528
// CHECK-NEXT: end
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: ]

.text
Expand All @@ -296,6 +323,8 @@ func13:
func14:
func15:
func16:
func17:
func18:
ret

.section .pdata,"dr"
Expand Down Expand Up @@ -331,3 +360,7 @@ func16:
.long 0x11820019 // FunctionLength=6 RegF=0 RegI=2 H=0 CR=0 FrameSize=34
.long func16@IMGREL
.long 0x03b00039 // FunctionLength=14 RegF=0 RegI=0 H=1 CR=1 FrameSize=7
.long func17@IMGREL
.long 0x0370002d // FunctionLength=11 RegF=0 RegI=0 H=1 CR=3 FrameSize=6
.long func18@IMGREL
.long 0x10f0002d // FunctionLength=11 RegF=0 RegI=0 H=1 CR=3 FrameSize=6
17 changes: 8 additions & 9 deletions llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,6 +1404,12 @@ bool Decoder::dumpPackedARM64Entry(const object::COFFObjectFile &COFF,
FpSZ += 8;
int SavSZ = (IntSZ + FpSZ + 8 * 8 * RF.H() + 0xf) & ~0xf;
int LocSZ = (RF.FrameSize() << 4) - SavSZ;
bool Homing = RF.H();

if (RF.H() && RF.RegI() == 0 && RF.RegF() == 0 && RF.CR() != 1) {
LocSZ += SavSZ;
Homing = false;
Copy link
Collaborator

@efriedma-quic efriedma-quic Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a testcase with FrameSize == 528, to show that we emit the correct SP adjustment sequence.

Copy link
Member Author

@mstorsjo mstorsjo Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, done.

}

if (RF.CR() == 2 || RF.CR() == 3) {
SW.startLine() << "mov x29, sp\n";
Expand All @@ -1419,18 +1425,11 @@ bool Decoder::dumpPackedARM64Entry(const object::COFFObjectFile &COFF,
} else if ((RF.CR() != 3 && RF.CR() != 2 && LocSZ > 0) || LocSZ > 512) {
SW.startLine() << format("sub sp, sp, #%d\n", LocSZ);
}
if (RF.H()) {
if (Homing) {
SW.startLine() << format("stp x6, x7, [sp, #%d]\n", SavSZ - 16);
SW.startLine() << format("stp x4, x5, [sp, #%d]\n", SavSZ - 32);
SW.startLine() << format("stp x2, x3, [sp, #%d]\n", SavSZ - 48);
if (RF.RegI() > 0 || RF.RegF() > 0 || RF.CR() == 1) {
SW.startLine() << format("stp x0, x1, [sp, #%d]\n", SavSZ - 64);
} else {
// This case isn't documented; if neither RegI nor RegF nor CR=1
// have decremented the stack pointer by SavSZ, we need to do it here
// (as the final stack adjustment of LocSZ excludes SavSZ).
SW.startLine() << format("stp x0, x1, [sp, #-%d]!\n", SavSZ);
}
SW.startLine() << format("stp x0, x1, [sp, #%d]\n", SavSZ - 64);
}
int FloatRegs = RF.RegF() > 0 ? RF.RegF() + 1 : 0;
for (int I = (FloatRegs + 1) / 2 - 1; I >= 0; I--) {
Expand Down