X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_debug.c;h=9865dd1e704e783bf6263e4f2d92c625e11ff6e8;hb=436d82be19d03d68da09711b3a77a185698f15a3;hp=b3c14b92a64b4d0a0e67264024bbbc44febd702c;hpb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;p=palacios.git

diff --git a/palacios/src/palacios/vmm_debug.c b/palacios/src/palacios/vmm_debug.c
index b3c14b9..9865dd1 100644
--- a/palacios/src/palacios/vmm_debug.c
+++ b/palacios/src/palacios/vmm_debug.c
@@ -1,37 +1,59 @@
-/* Northwestern University */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* 
+ * 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_debug.h>
 #include <palacios/vmm.h>
 
 
-void PrintDebugHex(unsigned char x)
+void PrintDebugHex(uchar_t x)
 {
   unsigned char z;
   
-  z = (x>>4) & 0xf ;
+  z = (x >> 4) & 0xf ;
   PrintDebug("%x", z);
   z = x & 0xf;
   PrintDebug("%x", z);
 }
 
-void PrintDebugMemDump(unsigned char *start, int n)
+void PrintDebugMemDump(uchar_t *start, int n)
 {
   int i, j;
 
-  for (i=0;i<n;i+=16) {
-    PrintDebug("%8x", (unsigned)(start+i));
-    for (j=i; j<i+16 && j<n; j+=2) {
+  for (i = 0; i < n; i += 16) {
+    PrintDebug("%p", (void *)(start + i));
+
+    for (j = i; (j < (i + 16)) && (j < n); j += 2) {
       PrintDebug(" ");
-      PrintDebugHex(*((unsigned char *)(start+j)));
-      if ((j+1)<n) { 
-	PrintDebugHex(*((unsigned char *)(start+j+1)));
+      PrintDebugHex(*((uchar_t *)(start + j)));
+
+      if ((j + 1) < n) { 
+	PrintDebugHex(*((uchar_t *)(start + j + 1)));
       }
+
     }
+
     PrintDebug(" ");
-    for (j=i; j<i+16 && j<n;j++) {
-      PrintDebug("%c", ((start[j]>=32) && (start[j]<=126)) ? start[j] : '.');
+
+    for (j = i; (j < (i + 16)) && (j < n); j++) {
+      PrintDebug("%c", ((start[j] >= 32) && (start[j] <= 126)) ? start[j] : '.');
     }
+
     PrintDebug("\n");
   }
 }