X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_util.h;h=320c7bfc2146f8b6690b2aa2e23873052fc0a920;hb=6c56ead58f57e08c23eab5d67f2a58f95ce712b4;hp=38ae0866055b5f5355ebd2d72cdd61bf5a166ef7;hpb=55c5cf8adebb870874e02b439b176f2b020ba5a0;p=palacios.git

diff --git a/palacios/include/palacios/vmm_util.h b/palacios/include/palacios/vmm_util.h
index 38ae086..320c7bf 100644
--- a/palacios/include/palacios/vmm_util.h
+++ b/palacios/include/palacios/vmm_util.h
@@ -1,12 +1,28 @@
+/*
+ * 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_UTIL_H
 #define __VMM_UTIL_H
 
-#include <palacios/vmm_types.h>
-
+#ifdef __V3VEE__
 
-#ifndef PAGE_SIZE
-#define PAGE_SIZE 4096
-#endif
+#include <palacios/vmm_types.h>
 
 
 typedef union reg_ex {
@@ -34,12 +50,12 @@ struct VMM_GPRs {
 
 
 #define GET_LOW_32(x) (*((uint_t*)(&(x))))
-#define GET_HIGH_32(x) (*((uint_t*)(((char*)(&(x)))+4)))
+#define GET_HIGH_32(x) (*((uint_t*)(((uchar_t*)(&(x)))+4)))
 
 
-void PrintTraceHex(unsigned char x);
+void PrintTraceHex(uchar_t x);
 void PrintTraceLL(ullong_t num);
-void PrintTraceMemDump(unsigned char * start, int n);
+void PrintTraceMemDump(uchar_t * start, int n);
 
 
 
@@ -74,8 +90,10 @@ void PrintTraceMemDump(unsigned char * start, int n);
 
 
 #ifdef __V3_64BIT__
+#define do_divll do_div
+
 
-# define do_div(n,base) ({					\
+#define do_div(n,base) ({					\
 	uint32_t __base = (base);				\
 	uint32_t __rem;						\
 	__rem = ((uint64_t)(n)) % __base;			\
@@ -136,6 +154,6 @@ void PrintTraceMemDump(unsigned char * start, int n);
 
 
 
-
+#endif // ! __V3VEE__
 
 #endif