X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_v3dec.c;h=c05aef163cfeea85dafe526f2be35de8a61ee84c;hb=4e43946f01f687361197dc9571b7df02ae20de30;hp=5f98b9fd6104f57a5e88f692d792c6b5a778c231;hpb=4701d2e8422bc6313ae237578d63d7f1bebd8946;p=palacios.git diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c index 5f98b9f..c05aef1 100644 --- a/palacios/src/palacios/vmm_v3dec.c +++ b/palacios/src/palacios/vmm_v3dec.c @@ -75,7 +75,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins int length = 0; - PrintDebug("Decoding Instruction at %p\n", (void *)instr_ptr); + PrintDebug(core->vm_info, core, "Decoding Instruction at %p\n", (void *)instr_ptr); memset(instr, 0, sizeof(struct x86_instr)); @@ -102,10 +102,10 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins form = op_code_to_form((uint8_t *)(instr_ptr + length), &length); - PrintDebug("\t decoded as (%s)\n", op_form_to_str(form)); + PrintDebug(core->vm_info, core, "\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)); + PrintError(core->vm_info, core, "Could not find instruction form (%x)\n", *(uint32_t *)(instr_ptr + length)); return -1; } @@ -114,7 +114,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins ret = parse_operands(core, (uint8_t *)(instr_ptr + length), instr, form); if (ret == -1) { - PrintError("Could not parse instruction operands\n"); + PrintError(core->vm_info, core, "Could not parse instruction operands\n"); return -1; } length += ret; @@ -122,8 +122,9 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins instr->instr_length += length; #ifdef V3_CONFIG_DEBUG_DECODER + V3_Print(core->vm_info, core, "Decoding Instr at %p\n", (void *)core->rip); v3_print_instr(instr); - V3_Print("CS DB FLag=%x\n", core->segments.cs.db); + V3_Print(core->vm_info, core, "CS DB FLag=%x\n", core->segments.cs.db); #endif return 0; @@ -139,7 +140,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, uint8_t * instr_start = instr_ptr; - PrintDebug("\tOperand width=%d, Addr width=%d\n", operand_width, addr_width); + PrintDebug(core->vm_info, core, "\tOperand width=%d, Addr width=%d\n", operand_width, addr_width); switch (form) { case ADC_IMM2_8: @@ -161,7 +162,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code); if (ret == -1) { - PrintError("Error decoding operand\n"); + PrintError(core->vm_info, core, "Error decoding operand\n"); return -1; } @@ -180,7 +181,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, } else if (operand_width == 8) { instr->src_operand.operand = *(sint32_t *)instr_ptr; // This is a special case for sign extended 64bit ops } else { - PrintError("Illegal operand width (%d)\n", operand_width); + PrintError(core->vm_info, core, "Illegal operand width (%d)\n", operand_width); return -1; } @@ -212,7 +213,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code); if (ret == -1) { - PrintError("Error decoding operand\n"); + PrintError(core->vm_info, core, "Error decoding operand\n"); return -1; } @@ -249,7 +250,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), ®_code); if (ret == -1) { - PrintError("Error decoding operand\n"); + PrintError(core->vm_info, core, "Error decoding operand\n"); return -1; } @@ -266,6 +267,80 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, break; } + case MOV_MEM2AL_8: + case MOV_MEM2AX: { + + /* Use AX for destination operand */ + instr->dst_operand.size = operand_width; + instr->dst_operand.type = REG_OPERAND; + instr->dst_operand.operand = (addr_t)&(core->vm_regs.rax); + instr->dst_operand.write = 1; + + /* Get the correct offset -- (seg + offset) */ + struct v3_segment * src_reg = get_instr_segment(core, instr); + addr_t offset = 0; + + if (addr_width == 2) { + offset = *(uint16_t *)instr_ptr; + } else if (addr_width == 4) { + offset = *(uint32_t *)instr_ptr; + } else if (addr_width == 8) { + offset = *(uint64_t *)instr_ptr; + } else { + PrintError(core->vm_info, core, "illegal address width for %s (width=%d)\n", + op_form_to_str(form), addr_width); + return -1; + } + + instr->src_operand.operand = ADDR_MASK(get_addr_linear(core, offset, src_reg), + get_addr_width(core, instr)); + + instr->src_operand.read = 1; + instr->src_operand.type = MEM_OPERAND; + instr->src_operand.size = addr_width; + + instr_ptr += addr_width; + instr->num_operands = 2; + + break; + } + case MOV_AL2MEM_8: + case MOV_AX2MEM: { + + /* Use AX for src operand */ + instr->src_operand.size = operand_width; + instr->src_operand.type = REG_OPERAND; + instr->src_operand.operand = (addr_t)&(core->vm_regs.rax); + instr->src_operand.write = 1; + + /* Get the correct offset -- (seg + offset) */ + struct v3_segment * dst_reg = get_instr_segment(core, instr); + addr_t offset = 0; + + if (addr_width == 2) { + offset = *(uint16_t *)instr_ptr; + } else if (addr_width == 4) { + offset = *(uint32_t *)instr_ptr; + } else if (addr_width == 8) { + offset = *(uint64_t *)instr_ptr; + } else { + PrintError(core->vm_info, core, "illegal address width for %s (width=%d)\n", + op_form_to_str(form), addr_width); + return -1; + } + + instr->dst_operand.operand = ADDR_MASK(get_addr_linear(core, offset, dst_reg), + get_addr_width(core, instr)); + + instr->dst_operand.read = 1; + instr->dst_operand.type = MEM_OPERAND; + instr->dst_operand.size = addr_width; + + instr_ptr += addr_width; + instr->num_operands = 2; + + break; + } case MOVSX_8: case MOVZX_8: { uint8_t reg_code = 0; @@ -274,7 +349,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, instr->src_operand.size = 1; if (ret == -1) { - PrintError("Error decoding operand\n"); + PrintError(core->vm_info, core, "Error decoding operand\n"); return -1; } @@ -299,7 +374,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, instr->src_operand.size = 2; if (ret == -1) { - PrintError("Error decoding operand\n"); + PrintError(core->vm_info, core, "Error decoding operand\n"); return -1; } @@ -327,7 +402,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code); if (ret == -1) { - PrintError("Error decoding operand\n"); + PrintError(core->vm_info, core, "Error decoding operand\n"); return -1; } @@ -351,7 +426,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, instr->is_str_op = 1; if (instr->prefixes.rep == 1) { - instr->str_op_length = MASK(core->vm_regs.rcx, operand_width); + instr->str_op_length = MASK(core->vm_regs.rcx, addr_width); } else { instr->str_op_length = 1; } @@ -383,7 +458,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, ®_code); if (ret == -1) { - PrintError("Error decoding operand for (%s)\n", op_form_to_str(form)); + PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form)); return -1; } @@ -406,7 +481,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, ®_code); if (ret == -1) { - PrintError("Error decoding operand for (%s)\n", op_form_to_str(form)); + PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form)); return -1; } @@ -427,7 +502,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, instr->is_str_op = 1; if (instr->prefixes.rep == 1) { - instr->str_op_length = MASK(core->vm_regs.rcx, operand_width); + instr->str_op_length = MASK(core->vm_regs.rcx, addr_width); } else { instr->str_op_length = 1; } @@ -447,13 +522,22 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, break; } + case INT: { + instr->dst_operand.type = IMM_OPERAND; + instr->dst_operand.size = operand_width; + instr->dst_operand.operand = *(uint8_t *)instr_ptr; + instr_ptr += operand_width; + instr->num_operands = 1; + + break; + } case INVLPG: { 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)); + PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form)); return -1; } @@ -469,7 +553,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, 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)); + PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form)); return -1; } @@ -485,7 +569,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, break; } default: - PrintError("Invalid Instruction form: %s\n", op_form_to_str(form)); + PrintError(core->vm_info, core, "Invalid Instruction form: %s\n", op_form_to_str(form)); return -1; } @@ -504,7 +588,7 @@ static v3_op_type_t op_form_to_type(op_form_t form) { case INVLPG: return V3_OP_INVLPG; - case INT: + case INT: return V3_OP_INT; case MOV_CR2: