cleanup of debugging functions

[palacios.git] / palacios / src / palacios / vmm_util.c

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