From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Thu, 24 Jul 2008 16:16:18 +0000 (+0000)
Subject: modified x86_instr format
X-Git-Tag: vmmhack1-ramdisk-boot-iso-puppy~44
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=d0534dc3a0dc459971b2cdfd423dfb9a4f06a08b

modified x86_instr format
---

diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h
index ac3e83b..ddbf9f8 100644
--- a/palacios/include/palacios/vmm_decoder.h
+++ b/palacios/include/palacios/vmm_decoder.h
@@ -44,13 +44,14 @@ 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;
+  uint_t instr_length;
+  addr_t opcode;    // a pointer to the V3_OPCODE_[*] arrays defined below
+  uint_t num_operands;
+  struct x86_prefix_list prefixes;
+  struct x86_operand first_operand;
+  struct x86_operand second_operand;
+  struct x86_operand third_operand;
+  void * decoder_data;
 };
 
 
@@ -123,7 +124,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: