X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_decoder.h;h=b6e65e6ad2be7e0c590eba630cc2032bae0dd272;hb=56f8088296ee4116a4811a2f4f843edd80a7748d;hp=ac3e83bf71b926b0c1d4176edbc0efad42660f1b;hpb=6f089682a19a99474faf05f74b44f9f71f58b30b;p=palacios.git

diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h
index ac3e83b..b6e65e6 100644
--- a/palacios/include/palacios/vmm_decoder.h
+++ b/palacios/include/palacios/vmm_decoder.h
@@ -1,3 +1,6 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 #ifndef __VMM_EMULATE_H
 #define __VMM_EMULATE_H
 
@@ -6,16 +9,8 @@
 #include <palacios/vm_guest.h>
 #include <palacios/vmm.h>
 
-/*
- * This is where we do the hideous X86 instruction parsing among other things
- * We can parse out the instruction prefixes, as well as decode the operands 
- */
-
 
-
-
-
-typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND} operand_type_t;
+typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND, IMM_OPERAND} operand_type_t;
 
 struct x86_operand {
   addr_t operand;
@@ -23,7 +18,7 @@ struct x86_operand {
   operand_type_t type;
 };
 
-struct x86_prefix_list {
+struct x86_prefixes {
   uint_t lock   : 1;  // 0xF0
   uint_t repne  : 1;  // 0xF2
   uint_t repnz  : 1;  // 0xF2
@@ -44,16 +39,26 @@ struct x86_prefix_list {
 
 
 struct x86_instr {
-  uint_t instr_length;                // output
-  addr_t opcode;                      // output
-  uint_t  opcode_length;               // output
-  struct x86_prefix_list prefixes;    // output
-  struct x86_operand src_operand;     // output
-  struct x86_operand dst_operand;     // output
-  struct x86_operand extra_operand;
+  struct x86_prefixes prefixes;
+  uint_t instr_length;
+  addr_t opcode;    // a pointer to the V3_OPCODE_[*] arrays defined below
+  uint_t num_operands;
+  struct x86_operand dst_operand;
+  struct x86_operand src_operand;
+  struct x86_operand third_operand;
+  void * decoder_data;
+};
+
+
+struct basic_instr_info {
+  uint_t instr_length;
+  uint_t op_size;
+  uint_t str_op    : 1;
+  uint_t has_rep : 1;
 };
 
 
+
   /************************/
  /* EXTERNAL DECODER API */
 /************************/
@@ -87,10 +92,16 @@ 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);
 
 
+/*
+ * Gets the operand size for a memory operation
+ *
+ */
+int v3_basic_mem_decode(struct guest_info * info, addr_t instr_ptr, struct basic_instr_info * instr_info);
 
 
 
-
+/* Removes a rep prefix in place */
+void strip_rep_prefix(uchar_t * instr, int length);
 
 
 
@@ -123,7 +134,7 @@ struct sib_byte {
 
 
 
-#define MAKE_INSTR(nm, ...) static const uchar_t OPCODE_##nm[] = { __VA_ARGS__ }
+#define MAKE_INSTR(nm, ...) static  const uchar_t V3_OPCODE_##nm[] = { __VA_ARGS__ }
 
 /* 
  * Here's how it works:
@@ -180,6 +191,9 @@ MAKE_INSTR(SMSW,   3, 0x0f, 0x01, 0x00);
 #define PREFIX_OP_SIZE      0x66
 #define PREFIX_ADDR_SIZE    0x67
 
+int opcode_cmp(const uchar_t * op1, const uchar_t * op2);
+
+
 static inline int is_prefix_byte(char byte) {
   switch (byte) {
   case 0xF0:      // lock