Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


working on x86 instruction decoding support
[palacios.git] / palacios / include / geekos / vm_guest.h
index 6a6d86b..f711b36 100644 (file)
@@ -4,38 +4,63 @@
 #include <geekos/vmm_mem.h>
 #include <geekos/ktypes.h>
 #include <geekos/vmm_io.h>
+#include <geekos/vmm_shadow_paging.h>
 
-struct guest_gprs {
-  ullong_t rbx;
-  ullong_t rcx;
-  ullong_t rdx;
-  ullong_t rsi;
-  ullong_t rdi;
-  ullong_t rbp;
 
+typedef ullong_t gpr_t;
+
+/*
+  struct guest_gprs {
+  addr_t rax;
+  addr_t rbx;
+  addr_t rcx;
+  addr_t rdx;
+  addr_t rsi;
+  addr_t rdi;
+  addr_t rbp;
+  };
+*/
+
+struct guest_gprs {
+  gpr_t rdi;
+  gpr_t rsi;
+  gpr_t rbp;
+  gpr_t rsp;
+  gpr_t rbx;
+  gpr_t rdx;
+  gpr_t rcx;
+  gpr_t rax;
 };
 
 
+struct shadow_page_state;
+
 
+typedef enum {SHADOW_PAGING, NESTED_PAGING} vm_page_mode_t;
+typedef enum {REAL, PROTECTED, PROTECTED_PG, PROTECTED_PAE, PROTECTED_PAE_PG, LONG, LONG_PG} vm_cpu_mode_t;
 
-typedef struct guest_info {
+struct guest_info {
   ullong_t rip;
-  ullong_t rsp;
 
-  vmm_mem_list_t mem_list;
-  vmm_mem_layout_t mem_layout;
+
+  shadow_map_t mem_map;
+
+  
+  vm_page_mode_t page_mode;
+  struct shadow_page_state shdw_pg_state;
+  // nested_paging_t nested_page_state;
+
 
   vmm_io_map_t io_map;
   // device_map
 
+  vm_cpu_mode_t cpu_mode;
+
 
   struct guest_gprs vm_regs;
 
-  void * page_tables;
   void * vmm_data;
-} guest_info_t;
-
-
+};