X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_xed.c;h=80d785892450d70a0a7ed1595f2e70e9a50a6ebb;hb=0a4bd37f65c15fe50680e51b68f3f95ec8d347ea;hp=716ee06c13bc0a012eba086c7e37ff5474c16a67;hpb=9e5edc5349bbd8d3e8e4f0dabe78e6543f32708a;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_xed.c b/palacios/src/palacios/vmm_xed.c
index 716ee06..80d7858 100644
--- a/palacios/src/palacios/vmm_xed.c
+++ b/palacios/src/palacios/vmm_xed.c
@@ -203,11 +203,15 @@ static int decode_string_op(struct guest_info * info,
 	    return -1;
 	}
 
+
 	if (get_memory_operand(info, xed_instr, 1, &(instr->src_operand)) == -1) {
 	    PrintError("Could not get Source memory operand\n");
 	    return -1;
 	}
 
+	instr->dst_operand.write = 1;
+	instr->src_operand.read = 1;
+
 	if (instr->prefixes.rep == 1) {
 	    addr_t reg_addr = 0;
 	    uint_t reg_length = 0;
@@ -232,11 +236,15 @@ static int decode_string_op(struct guest_info * info,
 			  &(instr->src_operand.size));
 	instr->src_operand.type = REG_OPERAND;
     
+	instr->src_operand.read = 1;
+	instr->dst_operand.write = 1;
+
 	if (instr->prefixes.rep == 1) {
 	    addr_t reg_addr = 0;
 	    uint_t reg_length = 0;
 
-	    xed_reg_to_v3_reg(info, xed_decoded_inst_get_reg(xed_instr, XED_OPERAND_REG1), &reg_addr, &reg_length);
+	    xed_reg_to_v3_reg(info, xed_decoded_inst_get_reg(xed_instr, XED_OPERAND_REG1), 
+			      &reg_addr, &reg_length);
 	    instr->str_op_length = MASK(*(addr_t *)reg_addr, reg_length);
 	} else {
 	    instr->str_op_length = 1;
@@ -394,6 +402,18 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
 
 	v3_op = &(instr->dst_operand);
 
+	if ((op->_rw == XED_OPERAND_ACTION_RW) || 
+	    (op->_rw == XED_OPERAND_ACTION_R)|| 
+	    (op->_rw == XED_OPERAND_ACTION_RCW)) {
+	    v3_op->read = 1;
+	}
+
+	if ((op->_rw == XED_OPERAND_ACTION_RW) || 
+	    (op->_rw == XED_OPERAND_ACTION_W) || 
+	    (op->_rw == XED_OPERAND_ACTION_CRW)) {
+	    v3_op->write = 1;
+	}
+
 	if (xed_operand_is_register(op_enum)) {
 	    xed_reg_enum_t xed_reg =  xed_decoded_inst_get_reg(&xed_instr, op_enum);
 	    int v3_reg_type = xed_reg_to_v3_reg(info, 
@@ -460,6 +480,18 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
 	*/
 	v3_op = &(instr->src_operand);
 
+	if ((op->_rw == XED_OPERAND_ACTION_RW) || 
+	    (op->_rw == XED_OPERAND_ACTION_R)|| 
+	    (op->_rw == XED_OPERAND_ACTION_RCW)) {
+	    v3_op->read = 1;
+	}
+
+	if ((op->_rw == XED_OPERAND_ACTION_RW) || 
+	    (op->_rw == XED_OPERAND_ACTION_W) || 
+	    (op->_rw == XED_OPERAND_ACTION_CRW)) {
+	    v3_op->write = 1;
+	}
+
 	if (xed_operand_is_register(op_enum)) {
 	    xed_reg_enum_t xed_reg =  xed_decoded_inst_get_reg(&xed_instr, op_enum);
 	    int v3_reg_type = xed_reg_to_v3_reg(info, 
@@ -526,6 +558,18 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
 	xed_operand_type_enum_t op_type = xed_operand_type(op);
 	xed_operand_enum_t op_enum = xed_operand_name(op);
 
+	if ((op->_rw == XED_OPERAND_ACTION_RW) || 
+	    (op->_rw == XED_OPERAND_ACTION_R)|| 
+	    (op->_rw == XED_OPERAND_ACTION_RCW)) {
+	    instr->third_operand.read = 1;
+	}
+
+	if ((op->_rw == XED_OPERAND_ACTION_RW) || 
+	    (op->_rw == XED_OPERAND_ACTION_W) || 
+	    (op->_rw == XED_OPERAND_ACTION_CRW)) {
+	    instr->third_operand.write = 1;
+	}
+
 	if (xed_operand_is_register(op_enum)) {
 	    xed_reg_enum_t xed_reg =  xed_decoded_inst_get_reg(&xed_instr, op_enum);
 	    int v3_reg_type = xed_reg_to_v3_reg(info, 
@@ -674,7 +718,8 @@ static int get_memory_operand(struct guest_info * info,  xed_decoded_inst_t * xe
 }
 
 
-static int xed_reg_to_v3_reg(struct guest_info * info, xed_reg_enum_t xed_reg, addr_t * v3_reg, uint_t * reg_len) {
+static int xed_reg_to_v3_reg(struct guest_info * info, xed_reg_enum_t xed_reg, 
+			     addr_t * v3_reg, uint_t * reg_len) {
 
     PrintDebug("Xed Register: %s\n", xed_reg_enum_t2str(xed_reg));