mirror of
https://github.com/lifting-bits/remill
synced 2026-06-21 13:56:07 +00:00
Prevent the instruction category from being overwritten after a fused call/pop has been recognised (#612)
* Prevent the instruction category from being overwritten after a fused call/pop has been recognised * Move assignment up and remove conditional
This commit is contained in:
@@ -1046,6 +1046,8 @@ bool X86Arch::DecodeInstruction(uint64_t address, std::string_view inst_bytes,
|
||||
return false;
|
||||
}
|
||||
|
||||
inst.category = CreateCategory(xedd);
|
||||
|
||||
// Look for instruction fusing opportunities. For now, just `call; pop`.
|
||||
const char *is_fused_call_pop = nullptr;
|
||||
if (len < inst_bytes.size() &&
|
||||
@@ -1072,7 +1074,6 @@ bool X86Arch::DecodeInstruction(uint64_t address, std::string_view inst_bytes,
|
||||
}
|
||||
}
|
||||
|
||||
inst.category = CreateCategory(xedd);
|
||||
inst.next_pc = address + len + extra_len;
|
||||
|
||||
// Fiddle with the size of the bytes.
|
||||
|
||||
Reference in New Issue
Block a user