large change to break apart the guest operation mode parameters

[palacios.git] / palacios / include / palacios / vmm_decoder.h

diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h
index e25497a..f37a205 100644 (file)
--- a/palacios/include/palacios/vmm_decoder.h
+++ b/palacios/include/palacios/vmm_decoder.h
@@ -1,7 +1,7 @@
 #ifndef __VMM_EMULATE_H
 #define __VMM_EMULATE_H
 #include <palacios/vm_guest.h>
-
+#include <palacios/vmm.h>
 
 /*
  * This is where we do the hideous X86 instruction parsing among other things
@@ -19,6 +19,9 @@ struct x86_operand {
   operand_type_t type;
 };
 
+struct x86_prefix_list {
+  uint_t lock   : 1;
+};
 
 /* This parses an instruction 
  * All addresses in arguments are in the host address space
@@ -26,6 +29,9 @@ struct x86_operand {
 int v3_parse_instr(struct guest_info * info,             // input
                   char * instr_ptr,                        // input 
                   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);  // output
@@ -148,7 +154,6 @@ static inline v3_reg_t get_gpr_mask(struct guest_info * info) {
     return 0xffff;
     break;
   case PROTECTED:
-  case PROTECTED_PG:
     return 0xffffffff;
   default:
     V3_ASSERT(0);
@@ -163,7 +168,6 @@ static inline addr_t get_addr_linear(struct guest_info * info, addr_t addr, stru
     return addr + (seg->selector << 4);
     break;
   case PROTECTED:
-  case PROTECTED_PG:
     return addr + seg->base;
     break;
   default: