Skip to content

Fix the unwind opcode for new APX registers #112799

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
kunalspathak merged 2 commits into from
Feb 22, 2025
Merged

Fix the unwind opcode for new APX registers #112799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
744ba65
Fix the unwind opcode for new registers
kunalspathak Feb 21, 2025
e27adee
Merge branch 'main' into unwind-apx
kunalspathak Feb 22, 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
26 changes: 25 additions & 1 deletion src/coreclr/jit/unwindamd64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,30 @@ short Compiler::mapRegNumToDwarfReg(regNumber reg)
case REG_R15:
dwarfReg = 15;
break;
case REG_R16:
dwarfReg = 16;
break;
case REG_R17:
dwarfReg = 17;
break;
case REG_R18:
dwarfReg = 18;
break;
case REG_R19:
dwarfReg = 19;
break;
case REG_R20:
dwarfReg = 20;
break;
case REG_R21:
dwarfReg = 21;
break;
case REG_R22:
dwarfReg = 22;
break;
case REG_R23:
dwarfReg = 23;
break;
default:
noway_assert(!"unexpected REG_NUM");
}
Expand Down Expand Up @@ -399,7 +423,7 @@ void Compiler::unwindSaveRegWindows(regNumber reg, unsigned offset)
code = (UNWIND_CODE*)&func->unwindCodes[func->unwindCodeSlot -= sizeof(UNWIND_CODE)];
code->UnwindOp = (genIsValidFloatReg(reg)) ? UWOP_SAVE_XMM128_FAR : UWOP_SAVE_NONVOL_FAR;
}
code->OpInfo = (BYTE)reg;
code->OpInfo = (BYTE)(genIsValidFloatReg(reg) ? reg - XMMBASE : reg);
Copy link
Member

@tannergooding tannergooding Feb 22, 2025

Choose a reason for hiding this comment

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

Can we add an assert that genIsValidIntReg(reg) for the else case, to help catch any future bugs or expansions in this space?

Copy link
Contributor

@BruceForstall BruceForstall Feb 22, 2025

Choose a reason for hiding this comment

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

We could even assert on the actual range of the computed value, since the unwind codes are well-defined and if they change, we want the assert to hit.

Copy link
Contributor Author

@kunalspathak kunalspathak Feb 22, 2025

Choose a reason for hiding this comment

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

let me do it as a follow up PR and merge this as is to unblock weekend runs.

unsigned int cbProlog = unwindGetCurrentOffset(func);
noway_assert((BYTE)cbProlog == cbProlog);
code->CodeOffset = (BYTE)cbProlog;
Expand Down
Loading