X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_v3dec.c;h=4fa6e04004d399b2867c03c436d0b79f68e2a77c;hb=1c208772eda5eab05cd36d059ec6947da3e7c929;hp=ac9eb695b100d760d74b2168e009a15ebae9dddb;hpb=b4bf1f847791efa011e6cd121face4c930759923;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index ac9eb69..4fa6e04 100644
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -195,17 +195,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), &reg_code);
@@ -265,6 +261,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), &reg_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), &reg_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:
@@ -354,14 +400,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),
 				    &reg_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));