X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_v3dec.c;h=1b2436f38c0127e24d549280e4e26875ae414ca4;hb=96fd46fc682a12bb09782319d3a09d7d71e8a39b;hp=55f1df2da4fef1a89836625f62b09d094bb4accb;hpb=847838d7621455a02df5d657914d7da163718234;p=palacios.git diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c index 55f1df2..1b2436f 100644 --- a/palacios/src/palacios/vmm_v3dec.c +++ b/palacios/src/palacios/vmm_v3dec.c @@ -21,16 +21,34 @@ #include +#define MASK(val, length) ({ \ + ullong_t mask = 0x0LL; \ + switch (length) { \ + case 1: \ + mask = 0x00000000000000ffLL; \ + break; \ + case 2: \ + mask = 0x000000000000ffffLL; \ + break; \ + case 4: \ + mask = 0x00000000ffffffffLL; \ + break; \ + case 8: \ + mask = 0xffffffffffffffffLL; \ + break; \ + } \ + val & mask; \ + }) + static v3_op_type_t op_form_to_type(op_form_t form); static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct x86_instr * instr, op_form_t form); int v3_disasm(struct guest_info * info, void *instr_ptr, addr_t * rip, int mark) { - return 0; + return -1; } - int v3_init_decoder(struct guest_info * core) { return 0; } @@ -42,42 +60,83 @@ int v3_deinit_decoder(struct guest_info * core) { int v3_encode(struct guest_info * info, struct x86_instr * instr, uint8_t * instr_buf) { - return 0; + return -1; } + int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * instr) { - op_form_t form; + op_form_t form = INVALID_INSTR; + int ret = 0; + int length = 0; + + + V3_Print("Decoding Instruction at %p\n", (void *)instr_ptr); memset(instr, 0, sizeof(struct x86_instr)); // scan for prefixes - instr_ptr += v3_get_prefixes((uint8_t *)instr_ptr, &(instr->prefixes)); + length = v3_get_prefixes((uint8_t *)instr_ptr, &(instr->prefixes)); + + + // REX prefix + if (v3_get_vm_cpu_mode(core) == LONG) { + uint8_t prefix = *(uint8_t *)(instr_ptr + length); + if ((prefix & 0xf0) == 0x40) { + instr->prefixes.rex = 1; - // check for REX prefix + 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); - form = op_code_to_form((uint8_t *)instr_ptr); + V3_Print("\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; + } + instr->op_type = op_form_to_type(form); - parse_operands(core, (uint8_t *)instr_ptr, instr, form); + ret = parse_operands(core, (uint8_t *)(instr_ptr + length), instr, form); + if (ret == -1) { + PrintError("Could not parse instruction operands\n"); + return -1; + } + length += ret; + - return 0; -} + instr->instr_length += length; + v3_print_instr(instr); + return 0; +} -static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct x86_instr * instr, op_form_t form) { +static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, + struct x86_instr * instr, op_form_t form) { // get operational mode of the guest for operand width - int operand_width = get_operand_width(core, instr, form); + uint8_t operand_width = get_operand_width(core, instr, form); + uint8_t addr_width = get_addr_width(core, instr); int ret = 0; - + uint8_t * instr_start = instr_ptr; - switch (form) { + PrintDebug("\tOperand width=%d, Addr width=%d\n", operand_width, addr_width); + + switch (form) { case ADC_IMM2_8: case ADD_IMM2_8: case AND_IMM2_8: @@ -92,10 +151,9 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct case SUB_IMM2: case XOR_IMM2: case MOV_IMM2:{ - uint8_t reg_code = 0;; - instr->dst_operand.size = operand_width; + uint8_t reg_code = 0; - ret = decode_rm_operand(core, instr_ptr, &(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"); @@ -118,6 +176,10 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct return -1; } + instr_ptr += operand_width; + + instr->num_operands = 2; + break; } case ADC_2MEM_8: @@ -136,9 +198,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct case MOV_2MEM: { uint8_t reg_code = 0; - instr->dst_operand.size = operand_width; - - ret = decode_rm_operand(core, instr_ptr, &(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"); @@ -150,10 +210,11 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct instr->src_operand.type = REG_OPERAND; instr->src_operand.size = operand_width; - decode_gpr(&(core->vm_regs), reg_code, &(instr->src_operand)); + decode_gpr(core, reg_code, &(instr->src_operand)); + + instr->num_operands = 2; break; } - case ADC_MEM2_8: case ADD_MEM2_8: case AND_MEM2_8: @@ -169,9 +230,8 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct 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->src_operand), ®_code); + ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), ®_code); if (ret == -1) { PrintError("Error decoding operand\n"); @@ -182,12 +242,12 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct instr->dst_operand.size = operand_width; instr->dst_operand.type = REG_OPERAND; - decode_gpr(&(core->vm_regs), reg_code, &(instr->dst_operand)); + decode_gpr(core, reg_code, &(instr->dst_operand)); + + instr->num_operands = 2; break; } - - case ADC_IMM2SX_8: case ADD_IMM2SX_8: case AND_IMM2SX_8: @@ -195,9 +255,8 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct 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->src_operand), ®_code); + ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), ®_code); if (ret == -1) { PrintError("Error decoding operand\n"); @@ -210,18 +269,131 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, struct instr->src_operand.size = operand_width; instr->src_operand.operand = *(sint8_t *)instr_ptr; // sign extend. + instr_ptr += 1; + + instr->num_operands = 2; + break; } + case MOVS: + case MOVS_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; + } + + // Source: DS:(E)SI + // Destination: ES:(E)DI + + instr->src_operand.type = MEM_OPERAND; + 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->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); + + if (ret == -1) { + PrintError("Error decoding operand for (%s)\n", op_form_to_str(form)); + return -1; + } + + instr_ptr += ret; + + instr->dst_operand.type = REG_OPERAND; + instr->dst_operand.size = operand_width; + decode_cr(core, reg_code, &(instr->dst_operand)); + 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; + } + + instr_ptr += ret; + + instr->src_operand.type = REG_OPERAND; + instr->src_operand.size = operand_width; + decode_cr(core, reg_code, &(instr->src_operand)); + + 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->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->num_operands = 2; + + break; + } + case INVLPG: { + uint8_t reg_code = 0; + + // We use the dst operand here to maintain bug-for-bug compatibility with XED + + 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; + } + + instr_ptr += ret; + + instr->num_operands = 1; + break; + } + case CLTS: { + // no operands. + break; + + } + } default: - PrintError("Invalid Instruction form: %d\n", form); + PrintError("Invalid Instruction form: %s\n", op_form_to_str(form)); return -1; - } - return 0; + return (instr_ptr - instr_start); } + static v3_op_type_t op_form_to_type(op_form_t form) { switch (form) { case LMSW: