X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_ctrl_regs.h;h=c83bb50c535d3789f56fba3b7db2f47a2964faec;hb=d81740cae7d1ebf42b080cba893500cec39a8a03;hp=96d5d16c92b9c646fbca9cde6a76b3f325772277;hpb=101529b6eae500272347287df43ec51aa003d0aa;p=palacios.git

diff --git a/palacios/include/palacios/vmm_ctrl_regs.h b/palacios/include/palacios/vmm_ctrl_regs.h
index 96d5d16..c83bb50 100644
--- a/palacios/include/palacios/vmm_ctrl_regs.h
+++ b/palacios/include/palacios/vmm_ctrl_regs.h
@@ -1,9 +1,27 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/*
+ * 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_CTRL_REGS_H
 #define __VMM_CTRL_REGS_H
 
+#ifdef __V3VEE__
+
 
 #include <palacios/vm_guest.h>
 
@@ -12,7 +30,7 @@ struct cr0_real {
   uint_t mp    : 1;
   uint_t em    : 1;
   uint_t ts    : 1;
-};
+} __attribute__((packed));
 
 
 struct cr0_32 {
@@ -30,7 +48,7 @@ struct cr0_32 {
   uint_t nw    : 1;
   uint_t cd    : 1;
   uint_t pg    : 1;
-};
+} __attribute__((packed));
 
 
 struct cr0_64 {
@@ -50,16 +68,16 @@ struct cr0_64 {
   uint_t pg    : 1;
 
   uint_t  rsvd4;  // MBZ
-};
+} __attribute__((packed));
 
 
 struct cr2_32 {
   uint_t pf_vaddr;
-};
+} __attribute__((packed));
 
 struct cr2_64 {
   ullong_t pf_vaddr;
-};
+} __attribute__((packed));
 
 
 struct cr3_32 {
@@ -68,7 +86,7 @@ struct cr3_32 {
   uint_t pcd               : 1;
   uint_t rsvd2             : 7;
   uint_t pdt_base_addr    : 20;
-};
+} __attribute__((packed));
 
 
 struct cr3_32_PAE {
@@ -76,7 +94,7 @@ struct cr3_32_PAE {
   uint_t pwt               : 1;
   uint_t pcd               : 1;
   uint_t pdpt_base_addr    : 27;
-};
+} __attribute__((packed));
 
 
 struct cr3_64 {
@@ -86,7 +104,7 @@ struct cr3_64 {
   uint_t rsvd2             : 7;
   ullong_t pml4t_base_addr : 40;
   uint_t rsvd3             : 12; 
-};
+} __attribute__((packed));
 
 
 struct cr4_32 {
@@ -102,7 +120,7 @@ struct cr4_32 {
   uint_t osf_xsr           : 1;
   uint_t osx               : 1;
   uint_t rsvd1             : 21;
-};
+} __attribute__((packed));
 
 struct cr4_64 {
   uint_t vme               : 1;
@@ -118,7 +136,7 @@ struct cr4_64 {
   uint_t osx               : 1;
   uint_t rsvd1             : 21;
   uint_t rsvd2             : 32;
-};
+} __attribute__((packed));
 
 
 
@@ -134,7 +152,7 @@ struct efer_64 {
   uint_t ffxsr            : 1;
   uint_t rsvd4            : 12; // MBZ
   uint_t rsvd5            : 32; // MBZ
-};
+} __attribute__((packed));
 
 
 struct rflags {
@@ -161,7 +179,7 @@ struct rflags {
   uint_t id                : 1;  // ID flag
   uint_t rsvd5             : 10; // Read as 0
   uint_t rsvd6             : 32; // Read as 0
-};
+} __attribute__((packed));
 
 
 
@@ -182,16 +200,21 @@ static const uchar_t mov_from_cr_byte = 0x20;
 */
 
 
-int handle_cr0_write(struct guest_info * info);
-int handle_cr0_read(struct guest_info * info);
+int v3_handle_cr0_write(struct guest_info * info);
+int v3_handle_cr0_read(struct guest_info * info);
+
+int v3_handle_cr3_write(struct guest_info * info);
+int v3_handle_cr3_read(struct guest_info * info);
+
+int v3_handle_cr4_write(struct guest_info * info);
+int v3_handle_cr4_read(struct guest_info * info);
+
 
-int handle_cr3_write(struct guest_info * info);
-int handle_cr3_read(struct guest_info * info);
+int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data);
+int v3_handle_efer_read(uint_t msr, struct v3_msr * dst, void * priv_data);
 
 
-#define CR3_32_SAME_BASE(source1,source2) ((source1)->pdt_base_addr == (source2)->pdt_base_addr)
-#define CR3_32_COPY_FLAGS(source,dest) do { (dest)->rsvd1=(source)->rsvd1; (dest)->pwt=(source)->pwt; (dest)->pcd=(source)->pcd; } while (0)
-#define CR3_32_COPY_BASE(source,dest) do { (dest)->pdt_base_addr = (source)->pdt_base_addr; } while (0)
+#endif // ! __V3VEE__
 
 
 #endif