removed muxer

[palacios.git] / palacios / src / palacios / vmm_xed.c

diff --git a/palacios/src/palacios/vmm_xed.c b/palacios/src/palacios/vmm_xed.c
index f140d1a..bb1e856 100644 (file)
--- a/palacios/src/palacios/vmm_xed.c
+++ b/palacios/src/palacios/vmm_xed.c
@@ -35,7 +35,7 @@
 
 
 
-#ifndef CONFIG_DEBUG_XED
+#ifndef CONFIG_DEBUG_DECODER
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -187,55 +187,6 @@ int v3_deinit_decoder(struct guest_info * core) {
 }
 
 
-int v3_basic_mem_decode(struct guest_info * info, addr_t instr_ptr, struct basic_instr_info * instr_info) {
-    xed_decoded_inst_t xed_instr;
-    xed_error_enum_t xed_error;
-  
-
-    if (set_decoder_mode(info, info->decoder_state) == -1) {
-       PrintError("Could not set decoder mode\n");
-       return -1;
-    }
-
-
-    xed_decoded_inst_zero_set_mode(&xed_instr, info->decoder_state);
-
-    xed_error = xed_decode(&xed_instr, 
-                          REINTERPRET_CAST(const xed_uint8_t *, instr_ptr), 
-                          XED_MAX_INSTRUCTION_BYTES);
-
-    if (xed_error != XED_ERROR_NONE) {
-       PrintError("Xed error: %s\n", xed_error_enum_t2str(xed_error));
-       return -1;
-    }
-
-    instr_info->instr_length = xed_decoded_inst_get_length(&xed_instr);
-
-
-    if (xed_decoded_inst_number_of_memory_operands(&xed_instr) == 0) {
-       PrintError("Tried to decode memory operation with no memory operands\n");
-       return -1;
-    }
-
-    instr_info->op_size = xed_decoded_inst_get_memory_operand_length(&xed_instr, 0);
-
-
-    xed_category_enum_t cat = xed_decoded_inst_get_category(&xed_instr);
-    if (cat == XED_CATEGORY_STRINGOP) {
-       instr_info->str_op = 1;
-    } else {
-       instr_info->str_op = 0;
-    }
-
-    xed_operand_values_t * operands = xed_decoded_inst_operands(&xed_instr);
-    if (xed_operand_values_has_real_rep(operands)) {
-       instr_info->has_rep = 1;
-    } else {
-       instr_info->has_rep = 0;
-    }
-
-    return 0;
-}
 
 
 static int decode_string_op(struct guest_info * info, 
@@ -252,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;
@@ -281,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;
@@ -354,6 +313,8 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
     xed_decoded_inst_t xed_instr;
     xed_error_enum_t xed_error;
 
+    memset(instr, 0, sizeof(struct x86_instr));
+
 
     v3_get_prefixes((uchar_t *)instr_ptr, &(instr->prefixes));
 
@@ -381,7 +342,7 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
 
     xed_iform_enum_t iform = xed_decoded_inst_get_iform_enum(&xed_instr);
 
-#ifdef CONFIG_DEBUG_XED
+#ifdef CONFIG_DEBUG_DECODER
     xed_iclass_enum_t iclass = xed_decoded_inst_get_iclass(&xed_instr);
 
     PrintDebug("iform=%s, iclass=%s\n", xed_iform_enum_t2str(iform), xed_iclass_enum_t2str(iclass));
@@ -490,6 +451,18 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
                    return -1;
            }
        }
+
+       V3_Print("Operand 0 mode: %s\n", xed_operand_action_enum_t2str(xed_operand_rw(op)));
+
+
+       if (xed_operand_read(op)) {
+           v3_op->read = 1;
+       }
+
+       if (xed_operand_written(op)) {
+           v3_op->write = 1;
+       }
+
     }
 
     // set second operand
@@ -509,6 +482,7 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
        */
        v3_op = &(instr->src_operand);
 
+
        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, 
@@ -567,6 +541,17 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
                    return -1;
            }
        }
+
+       V3_Print("Operand 1 mode: %s\n", xed_operand_action_enum_t2str(xed_operand_rw(op)));
+
+       if (xed_operand_read(op)) {
+           v3_op->read = 1;
+       }
+
+       if (xed_operand_written(op)) {
+           v3_op->write = 1;
+       }
+
     }
 
     // set third operand
@@ -575,6 +560,8 @@ 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 (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, 
@@ -594,6 +581,17 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
 
            instr->third_operand.type = REG_OPERAND;
 
+           PrintDebug("Operand 3 mode: %s\n", xed_operand_action_enum_t2str(xed_operand_rw(op)));
+
+
+           if (xed_operand_read(op)) {
+               instr->third_operand.read = 1;
+           }
+
+           if (xed_operand_written(op)) {
+               instr->third_operand.write = 1;
+           }
+
        } else {
            PrintError("Unhandled third operand type %s\n", xed_operand_type_enum_t2str(op_type));
            instr->num_operands = 2;
@@ -604,7 +602,7 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins
 }
 
 
-int v3_encode(struct guest_info * info, struct x86_instr * instr, char * instr_buf) {
+int v3_encode(struct guest_info * info, struct x86_instr * instr, uint8_t * instr_buf) {
 
     return -1;
 }
@@ -723,7 +721,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));