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

decode: Remove several unneeded #ifdef's

Browse Source 
In many cases, the compiler is able to figure out itself whether support
for one decoding mode is disabled.
This commit is contained in:
Alexis Engelke
2020-06-19 10:05:21 +02:00
parent 348d1aec4b
commit 55197817a7
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
decode.c
View File

@@ -52,9 +52,7 @@ typedef enum DecodeMode DecodeMode;
#define LOAD_LE_2(buf) (LOAD_LE_1(buf) | LOAD_LE_1((uint8_t*) (buf) + 1)<<8) #define LOAD_LE_2(buf) (LOAD_LE_1(buf) | LOAD_LE_1((uint8_t*) (buf) + 1)<<8)
#define LOAD_LE_3(buf) (LOAD_LE_2(buf) | LOAD_LE_1((uint8_t*) (buf) + 2)<<16) #define LOAD_LE_3(buf) (LOAD_LE_2(buf) | LOAD_LE_1((uint8_t*) (buf) + 2)<<16)
#define LOAD_LE_4(buf) (LOAD_LE_2(buf) | LOAD_LE_2((uint8_t*) (buf) + 2)<<16) #define LOAD_LE_4(buf) (LOAD_LE_2(buf) | LOAD_LE_2((uint8_t*) (buf) + 2)<<16)
#if defined(ARCH_X86_64)
#define LOAD_LE_8(buf) (LOAD_LE_4(buf) | LOAD_LE_4((uint8_t*) (buf) + 4)<<32) #define LOAD_LE_8(buf) (LOAD_LE_4(buf) | LOAD_LE_4((uint8_t*) (buf) + 4)<<32)
#endif
enum PrefixSet enum PrefixSet
{ {
@@ -314,20 +312,25 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
FdInstr* instr) FdInstr* instr)
{ {
const uint16_t* table = NULL; const uint16_t* table = NULL;
DecodeMode mode;
int len = len_sz > 15 ? 15 : len_sz; int len = len_sz > 15 ? 15 : len_sz;
DecodeMode mode = mode_int == 32 ? DECODE_32 :
mode_int == 64 ? DECODE_64 : -1;
// Ensure that we can actually handle the decode request // Ensure that we can actually handle the decode request
if (mode_int == 32)
{
#if defined(ARCH_386) #if defined(ARCH_386)
if (mode == DECODE_32)
table = &_decode_table[FD_TABLE_OFFSET_32]; table = &_decode_table[FD_TABLE_OFFSET_32];
mode = DECODE_32;
#endif #endif
}
else if (mode_int == 64)
{
#if defined(ARCH_X86_64) #if defined(ARCH_X86_64)
if (mode == DECODE_64)
table = &_decode_table[FD_TABLE_OFFSET_64]; table = &_decode_table[FD_TABLE_OFFSET_64];
mode = DECODE_64;
#endif #endif
}
if (UNLIKELY(table == NULL)) if (UNLIKELY(table == NULL))
return FD_ERR_INTERNAL; return FD_ERR_INTERNAL;
@@ -478,10 +481,8 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
{ {
FdOp* operand = &instr->operands[DESC_VEXREG_IDX(desc)]; FdOp* operand = &instr->operands[DESC_VEXREG_IDX(desc)];
operand->type = FD_OT_REG; operand->type = FD_OT_REG;
#if defined(ARCH_386)
if (mode == DECODE_32) if (mode == DECODE_32)
vex_operand &= 0x7; vex_operand &= 0x7;
#endif
operand->reg = vex_operand; operand->reg = vex_operand;
} }
else if (vex_operand != 0) else if (vex_operand != 0)
@@ -507,16 +508,12 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
if (UNLIKELY(off + addr_size > len)) if (UNLIKELY(off + addr_size > len))
return FD_ERR_PARTIAL; return FD_ERR_PARTIAL;
#if defined(ARCH_386)
if (addr_size == 2) if (addr_size == 2)
instr->disp = LOAD_LE_2(&buffer[off]); instr->disp = LOAD_LE_2(&buffer[off]);
#endif
if (addr_size == 4) if (addr_size == 4)
instr->disp = LOAD_LE_4(&buffer[off]); instr->disp = LOAD_LE_4(&buffer[off]);
#if defined(ARCH_X86_64) if (LIKELY(addr_size == 8))
if (addr_size == 8)
instr->disp = LOAD_LE_8(&buffer[off]); instr->disp = LOAD_LE_8(&buffer[off]);
#endif
off += addr_size; off += addr_size;
} }
else if (UNLIKELY(imm_control == 3)) else if (UNLIKELY(imm_control == 3))
@@ -557,11 +554,9 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
imm_size = 3; imm_size = 3;
else if (op_size == 2) else if (op_size == 2)
imm_size = 2; imm_size = 2;
#if defined(ARCH_X86_64)
else if (mode == DECODE_64 && (prefixes & PREFIX_REXW) && else if (mode == DECODE_64 && (prefixes & PREFIX_REXW) &&
instr->type == FDI_MOVABS) instr->type == FDI_MOVABS)
imm_size = 8; imm_size = 8;
#endif
else else
imm_size = 4; imm_size = 4;
@@ -576,10 +571,8 @@ fd_decode(const uint8_t* buffer, size_t len_sz, int mode_int, uintptr_t address,
instr->imm = LOAD_LE_3(&buffer[off]); instr->imm = LOAD_LE_3(&buffer[off]);
else if (imm_size == 4) else if (imm_size == 4)
instr->imm = (int32_t) LOAD_LE_4(&buffer[off]); instr->imm = (int32_t) LOAD_LE_4(&buffer[off]);
#if defined(ARCH_X86_64)
else if (imm_size == 8) else if (imm_size == 8)
instr->imm = (int64_t) LOAD_LE_8(&buffer[off]); instr->imm = (int64_t) LOAD_LE_8(&buffer[off]);
#endif
off += imm_size; off += imm_size;
if (imm_offset) if (imm_offset)