From: Jack Lange <jacklange@cs.pitt.edu>
Date: Wed, 4 May 2011 02:31:09 +0000 (-0500)
Subject: added SMSW/LMSW support to internal decoder
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=fcc9a89dc9add8ba19c30bec32b3a6d70904b381;p=palacios.git

added SMSW/LMSW support to internal decoder
---

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index 6b9758c..2de8b00 100644
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -446,23 +446,40 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	}
 	case INVLPG: {
 	    uint8_t reg_code = 0;
-	    
+
 	    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->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), &reg_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));
@@ -515,7 +532,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: