X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_util.c;h=8fecd3cc9331116cc21e327c31e2430459303b30;hb=4f0bb09709fcff0e08aef60c1f0253bbef91f608;hp=192b64f93069c98f67bfdcd34c5cbf619aaa3ad6;hpb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;p=palacios.git

diff --git a/palacios/src/palacios/vmm_util.c b/palacios/src/palacios/vmm_util.c
index 192b64f..8fecd3c 100644
--- a/palacios/src/palacios/vmm_util.c
+++ b/palacios/src/palacios/vmm_util.c
@@ -16,52 +16,29 @@
  * 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 v3_os_hooks * os_hooks;
-
-
-void PrintTraceHex(unsigned char x) {
-  unsigned char z;
-  
-  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(uchar_t * start, int n) {
-  int i, j;
-
-  for (i = 0; i < n; i += 16) {
-    PrintTrace("%8x", (start + i));
-    for (j = i; (j < (i + 16)) && (j < n); j += 2) {
-      PrintTrace(" ");
-      PrintTraceHex(*(uchar_t *)(start + j));
-      if ((j + 1) < n) { 
-	PrintTraceHex(*((uchar_t *)(start + j + 1)));
-      }
-    }
-    PrintTrace(" ");
-    for (j = i; (j < (i + 16)) && (j < n); j++) {
-      PrintTrace("%c", ((start[j] >= 32) && (start[j] <= 126)) ? start[j] : '.');
+void v3_dump_mem(uint8_t * start, int n) {
+    int i, j;
+
+    for (i = 0; i < n; i += 16) {
+	V3_Print("%p", (void *)(start + i));
+	for (j = i; (j < (i + 16)) && (j < n); j += 2) {
+	    V3_Print(" ");
+	    V3_Print("%x", *(uint8_t *)(start + j));
+	    if ((j + 1) < n) { 
+		V3_Print("%x", *((uint8_t *)(start + j + 1)));
+	    }
+	}
+	V3_Print(" ");
+	for (j = i; (j < (i + 16)) && (j < n); j++) {
+	    V3_Print("%c", ((start[j] >= 32) && (start[j] <= 126)) ? start[j] : '.');
+	}
+	V3_Print("\n");
     }
-    PrintTrace("\n");
-  }
 }