X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_xed.c;h=68e39b04d036d0678b0b0d46cc23f5c28f367210;hb=736bdf20ee47fff0e95a62dda22d627da556425f;hp=6d5a97cda6f644dd91b7694583afa2d7ca13eced;hpb=3574c981404a1c812d369132db09ec2a27d59a5d;p=palacios.git

diff --git a/palacios/src/palacios/vmm_xed.c b/palacios/src/palacios/vmm_xed.c
index 6d5a97c..68e39b0 100644
--- a/palacios/src/palacios/vmm_xed.c
+++ b/palacios/src/palacios/vmm_xed.c
@@ -112,7 +112,6 @@ static int set_decoder_mode(struct guest_info * info, xed_state_t * state) {
    break;
   case PROTECTED:
   case PROTECTED_PAE:
-  case LONG_32_COMPAT:
     if (state->mmode != XED_MACHINE_MODE_LEGACY_32) {
       xed_state_init(state,
 		     XED_MACHINE_MODE_LEGACY_32, 
@@ -120,9 +119,23 @@ static int set_decoder_mode(struct guest_info * info, xed_state_t * state) {
 		     XED_ADDRESS_WIDTH_32b);
     }
     break;
+  case LONG_32_COMPAT:
+    if (state->mmode != XED_MACHINE_MODE_LONG_COMPAT_32) {
+      xed_state_init(state,
+		     XED_MACHINE_MODE_LONG_COMPAT_32, 
+		     XED_ADDRESS_WIDTH_32b, 
+		     XED_ADDRESS_WIDTH_32b);
+    }
+    break;
   case LONG:
-    if (state->mmode != XED_MACHINE_MODE_LONG_64) {    
-      state->mmode = XED_MACHINE_MODE_LONG_64;
+    if (state->mmode != XED_MACHINE_MODE_LONG_64) {
+      PrintDebug("Setting decoder to long mode\n");
+      //      state->mmode = XED_MACHINE_MODE_LONG_64;
+      //xed_state_set_machine_mode(state, XED_MACHINE_MODE_LONG_64);
+      xed_state_init(state,
+		     XED_MACHINE_MODE_LONG_64, 
+		     XED_ADDRESS_WIDTH_64b, 
+		     XED_ADDRESS_WIDTH_64b);
     }
     break;
   default:
@@ -154,6 +167,10 @@ int v3_init_decoder(struct guest_info * info) {
 
   xed_state_t * decoder_state = (xed_state_t *)V3_Malloc(sizeof(xed_state_t));
   xed_state_zero(decoder_state);
+  xed_state_init(decoder_state,
+		 XED_MACHINE_MODE_LEGACY_32, 
+		 XED_ADDRESS_WIDTH_32b, 
+		 XED_ADDRESS_WIDTH_32b);
 
   info->decoder_state = decoder_state;
 
@@ -527,8 +544,11 @@ static int get_memory_operand(struct guest_info * info,  xed_decoded_inst_t * xe
   ullong_t displacement;
   // struct v3_segment * seg_reg;
 
-
-
+  PrintDebug("Xen mode = %s\n", xed_machine_mode_enum_t2str(xed_state_get_machine_mode(info->decoder_state)));
+  PrintDebug("Address width: %s\n",
+ 	     xed_address_width_enum_t2str(xed_state_get_address_width(info->decoder_state)));
+  PrintDebug("Stack Address width: %s\n",
+ 	     xed_address_width_enum_t2str(xed_state_get_stack_address_width(info->decoder_state)));
 
   memset((void*)&mem_op, '\0', sizeof(struct memory_operand));
 
@@ -596,7 +616,8 @@ static int get_memory_operand(struct guest_info * info,  xed_decoded_inst_t * xe
   base = MASK(mem_op.base, mem_op.base_size);
   index = MASK(mem_op.index, mem_op.index_size);
   scale = mem_op.scale;
-  displacement = MASK(mem_op.displacement, mem_op.displacement_size);
+  // displacement = MASK(mem_op.displacement, mem_op.displacement_size);
+  displacement = mem_op.displacement;
 
   PrintDebug("Seg=%p, base=%p, index=%p, scale=%p, displacement=%p\n", 
 	     (void *)seg, (void *)base, (void *)index, (void *)scale, (void *)(addr_t)displacement);
@@ -608,7 +629,7 @@ 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) {
 
-  PrintError("Xed Register: %s\n", xed_reg_enum_t2str(xed_reg));
+  PrintDebug("Xed Register: %s\n", xed_reg_enum_t2str(xed_reg));
 
   switch (xed_reg) {
   case XED_REG_INVALID:
@@ -1151,37 +1172,70 @@ static v3_op_type_t get_opcode(xed_iform_enum_t iform) {
 
     /* Data Instructions */
 
+    // Write
   case XED_IFORM_ADC_MEMv_GPRv:
   case XED_IFORM_ADC_MEMv_IMM:
   case XED_IFORM_ADC_MEMb_GPR8:
   case XED_IFORM_ADC_MEMb_IMM:
+    // Read
+  case XED_IFORM_ADC_GPRv_MEMv:
+  case XED_IFORM_ADC_GPR8_MEMb:
     return V3_OP_ADC;
 
+    // Write
   case XED_IFORM_ADD_MEMv_GPRv:
   case XED_IFORM_ADD_MEMb_IMM:
   case XED_IFORM_ADD_MEMb_GPR8:
   case XED_IFORM_ADD_MEMv_IMM:
+    // Read
+  case XED_IFORM_ADD_GPRv_MEMv:
+  case XED_IFORM_ADD_GPR8_MEMb:
     return V3_OP_ADD;
 
+    // Write
   case XED_IFORM_AND_MEMv_IMM:
   case XED_IFORM_AND_MEMb_GPR8:
   case XED_IFORM_AND_MEMv_GPRv:
   case XED_IFORM_AND_MEMb_IMM:
+    // Read
+  case XED_IFORM_AND_GPR8_MEMb:
+  case XED_IFORM_AND_GPRv_MEMv:
     return V3_OP_AND;
 
+    // Write
   case XED_IFORM_SUB_MEMv_IMM:
   case XED_IFORM_SUB_MEMb_GPR8:
   case XED_IFORM_SUB_MEMb_IMM:
   case XED_IFORM_SUB_MEMv_GPRv:
+    // Read
+  case XED_IFORM_SUB_GPR8_MEMb:
+  case XED_IFORM_SUB_GPRv_MEMv:
     return V3_OP_SUB;
 
+    // Write
   case XED_IFORM_MOV_MEMv_GPRv:
   case XED_IFORM_MOV_MEMb_GPR8:
   case XED_IFORM_MOV_MEMb_AL:
   case XED_IFORM_MOV_MEMv_IMM:
   case XED_IFORM_MOV_MEMb_IMM:
+    // Read 
+  case XED_IFORM_MOV_GPRv_MEMv:
+  case XED_IFORM_MOV_GPR8_MEMb:
+  case XED_IFORM_MOV_AL_MEMb:
     return V3_OP_MOV;
 
+
+    // Read 
+  case XED_IFORM_MOVZX_GPRv_MEMb:
+  case XED_IFORM_MOVZX_GPRv_MEMw:
+    return V3_OP_MOVZX;
+
+    // Read 
+  case XED_IFORM_MOVSX_GPRv_MEMb:
+  case XED_IFORM_MOVSX_GPRv_MEMw:
+    return V3_OP_MOVSX;
+
+
   case XED_IFORM_DEC_MEMv:
   case XED_IFORM_DEC_MEMb:
     return V3_OP_DEC;
@@ -1190,16 +1244,24 @@ static v3_op_type_t get_opcode(xed_iform_enum_t iform) {
   case XED_IFORM_INC_MEMv:
     return V3_OP_INC;
 
+    // Write
   case XED_IFORM_OR_MEMv_IMM:
   case XED_IFORM_OR_MEMb_IMM:
   case XED_IFORM_OR_MEMv_GPRv:
   case XED_IFORM_OR_MEMb_GPR8:
+    // Read
+  case XED_IFORM_OR_GPRv_MEMv:
+  case XED_IFORM_OR_GPR8_MEMb:
     return V3_OP_OR;
 
+    // Write
   case XED_IFORM_XOR_MEMv_GPRv:
   case XED_IFORM_XOR_MEMb_IMM:
   case XED_IFORM_XOR_MEMb_GPR8:
   case XED_IFORM_XOR_MEMv_IMM:
+    // Read
+  case XED_IFORM_XOR_GPRv_MEMv:
+  case XED_IFORM_XOR_GPR8_MEMb:
     return V3_OP_XOR;
 
   case XED_IFORM_NEG_MEMb: