working on x86 instruction decoding support

[palacios.git] / palacios / src / geekos / main.c

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index c463f2d..4f21335 100644 (file)
--- a/palacios/src/geekos/main.c
+++ b/palacios/src/geekos/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
  * Copyright (c) 2004, Iulian Neamtiu <neamtiu@cs.umd.edu>
- * $Revision: 1.22 $
+ * $Revision: 1.26 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -31,6 +31,7 @@
 #include <geekos/debug.h>
 #include <geekos/vmm.h>
 
+
 #include <geekos/gdt.h>
 
 
@@ -285,13 +286,13 @@ void Main(struct Boot_Info* bootInfo)
   {
     struct vmm_os_hooks os_hooks;
     struct vmm_ctrl_ops vmm_ops;
-    guest_info_t vm_info;
+    struct guest_info vm_info;
     addr_t rsp;
     addr_t rip;
 
     memset(&os_hooks, 0, sizeof(struct vmm_os_hooks));
     memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops));
-    memset(&vm_info, 0, sizeof(guest_info_t));
+    memset(&vm_info, 0, sizeof(struct guest_info));
 
     os_hooks.print_debug = &PrintBoth;
     os_hooks.print_info = &Print;
@@ -308,9 +309,11 @@ void Main(struct Boot_Info* bootInfo)
     Init_VMM(&os_hooks, &vmm_ops);
   
     init_shadow_map(&(vm_info.mem_map));
-    init_shadow_page_state(&(vm_info.shadow_page_state));
+    init_shadow_page_state(&(vm_info.shdw_pg_state));
     vm_info.page_mode = SHADOW_PAGING;
 
+    vm_info.cpu_mode = REAL;
+
     init_vmm_io_map(&(vm_info.io_map));
 
     
@@ -326,7 +329,7 @@ void Main(struct Boot_Info* bootInfo)
       vm_info.rip = rip;
       rsp = (addr_t)Alloc_Page();
       
-      vm_info.rsp = (rsp +4092 );// - 0x2000;
+      vm_info.vm_regs.rsp = (rsp +4092 );// - 0x2000;
       
             
     } else {
@@ -345,10 +348,10 @@ void Main(struct Boot_Info* bootInfo)
       vm_info.cs.limit=0xffff;
       */
       vm_info.rip = 0xfff0;
-      vm_info.rsp = 0x0;
+      vm_info.vm_regs.rsp = 0x0;
     }
 
-    PrintBoth("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", (uint_t)vm_info.rip,(uint_t)vm_info.rsp);
+    PrintBoth("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", (uint_t)vm_info.rip,(uint_t)vm_info.vm_regs.rsp);
     (vmm_ops).init_guest(&vm_info);
     PrintBoth("Starting Guest\n");
     (vmm_ops).start_guest(&vm_info);