X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_util.c;h=029f9fda37bc98c4e2388de685ca6db33ba05c08;hb=8c767ddb04d3ac42d080d9f9f5f40196d6f8f217;hp=77440e50497c9ca999608797a82f4d9009d1e442;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git

diff --git a/palacios/src/palacios/vmm_util.c b/palacios/src/palacios/vmm_util.c
index 77440e5..029f9fd 100644
--- a/palacios/src/palacios/vmm_util.c
+++ b/palacios/src/palacios/vmm_util.c
@@ -1,31 +1,59 @@
+/* 
+ * 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".
+ */
+
+
 #include <palacios/vmm_util.h>
 
 #include <palacios/vmm.h>
 
-extern struct vmm_os_hooks * os_hooks;
+extern struct v3_os_hooks * os_hooks;
 
 
 void PrintTraceHex(unsigned char x) {
   unsigned char z;
   
-  z = (x >> 4) & 0xf ;
+  z = (x >> 4) & 0xf;
   PrintTrace("%x", z);
   z = x & 0xf;
   PrintTrace("%x", z);
 }
 
+void PrintTraceLL(ullong_t num) {
+  unsigned char * z = (unsigned char *)&num;
+  int i;
+  
+  for (i = 7; i >= 0; i--) {
+    PrintTraceHex(*(z + i));
+  }
+}
+
 
-void PrintTraceMemDump(unsigned char *start, int n)
-{
+void PrintTraceMemDump(uchar_t * start, int n) {
   int i, j;
 
   for (i = 0; i < n; i += 16) {
-    PrintTrace("%8x", (unsigned)(start + i));
+    PrintTrace("%p", (void *)(start + i));
     for (j = i; (j < (i + 16)) && (j < n); j += 2) {
       PrintTrace(" ");
-      PrintTraceHex(*((unsigned char *)(start + j)));
+      PrintTraceHex(*(uchar_t *)(start + j));
       if ((j + 1) < n) { 
-	PrintTraceHex(*((unsigned char *)(start + j + 1)));
+	PrintTraceHex(*((uchar_t *)(start + j + 1)));
       }
     }
     PrintTrace(" ");