#include <palacios/vmm_decoder.h>
#include <palacios/vmm_instr_decoder.h>
+#ifndef V3_CONFIG_DEBUG_DECODER
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
#define MASK(val, length) ({ \
- ullong_t mask = 0x0LL; \
+ uint64_t mask = 0x0LL; \
switch (length) { \
case 1: \
mask = 0x00000000000000ffLL; \
int length = 0;
- V3_Print("Decoding Instruction at %p\n", (void *)instr_ptr);
+ PrintDebug("Decoding Instruction at %p\n", (void *)instr_ptr);
memset(instr, 0, sizeof(struct x86_instr));
// REX prefix
if (v3_get_vm_cpu_mode(core) == LONG) {
- if ((*(uint8_t *)(instr_ptr + length) & 0xf0) == 0x40) {
- *(uint8_t *)&(instr->prefixes.rex) = *(uint8_t *)(instr_ptr + length);
+ uint8_t prefix = *(uint8_t *)(instr_ptr + length);
+
+ if ((prefix & 0xf0) == 0x40) {
+ instr->prefixes.rex = 1;
+
+ instr->prefixes.rex_rm = (prefix & 0x01);
+ instr->prefixes.rex_sib_idx = ((prefix & 0x02) >> 1);
+ instr->prefixes.rex_reg = ((prefix & 0x04) >> 2);
+ instr->prefixes.rex_op_size = ((prefix & 0x08) >> 3);
+
length += 1;
}
}
form = op_code_to_form((uint8_t *)(instr_ptr + length), &length);
-
- V3_Print("\t decoded as (%s)\n", op_form_to_str(form));
+ PrintDebug("\t decoded as (%s)\n", op_form_to_str(form));
if (form == INVALID_INSTR) {
PrintError("Could not find instruction form (%x)\n", *(uint32_t *)(instr_ptr + length));
return -1;
}
length += ret;
-
instr->instr_length += length;
-
+#ifdef V3_CONFIG_DEBUG_DECODER
v3_print_instr(instr);
+#endif
return 0;
}
case MOV_IMM2:{
uint8_t reg_code = 0;
- instr->dst_operand.size = operand_width;
-
- ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand), ®_code);
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code);
if (ret == -1) {
PrintError("Error decoding operand\n");
instr->src_operand.type = IMM_OPERAND;
instr->src_operand.size = operand_width;
+
if (operand_width == 1) {
instr->src_operand.operand = *(uint8_t *)instr_ptr;
} else if (operand_width == 2) {
return -1;
}
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
+
instr_ptr += operand_width;
instr->num_operands = 2;
case MOV_2MEM: {
uint8_t reg_code = 0;
- instr->dst_operand.size = operand_width;
-
- ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand), ®_code);
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code);
if (ret == -1) {
PrintError("Error decoding operand\n");
instr->src_operand.type = REG_OPERAND;
instr->src_operand.size = operand_width;
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
+
+
decode_gpr(core, reg_code, &(instr->src_operand));
instr->num_operands = 2;
case XOR_MEM2:
case MOV_MEM2: {
uint8_t reg_code = 0;
- instr->src_operand.size = operand_width;
- ret = decode_rm_operand(core, instr_ptr, instr, &(instr->src_operand), ®_code);
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), ®_code);
+
+ if (ret == -1) {
+ PrintError("Error decoding operand\n");
+ return -1;
+ }
+
+ instr_ptr += ret;
+
+ instr->dst_operand.size = operand_width;
+ instr->dst_operand.type = REG_OPERAND;
+ decode_gpr(core, reg_code, &(instr->dst_operand));
+
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
+
+ instr->num_operands = 2;
+
+ break;
+ }
+ case MOVSX_8:
+ case MOVZX_8: {
+ uint8_t reg_code = 0;
+
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), ®_code);
+ instr->src_operand.size = 1;
+
+ if (ret == -1) {
+ PrintError("Error decoding operand\n");
+ return -1;
+ }
+
+ instr_ptr += ret;
+
+ instr->dst_operand.size = operand_width;
+ instr->dst_operand.type = REG_OPERAND;
+ decode_gpr(core, reg_code, &(instr->dst_operand));
+
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
+
+ instr->num_operands = 2;
+
+ break;
+ }
+ case MOVSX:
+ case MOVZX: {
+ uint8_t reg_code = 0;
+
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), ®_code);
+ instr->src_operand.size = 2;
if (ret == -1) {
PrintError("Error decoding operand\n");
instr->dst_operand.type = REG_OPERAND;
decode_gpr(core, reg_code, &(instr->dst_operand));
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
+
instr->num_operands = 2;
break;
case SUB_IMM2SX_8:
case XOR_IMM2SX_8: {
uint8_t reg_code = 0;
- instr->src_operand.size = operand_width;
- ret = decode_rm_operand(core, instr_ptr, instr, &(instr->src_operand), ®_code);
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code);
if (ret == -1) {
PrintError("Error decoding operand\n");
instr->src_operand.type = IMM_OPERAND;
instr->src_operand.size = operand_width;
- instr->src_operand.operand = *(sint8_t *)instr_ptr; // sign extend.
+ instr->src_operand.operand = (addr_t)MASK((sint64_t)*(sint8_t *)instr_ptr, operand_width); // sign extend.
+
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
instr_ptr += 1;
instr->src_operand.size = operand_width;
instr->src_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rsi, addr_width), &(core->segments.ds));
+
instr->dst_operand.type = MEM_OPERAND;
instr->dst_operand.size = operand_width;
instr->dst_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rdi, addr_width), &(core->segments.es));
+
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
+
instr->num_operands = 2;
break;
+ }
+ case MOV_2CR: {
+ uint8_t reg_code = 0;
+
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand),
+ ®_code);
- case MOV_2CR: {
- uint8_t reg_code = 0;
+ if (ret == -1) {
+ PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+ return -1;
+ }
+
+ instr_ptr += ret;
- instr->src_operand.size = operand_width;
+ instr->dst_operand.type = REG_OPERAND;
+ instr->dst_operand.size = operand_width;
+ decode_cr(core, reg_code, &(instr->dst_operand));
+
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
- ret = decode_rm_operand(core, instr_ptr, instr, &(instr->src_operand),
- ®_code);
+ instr->num_operands = 2;
+ break;
+ }
+ case MOV_CR2: {
+ uint8_t reg_code = 0;
+
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand),
+ ®_code);
+
+ if (ret == -1) {
+ PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+ return -1;
+ }
- if (ret == -1) {
- PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
- return -1;
- }
-
- instr_ptr += ret;
+ instr_ptr += ret;
+
+ instr->src_operand.type = REG_OPERAND;
+ instr->src_operand.size = operand_width;
+ decode_cr(core, reg_code, &(instr->src_operand));
- instr->dst_operand.type = REG_OPERAND;
- instr->dst_operand.size = operand_width;
- decode_cr(core, reg_code, &(instr->dst_operand));
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
- instr->num_operands = 2;
- break;
- }
- case MOV_CR2: {
- uint8_t reg_code = 0;
+ instr->num_operands = 2;
+ break;
+ }
+ case STOS:
+ case STOS_8: {
+ instr->is_str_op = 1;
- instr->dst_operand.size = operand_width;
+ if (instr->prefixes.rep == 1) {
+ instr->str_op_length = MASK(core->vm_regs.rcx, operand_width);
+ } else {
+ instr->str_op_length = 1;
+ }
- ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand),
- ®_code);
+ instr->src_operand.size = operand_width;
+ instr->src_operand.type = REG_OPERAND;
+ instr->src_operand.operand = (addr_t)&(core->vm_regs.rax);
- if (ret == -1) {
- PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
- return -1;
- }
+ instr->dst_operand.type = MEM_OPERAND;
+ instr->dst_operand.size = operand_width;
+ instr->dst_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rdi, addr_width), &(core->segments.es));
- instr_ptr += ret;
-
- instr->src_operand.type = REG_OPERAND;
- instr->src_operand.size = operand_width;
- decode_cr(core, reg_code, &(instr->src_operand));
+ instr->src_operand.read = 1;
+ instr->dst_operand.write = 1;
- instr->num_operands = 2;
- break;
- }
- case STOS:
- case STOS_8: {
- instr->is_str_op = 1;
-
- if (instr->prefixes.rep == 1) {
- instr->str_op_length = MASK(core->vm_regs.rcx, operand_width);
- } else {
- instr->str_op_length = 1;
- }
-
- instr->src_operand.size = operand_width;
- instr->src_operand.type = REG_OPERAND;
- instr->src_operand.operand = (addr_t)&(core->vm_regs.rax);
+ instr->num_operands = 2;
- instr->dst_operand.type = MEM_OPERAND;
- instr->dst_operand.size = operand_width;
- instr->dst_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rdi, addr_width), &(core->segments.es));
+ break;
+ }
+ case INVLPG: {
+ uint8_t reg_code = 0;
- instr->num_operands = 2;
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code);
- break;
+ if (ret == -1) {
+ PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+ return -1;
}
- case INVLPG: {
- uint8_t reg_code = 0;
- // We use the dst operand here to maintain bug-for-bug compatibility with XED
+ instr_ptr += ret;
- instr->dst_operand.size = operand_width;
+ instr->num_operands = 1;
+ break;
+ }
+ case LMSW:
+ case SMSW: {
+ uint8_t reg_code = 0;
- ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand), ®_code);
+ ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code);
- if (ret == -1) {
- PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
- return -1;
- }
+ if (ret == -1) {
+ PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+ return -1;
+ }
- instr_ptr += ret;
+ instr_ptr += ret;
- instr->num_operands = 1;
- break;
- }
- case CLTS: {
- // no operands.
- break;
+ instr->dst_operand.read = 1;
- }
+ instr->num_operands = 1;
+ break;
+ }
+ case CLTS: {
+ // no operands.
+ break;
}
default:
PrintError("Invalid Instruction form: %s\n", op_form_to_str(form));
return V3_OP_MOVZX;
-
case ADC_2MEM_8:
case ADC_2MEM:
case ADC_MEM2_8: