X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_emulator.h;h=2f7913ae1f835f1d37d4a6849e0ace21125134e3;hb=a9e204d157a33976ca454b2ce8b161c2a5501b14;hp=6e909a635bdbb4efc189d61a45cd7ad412a5b5e8;hpb=c373d9a80b116014c546e7761982fedf7419664b;p=palacios.git

diff --git a/palacios/include/palacios/vmm_emulator.h b/palacios/include/palacios/vmm_emulator.h
index 6e909a6..2f7913a 100644
--- a/palacios/include/palacios/vmm_emulator.h
+++ b/palacios/include/palacios/vmm_emulator.h
@@ -1,71 +1,37 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #ifndef __VMM_EMULATOR_H__
 #define __VMM_EMULATOR_H__
 
 #ifdef __V3VEE__
 
-#include <palacios/vmm_list.h>
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_paging.h>
 
 
+struct x86_instr;
 
+int v3_emulate(struct guest_info * core, struct x86_instr * instr, 
+	       int mem_op_size, addr_t mem_hva_src, addr_t mem_hva_dst);
 
 
-struct emulated_page {
-  addr_t page_addr;
-  addr_t va;
-  pte32_t pte;
-  struct list_head page_list;
-};
-
-struct saved_page {
-  addr_t va;
-  pte32_t pte;
-  struct list_head page_list;
-};
-
-
-struct write_region {
-  void * write_data;
-  
-  uint_t length;
-  int (*write)(addr_t write_addr, void * src, uint_t length, void * priv_data);
-  addr_t write_addr;
-  void * private_data;
-  
-  struct list_head write_list;
-};
-
-
-struct emulation_state {
-  uint_t num_emulated_pages;
-  struct list_head emulated_pages;
-
-  uint_t num_saved_pages;
-  struct list_head saved_pages;
-
-  uint_t num_write_regions;
-  struct list_head write_regions;
-
-  uint_t running : 1;
-  uint_t instr_length;
-
-  uint_t tf_enabled : 1;
-};
-
-
-int init_emulator(struct guest_info * info);
-
-
-int v3_emulation_exit_handler(struct guest_info * info);
-
-int v3_emulate_memory_write(struct guest_info * info, addr_t fault_gva,
-			    int (*write)(addr_t write_addr, void * src, uint_t length, void * priv_data), 
-			    addr_t write_addr, void * private_data);
-int v3_emulate_memory_read(struct guest_info * info, addr_t fault_gva, 
-			   int (*read)(addr_t read_addr, void * dst, uint_t length, void * priv_data), 
-			   addr_t read_addr, void * private_data);
-
 
 #endif // !__V3VEE__