hexdump: Add support for sandbox

The current implementation outputs an address as a pointer. Update the
code to use an address instead, respecting the 32/64 nature of the CPU.

Add some initial tests copied from print_test_display_buffer(), just the
ones that can pass with the current implementation.

Note that for this case print_hex_dump() and print_bufffer() produce the
same result. For now the tests are duplicated sine we have separate
functions.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/lib/hexdump.c b/lib/hexdump.c
index e31784cc118196b31e6cad66b655f47041bb5d56..a76ea707b693b0c1e772ae18e7d7eb64b64db4b8 100644 (file)
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <hexdump.h>
+#include <mapmem.h>
 #include <linux/ctype.h>
 #include <linux/compat.h>
 #include <linux/log2.h>
@@ -139,7 +140,9 @@ void print_hex_dump(const char *prefix_str, int prefix_type, int rowsize,
 
                switch (prefix_type) {
                case DUMP_PREFIX_ADDRESS:
-                       printf("%s%p: %s\n", prefix_str, ptr + i, linebuf);
+                       printf("%s%0*lx: %s\n", prefix_str,
+                              IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8,
+                              (ulong)map_to_sysmem(ptr) + i, linebuf);
                        break;
                case DUMP_PREFIX_OFFSET:
                        printf("%s%.8x: %s\n", prefix_str, i, linebuf);

diff --git a/test/print_ut.c b/test/print_ut.c
index 9562db6ec3cc4299fc4cf8353c71370f74b2e7ab..b9c4b1142c246932cd01f948b79a22463651483e 100644 (file)
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -227,6 +227,64 @@ static int print_display_buffer(struct unit_test_state *uts)
 }
 PRINT_TEST(print_display_buffer, UT_TESTF_CONSOLE_REC);
 
+static int print_do_hex_dump(struct unit_test_state *uts)
+{
+       u8 *buf;
+       int i;
+
+       buf = map_sysmem(0, BUF_SIZE);
+       memset(buf, '\0', BUF_SIZE);
+       for (i = 0; i < 0x11; i++)
+               buf[i] = i * 0x11;
+
+       /* bytes */
+       console_record_reset();
+       print_hex_dump_bytes("", DUMP_PREFIX_ADDRESS, buf, 0x12);
+       ut_assert_nextline("00000000: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff  ..\"3DUfw........");
+       ut_assert_nextline("00000010: 10 00                                            ..");
+       ut_assert_console_end();
+
+       /* 16-bit */
+       console_record_reset();
+       print_hex_dump("", DUMP_PREFIX_ADDRESS, 16, 2, buf, 0x12, true);
+       ut_assert_nextline("00000000: 1100 3322 5544 7766 9988 bbaa ddcc ffee  ..\"3DUfw........");
+       ut_assert_nextline("00000010: 0010                                     ..");
+       ut_assert_console_end();
+       unmap_sysmem(buf);
+
+       /* 32-bit */
+       console_record_reset();
+       print_hex_dump("", DUMP_PREFIX_ADDRESS, 16, 4, buf, 0x14, true);
+       ut_assert_nextline("00000000: 33221100 77665544 bbaa9988 ffeeddcc  ..\"3DUfw........");
+       ut_assert_nextline("00000010: 00000010                             ....");
+       ut_assert_console_end();
+       unmap_sysmem(buf);
+
+       /* 64-bit */
+       console_record_reset();
+       print_hex_dump("", DUMP_PREFIX_ADDRESS, 16, 8, buf, 0x18, true);
+       ut_assert_nextline("00000000: 7766554433221100 ffeeddccbbaa9988  ..\"3DUfw........");
+       ut_assert_nextline("00000010: 0000000000000010                   ........");
+       ut_assert_console_end();
+       unmap_sysmem(buf);
+
+       /* ASCII */
+       console_record_reset();
+       buf[1] = 31;
+       buf[2] = 32;
+       buf[3] = 33;
+       for (i = 0; i < 4; i++)
+               buf[4 + i] = 126 + i;
+       buf[8] = 255;
+       print_hex_dump("", DUMP_PREFIX_ADDRESS, 16, 1, buf, 10, true);
+       ut_assert_nextline("00000000: 00 1f 20 21 7e 7f 80 81 ff 99                    .. !~.....");
+       ut_assert_console_end();
+       unmap_sysmem(buf);
+
+       return 0;
+}
+PRINT_TEST(print_do_hex_dump, UT_TESTF_CONSOLE_REC);
+
 int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        struct unit_test *tests = UNIT_TEST_SUITE_START(print_test);