X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_util.h;h=320c7bfc2146f8b6690b2aa2e23873052fc0a920;hb=5db3136d5331c355c188537c68005db8d2cb4eac;hp=95a0c8e3ad11437f1b79b0b76aa3bb22c9e4a1b7;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.releases.git

diff --git a/palacios/include/palacios/vmm_util.h b/palacios/include/palacios/vmm_util.h
index 95a0c8e..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 PrintTraceMemDump(unsigned char * start, int n);
+void PrintTraceHex(uchar_t x);
+void PrintTraceLL(ullong_t num);
+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;			\
@@ -97,19 +115,38 @@ void PrintTraceMemDump(unsigned char * start, int n);
  * This ends up being the most efficient "calling
  * convention" on x86.
  */
-#define do_div(n,base) ({ \
-	unsigned long __upper, __low, __high, __mod, __base; \
-	__base = (base); \
-	asm("":"=a" (__low), "=d" (__high):"A" (n)); \
-	__upper = __high; \
-	if (__high) { \
-		__upper = __high % (__base); \
-		__high = __high / (__base); \
-	} \
-	asm("divl %2":"=a" (__low), "=d" (__mod):"rm" (__base), "0" (__low), "1" (__upper)); \
-	asm("":"=A" (n):"a" (__low),"d" (__high)); \
-	__mod; \
-})
+#define do_div(n,base) ({				     \
+      unsigned long __upper, __low, __high, __mod, __base;   \
+      __base = (base);					     \
+      asm("":"=a" (__low), "=d" (__high):"A" (n));	     \
+      __upper = __high;					     \
+      if (__high) {					     \
+	__upper = __high % (__base);			     \
+	__high = __high / (__base);			     \
+      }									\
+      asm("divl %2":"=a" (__low), "=d" (__mod):"rm" (__base), "0" (__low), "1" (__upper)); \
+      asm("":"=A" (n):"a" (__low),"d" (__high));			\
+      __mod;								\
+    })
+
+
+
+/* This divides two 64bit unsigned ints
+ * The previous version only allows 32 bit bases(?)...
+ * 
+ * NOTE: This absolutely sucks... there has to be a better way....
+ */
+#define do_divll(n, base) ({				\
+      ullong_t __rem = 0;				\
+      ullong_t __num = 0;				\
+      while (n > base) {				\
+	__num++;					\
+	n -= base;					\
+      }							\
+      __rem = n;					\
+      n = __num;					\
+      __rem;						\
+    })						
 
 #endif
 
@@ -117,4 +154,6 @@ void PrintTraceMemDump(unsigned char * start, int n);
 
 
 
+#endif // ! __V3VEE__
+
 #endif