X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_v3dec.c;h=343be383701c7bfcce26a6d303141d63da65d043;hb=3c6a3b61c1fbd76c55c63440276d21fa8e79ab16;hp=ac9eb695b100d760d74b2168e009a15ebae9dddb;hpb=b4bf1f847791efa011e6cd121face4c930759923;p=palacios.git diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c index ac9eb69..343be38 100644 --- a/palacios/src/palacios/vmm_v3dec.c +++ b/palacios/src/palacios/vmm_v3dec.c @@ -20,7 +20,7 @@ #include #include -#ifndef CONFIG_DEBUG_DECODER +#ifndef V3_CONFIG_DEBUG_DECODER #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -75,7 +75,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins 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)); @@ -102,7 +102,7 @@ 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); - 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)); @@ -121,7 +121,11 @@ 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("Decoding Instr at %p\n", (void *)core->rip); v3_print_instr(instr); + V3_Print("CS DB FLag=%x\n", core->segments.cs.db); +#endif return 0; } @@ -151,8 +155,8 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, case AND_IMM2: case OR_IMM2: case SUB_IMM2: - case XOR_IMM2: - case MOV_IMM2:{ + case XOR_IMM2: + case MOV_IMM2: { uint8_t reg_code = 0; ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code); @@ -174,6 +178,8 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, instr->src_operand.operand = *(uint16_t *)instr_ptr; } else if (operand_width == 4) { instr->src_operand.operand = *(uint32_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); return -1; @@ -195,17 +201,13 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, case SUB_2MEM_8: case XOR_2MEM_8: case MOV_2MEM_8: - case MOVSX_8: - case MOVZX_8: case ADC_2MEM: case ADD_2MEM: case AND_2MEM: case OR_2MEM: case SUB_2MEM: case XOR_2MEM: - case MOV_2MEM: - case MOVSX: - case MOVZX: { + case MOV_2MEM: { uint8_t reg_code = 0; ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), ®_code); @@ -265,6 +267,56 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr, 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"); + 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 ADC_IMM2SX_8: case ADD_IMM2SX_8: case AND_IMM2SX_8: @@ -300,7 +352,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; } @@ -354,14 +406,13 @@ 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)); 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)); @@ -377,7 +428,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; } @@ -397,25 +448,51 @@ 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)); return -1; } - + instr_ptr += ret; - + + instr->num_operands = 1; + break; + } + case LMSW: + case SMSW: { + 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->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)); @@ -437,12 +514,14 @@ static v3_op_type_t op_form_to_type(op_form_t form) { case INVLPG: return V3_OP_INVLPG; + case INT: + return V3_OP_INT; + case MOV_CR2: return V3_OP_MOVCR2; case MOV_2CR: return V3_OP_MOV2CR; - case MOV_MEM2_8: case MOV_MEM2: case MOV_2MEM_8: @@ -468,7 +547,6 @@ static v3_op_type_t op_form_to_type(op_form_t form) { return V3_OP_MOVZX; - case ADC_2MEM_8: case ADC_2MEM: case ADC_MEM2_8: