Changeset 2890 for trunk/kLdr/tstkLdrMod.c

Timestamp:

Nov 21, 2006, 5:33:25 PM (19 years ago)

Author:

bird

Message:

LX bugfixing. the unit test succeeds, but there are still things todo.

File:

• trunk/kLdr/tstkLdrMod.c (modified) (8 diffs)

trunk/kLdr/tstkLdrMod.c

@@ -79 +79 @@
 
 
+/**
+ * Verbose memcmp().
+ */
+static int TestMemComp(const void *pv1, const void *pv2, size_t cb)
+{
+    size_t          off;
+    const uint8_t  *pb1 = (const uint8_t *)pv1;
+    const uint8_t  *pb2 = (const uint8_t *)pv2;
+    if (!memcmp(pb1, pb2, cb))
+        return 0;
+    printf("Mismatching blocks pv1=%p pv2=%p cb=%#x:\n", pv1, pv2, cb);
+    for (off = 0; off < cb; off++)
+    {
+        if (pb1[off] == pb2[off])
+            continue;
+        printf("%08x %02x != %02x\n", off, pb1[off], pb2[off]);
+    }
+    return memcmp(pb1, pb2, cb); /* lazy */
+}
+
 
 /**
@@ -97 +117 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (a)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (a)");
 
@@ -109 +129 @@
     if (rc)
         return Failure("failed to relocate, rc=%d (b2)");
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (b)");
 
@@ -123 +143 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c1)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c1)");
 
@@ -134 +154 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c2)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c2)");
 
@@ -145 +165 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c3)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c3)");
 
@@ -156 +176 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c4)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c4)");
 
@@ -167 +187 @@
     if (rc)
         return Failure("failed to get image bits, rc=%d (c5)", rc);
-    if (memcmp(pvBits2, pvBits, cbImage))
+    if (TestMemComp(pvBits2, pvBits, cbImage))
         return Failure("relocation test failed, mismatching bits (c5)");