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

diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h
index 7f05064..7b703a8 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_type_t;
 
 
 typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND, IMM_OPERAND} v3_operand_type_t;
@@ -43,25 +43,40 @@ struct x86_operand {
     addr_t operand;
     uint_t size;
     v3_operand_type_t type;
-};
+    uint8_t read : 1;   // This operand value will be read by the instruction
+    uint8_t write : 1;  // This operand value will be written to by the instruction
+} __attribute__((packed));
 
 struct x86_prefixes {
-    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
+    union {
+	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;
+    
+	    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
+	} __attribute__((packed));
+    } __attribute__((packed));
 } __attribute__((packed));
 
 
@@ -75,7 +90,6 @@ struct x86_instr {
     struct x86_operand third_operand;
     addr_t str_op_length;
     addr_t is_str_op;
-    //  void * decoder_data;
 };
 
 
@@ -119,7 +133,6 @@ void v3_strip_rep_prefix(uint8_t * instr, int length);
 uint8_t v3_get_prefixes(uint8_t * instr, struct x86_prefixes * prefixes);
 
 
-
 void v3_print_instr(struct x86_instr * instr);