T0b1/fadec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle RVMR encodings correctly in 32-bit mode

Browse Source 
The most significant bit in the immediate is ingored in 32-bit mode.
This commit is contained in:
Alexis Engelke
2020-02-10 20:33:00 +01:00
parent f6a66ea4fb
commit 8572c15973
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
decode.c
View File

@@ -536,9 +536,24 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
#endif #endif
off += addr_size; off += addr_size;
} }
else if (UNLIKELY(imm_control == 5))
{
FdOp* operand = &instr->operands[DESC_IMM_IDX(desc)];
operand->type = FD_OT_REG;
if (UNLIKELY(off + 1 > len))
return FD_ERR_PARTIAL;
uint8_t reg = (uint8_t) LOAD_LE_1(&buffer[off]);
off += 1;
if (mode == DECODE_32)
reg &= 0x7f;
operand->reg = reg >> 4;
}
else if (imm_control != 0) else if (imm_control != 0)
{ {
FdOp* operand = &instr->operands[DESC_IMM_IDX(desc)]; FdOp* operand = &instr->operands[DESC_IMM_IDX(desc)];
operand->type = FD_OT_IMM;
uint8_t imm_size; uint8_t imm_size;
if (DESC_IMM_BYTE(desc)) if (DESC_IMM_BYTE(desc))
@@ -588,16 +603,6 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
operand->size = 8; operand->size = 8;
#endif #endif
} }
if (UNLIKELY(imm_control == 5))
{
operand->type = FD_OT_REG;
operand->reg = (instr->imm & 0xf0) >> 4;
}
else
{
operand->type = FD_OT_IMM;
}
} }
if ((prefixes & PREFIX_LOCK) && !desc->lock) if ((prefixes & PREFIX_LOCK) && !desc->lock)