2 files changed, 45 insertions, 31 deletions

diff --git a/util/libreboot-utils/lib/command.c b/util/libreboot-utils/lib/command.c
index d0f783dd..a1e46e5f 100644
--- a/util/libreboot-utils/lib/command.c
+++ b/util/libreboot-utils/lib/command.c
@@ -364,8 +364,7 @@ cmd_helper_dump(void)
 		    (size_t)p);
 
 		print_mac_from_nvm(p);
-
-		hexdump(p);
+		spew_hex(f->buf + (p * GBE_PART_SIZE), NVM_SIZE);
 	}
 }
 
@@ -391,35 +390,6 @@ print_mac_from_nvm(size_t partnum)
 }
 
 void
-hexdump(size_t partnum)
-{
-	size_t c;
-	size_t row;
-	unsigned short val16;
-
-	for (row = 0; row < 8; row++) {
-
-		printf("%08lx ",
-		    (size_t)((size_t)row << 4));
-
-		for (c = 0; c < 8; c++) {
-
-			val16 = nvm_word((row << 3) + c, partnum);
-
-			if (c == 4)
-				printf(" ");
-
-			printf(" %02x %02x",
-			    (unsigned int)(val16 & 0xff),
-			    (unsigned int)(val16 >> 8));
-
-		}
-
-		printf("\n");
-	}
-}
-
-void
 cmd_helper_swap(void)
 {
 	struct xstate *x = xstatus();
diff --git a/util/libreboot-utils/lib/num.c b/util/libreboot-utils/lib/num.c
index 66fc26f1..e4d0ce6b 100644
--- a/util/libreboot-utils/lib/num.c
+++ b/util/libreboot-utils/lib/num.c
@@ -16,8 +16,10 @@
     defined(__NetBSD__) || defined(__APPLE__))
 #include <fcntl.h> /* if not arc4random: /dev/urandom */
 #endif
+#include <ctype.h>
 #include <limits.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -47,6 +49,48 @@ hextonum(char ch_s)
 	return 16;
 }
 
+/* basically hexdump -C */
+void
+spew_hex(const void *data, size_t len)
+{
+	const unsigned char *buf = (const unsigned char *)data;
+	unsigned char c;
+	size_t i;
+	size_t j;
+
+	if (buf == NULL ||
+	    len == 0)
+		return;
+
+	for (i = 0; i < len; i += 16) {
+
+		printf("%08zx  ", i);
+
+		for (j = 0; j < 16; j++) {
+
+			if (i + j < len)
+				printf("%02x ", buf[i + j]);
+			else
+				printf("   ");
+
+			if (j == 7)
+				printf(" ");
+		}
+
+		printf(" |");
+
+		for (j = 0; j < 16 && i + j < len; j++) {
+
+			c = buf[i + j];
+			printf("%c", isprint(c) ? c : '.');
+		}
+
+		printf("|\n");
+	}
+
+	printf("%08zx\n", len);
+}
+
 void
 check_bin(size_t a, const char *a_name)
 {