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

diff --git a/palacios/src/palacios/vmm_util.c b/palacios/src/palacios/vmm_util.c
index 029f9fd..e6fd1fb 100644
--- a/palacios/src/palacios/vmm_util.c
+++ b/palacios/src/palacios/vmm_util.c
@@ -16,52 +16,32 @@
  * 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("%p", (void *)(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)));
+#include <palacios/vmm_sprintf.h>
+
+void v3_dump_mem(uint8_t * start, int n) {
+    int i, j;
+    char buf[128];
+
+    if (!start) {
+	return;
+    }      
+    
+    for (i = 0; i < n; i += 16) {
+      snprintf(buf, 128, "%p ", (void *)(start + i));
+      for (j = i; (j < (i + 16)) && (j < n); j++) {
+	snprintf(buf+strlen(buf),128-strlen(buf),"%02x ", *(uint8_t *)(start + j));
       }
+      for (j = i; (j < (i + 16)) && (j < n); j++) {
+	snprintf(buf+strlen(buf),128-strlen(buf),"%c", ((start[j] >= 32) && (start[j] <= 126)) ? start[j] : '.');
+      }
+      snprintf(buf+strlen(buf),128-strlen(buf), "\n");
+      buf[strlen(buf)]=0;
+      V3_Print(VM_NONE, VCORE_NONE, "%s",buf);
     }
-    PrintTrace(" ");
-    for (j = i; (j < (i + 16)) && (j < n); j++) {
-      PrintTrace("%c", ((start[j] >= 32) && (start[j] <= 126)) ? start[j] : '.');
-    }
-    PrintTrace("\n");
-  }
+    
 }