cmd: Fix memory-mapping in cmp command

This unmaps a different address from what was mapped. Fix it.

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

diff --git a/cmd/mem.c b/cmd/mem.c
index 274348068c2f77913678bc4a60f73d8d67cb9999..4d6fde2853170fb92b534ba9af6bb6cf654c0fc0 100644 (file)
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -245,7 +245,7 @@ static int do_mem_cmp(struct cmd_tbl *cmdtp, int flag, int argc,
        int     size;
        int     rcode = 0;
        const char *type;
-       const void *buf1, *buf2, *base;
+       const void *buf1, *buf2, *base, *ptr1, *ptr2;
        ulong word1, word2;  /* 64-bit if MEM_SUPPORT_64BIT_DATA */
 
        if (argc != 4)
@@ -270,22 +270,22 @@ static int do_mem_cmp(struct cmd_tbl *cmdtp, int flag, int argc,
        bytes = size * count;
        base = buf1 = map_sysmem(addr1, bytes);
        buf2 = map_sysmem(addr2, bytes);
-       for (ngood = 0; ngood < count; ++ngood) {
+       for (ngood = 0, ptr1 = buf1, ptr2 = buf2; ngood < count; ++ngood) {
                if (size == 4) {
-                       word1 = *(u32 *)buf1;
-                       word2 = *(u32 *)buf2;
+                       word1 = *(u32 *)ptr1;
+                       word2 = *(u32 *)ptr2;
                } else if (MEM_SUPPORT_64BIT_DATA && size == 8) {
-                       word1 = *(ulong *)buf1;
-                       word2 = *(ulong *)buf2;
+                       word1 = *(ulong *)ptr1;
+                       word2 = *(ulong *)ptr2;
                } else if (size == 2) {
-                       word1 = *(u16 *)buf1;
-                       word2 = *(u16 *)buf2;
+                       word1 = *(u16 *)ptr1;
+                       word2 = *(u16 *)ptr2;
                } else {
-                       word1 = *(u8 *)buf1;
-                       word2 = *(u8 *)buf2;
+                       word1 = *(u8 *)ptr1;
+                       word2 = *(u8 *)ptr2;
                }
                if (word1 != word2) {
-                       ulong offset = buf1 - base;
+                       ulong offset = ptr1 - base;
                        printf("%s at 0x%08lx (%#0*lx) != %s at 0x%08lx (%#0*lx)\n",
                                type, (ulong)(addr1 + offset), size, word1,
                                type, (ulong)(addr2 + offset), size, word2);
@@ -293,8 +293,8 @@ static int do_mem_cmp(struct cmd_tbl *cmdtp, int flag, int argc,
                        break;
                }
 
-               buf1 += size;
-               buf2 += size;
+               ptr1 += size;
+               ptr2 += size;
 
                /* reset watchdog from time to time */
                if ((ngood % (64 << 10)) == 0)