X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_decoder.h;h=c2686d9df3af2b16bab4f97989f3de33b99a2028;hb=b5380c0aecad02964d5aff23ab51979a063379ce;hp=7b703a85d03612597d4982e85b5e9aeb129fc0a0;hpb=5614cff13837121053e831419f569b4e6e32bcd9;p=palacios.git

diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h
index 7b703a8..c2686d9 100644
--- a/palacios/include/palacios/vmm_decoder.h
+++ b/palacios/include/palacios/vmm_decoder.h
@@ -34,7 +34,7 @@ typedef enum { V3_INVALID_OP,
 	       V3_OP_SETB, V3_OP_SETBE, V3_OP_SETL, V3_OP_SETLE, V3_OP_SETNB, 
 	       V3_OP_SETNBE, V3_OP_SETNL, V3_OP_SETNLE, V3_OP_SETNO, V3_OP_SETNP,
 	       V3_OP_SETNS, V3_OP_SETNZ, V3_OP_SETO, V3_OP_SETP, V3_OP_SETS, 
-	       V3_OP_SETZ, V3_OP_MOVS, V3_OP_STOS, V3_OP_MOVZX, V3_OP_MOVSX } v3_op_type_t;
+	       V3_OP_SETZ, V3_OP_MOVS, V3_OP_STOS, V3_OP_MOVZX, V3_OP_MOVSX, V3_OP_INT } v3_op_type_t;
 
 
 typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND, IMM_OPERAND} v3_operand_type_t;
@@ -52,29 +52,31 @@ struct x86_prefixes {
 	uint32_t val;
 	
 	struct {
-	    uint_t lock   : 1;  // 0xF0
-	    uint_t repne  : 1;  // 0xF2
-	    uint_t repnz  : 1;  // 0xF2
-	    uint_t rep    : 1;  // 0xF3
-	    uint_t repe   : 1;  // 0xF3
-	    uint_t repz   : 1;  // 0xF3
-	    uint_t cs_override : 1;  // 0x2E
-	    uint_t ss_override : 1;  // 0x36
-	    uint_t ds_override : 1;  // 0x3E
-	    uint_t es_override : 1;  // 0x26
-	    uint_t fs_override : 1;  // 0x64
-	    uint_t gs_override : 1;  // 0x65
-	    uint_t br_not_taken : 1;  // 0x2E
-	    uint_t br_taken   : 1;  // 0x3E
-	    uint_t op_size     : 1;  // 0x66
-	    uint_t addr_size   : 1;  // 0x67
-
-	    uint_t rex   : 1;
+	    uint32_t lock   : 1;  // 0xF0
+	    uint32_t repne  : 1;  // 0xF2
+	    uint32_t repnz  : 1;  // 0xF2
+	    uint32_t rep    : 1;  // 0xF3
+	    uint32_t repe   : 1;  // 0xF3
+	    uint32_t repz   : 1;  // 0xF3
+	    uint32_t cs_override : 1;  // 0x2E
+	    uint32_t ss_override : 1;  // 0x36
+	    uint32_t ds_override : 1;  // 0x3E
+	    uint32_t es_override : 1;  // 0x26
+	    uint32_t fs_override : 1;  // 0x64
+	    uint32_t gs_override : 1;  // 0x65
+	    uint32_t br_not_taken : 1;  // 0x2E
+	    uint32_t br_taken   : 1;  // 0x3E
+	    uint32_t op_size     : 1;  // 0x66
+	    uint32_t addr_size   : 1;  // 0x67
+
+	    uint32_t rex   : 1;
     
-	    uint_t rex_rm        : 1;  // REX.B
-	    uint_t rex_sib_idx   : 1;  // REX.X
-	    uint_t rex_reg       : 1;  // REX.R
-	    uint_t rex_op_size   : 1;  // REX.W
+	    uint32_t rex_rm        : 1;  // REX.B
+	    uint32_t rex_sib_idx   : 1;  // REX.X
+	    uint32_t rex_reg       : 1;  // REX.R
+	    uint32_t rex_op_size   : 1;  // REX.W
+
+	    uint32_t rsvd          : 11;
 	} __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed));
@@ -193,7 +195,7 @@ static inline v3_reg_t get_gpr_mask(struct guest_info * info) {
 	case LONG:
 	    return 0xffffffffffffffffLL;
 	default:
-	    PrintError("Unsupported Address Mode\n");
+  	    PrintError(info->vm_info, info, "Unsupported Address Mode\n");
 	    return -1;
     }
 }
@@ -202,26 +204,31 @@ static inline v3_reg_t get_gpr_mask(struct guest_info * info) {
 
 static inline addr_t get_addr_linear(struct guest_info * info, addr_t addr, struct v3_segment * seg) {
     switch (info->cpu_mode) {
-	case REAL:
-	    // It appears that the segment values are computed and cached in the vmcb structure 
-	    // We Need to check this for Intel
-	    /*   return addr + (seg->selector << 4);
-		 break;*/
-
+	case REAL: {
+	    return ((seg->selector & 0xffff) << 4) + (addr & 0xffff);
+	    break;
+	}
 	case PROTECTED:
 	case PROTECTED_PAE:
 	case LONG_32_COMPAT:
 	    return addr + seg->base;
 	    break;
 
-	case LONG:
+	case LONG: {
+	    uint64_t seg_base = 0;
+
 	    // In long mode the segment bases are disregarded (forced to 0), unless using 
 	    // FS or GS, then the base addresses are added
-	    return addr + seg->base;
 
+	    if (seg) {
+		seg_base = seg->base;
+	    }
+
+	    return addr + seg_base;
+	}
 	case LONG_16_COMPAT:
 	default:
-	    PrintError("Unsupported CPU Mode: %d\n", info->cpu_mode);
+	  PrintError(info->vm_info, info,"Unsupported CPU Mode: %d\n", info->cpu_mode);
 	    return -1;
     }
 }