Skip to content

Fix lazy machine state unwinding for MSVC epilogues on x86 #45906

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
jkotas merged 1 commit into from
Feb 17, 2021
Merged

Fix lazy machine state unwinding for MSVC epilogues on x86 #45906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/coreclr/vm/i386/gmsx86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,8 @@ void LazyMachState::unwindLazyState(LazyMachState* baseState,
case 0x89: // MOV r/m, reg
if (ip[1] == 0xEC) // MOV ESP, EBP
goto mov_esp_ebp;
if (ip[1] == 0xDC) // MOV ESP, EBX
goto mov_esp_ebx;
// FALL THROUGH

case 0x18: // SBB r/m8, r8
Expand Down Expand Up @@ -932,6 +934,13 @@ void LazyMachState::unwindLazyState(LazyMachState* baseState,
break;
}

if (ip[1] == 0xE3) { // MOV ESP, EBX
mov_esp_ebx:
ESP = PTR_TADDR(lazyState->_ebx);
ip += 2;
break;
}

if ((ip[1] & 0xc7) == 0x4 && ip[2] == 0x24) // move reg, [esp]
{
if ( ip[1] == 0x1C ) { // MOV EBX, [ESP]
Expand Down