Skip to content

Fix stack adjustment for x86 pop r16 #8050

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

Open
haileys wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −11
Open

Fix stack adjustment for x86 pop r16 #8050

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
24 changes: 13 additions & 11 deletions arch/x86/il.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3141,6 +3141,15 @@ bool GetLowLevelILForInstruction(Architecture* arch, const uint64_t addr, LowLev
break;

case XED_ICLASS_POP:
{
const unsigned int stackAdjustment = xed_decoded_inst_get_memory_operand_length(xedd, 0);
auto expr = il.Pop(stackAdjustment);
il.AddInstruction(WriteILOperand(il, xedd, addr, 0, 0,
opOneLen == stackAdjustment ? expr :
il.LowPart(opOneLen, expr)));
break;
}

case XED_ICLASS_POPP:
il.AddInstruction(
WriteILOperand(il, xedd, addr, 0, 0,
Expand Down Expand Up @@ -3287,17 +3296,10 @@ bool GetLowLevelILForInstruction(Architecture* arch, const uint64_t addr, LowLev
// https://stackoverflow.com/questions/43435764/64-bit-mode-does-not-support-32-bit-push-and-pop-instructions
// for more details
const unsigned int stackAdjustment = xed_decoded_inst_get_memory_operand_length(xedd, 0);
if (opOneLen != stackAdjustment)
{
il.AddInstruction(
il.Push(stackAdjustment,
il.ZeroExtend(stackAdjustment,
ReadILOperand(il, xedd, addr, 0, 0))));
}
else
il.AddInstruction(
il.Push(stackAdjustment,
ReadILOperand(il, xedd, addr, 0, 0)));
auto expr = ReadILOperand(il, xedd, addr, 0, 0);
il.AddInstruction(il.Push(stackAdjustment,
opOneLen == stackAdjustment ? expr :
il.ZeroExtend(stackAdjustment, expr)));
break;
}

Expand Down