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=3e3e3884e07799f36752ceae178d52f3f2aa72f2;hpb=f9bb3db89469169bb5775dc031d89e570c6fed70;p=palacios.git

diff --git a/palacios/src/palacios/vmm_util.c b/palacios/src/palacios/vmm_util.c
index 3e3e388..8fecd3c 100644
--- a/palacios/src/palacios/vmm_util.c
+++ b/palacios/src/palacios/vmm_util.c
@@ -1,51 +1,44 @@
-/* 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_util.h>
 
 #include <palacios/vmm.h>
 
-extern struct vmm_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(unsigned char *start, int n)
-{
-  int i, j;
-
-  for (i = 0; i < n; i += 16) {
-    PrintTrace("%8x", (unsigned)(start + i));
-    for (j = i; (j < (i + 16)) && (j < n); j += 2) {
-      PrintTrace(" ");
-      PrintTraceHex(*((unsigned char *)(start + j)));
-      if ((j + 1) < n) { 
-	PrintTraceHex(*((unsigned char *)(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");
-  }
 }