Changeset 3567 for trunk/kStuff/kLdr/tstkLdrMod.c

Timestamp:

Aug 27, 2007, 9:54:05 PM (18 years ago)

Author:

bird

Message:

Use the new type system.

File:

• trunk/kStuff/kLdr/tstkLdrMod.c (modified) (16 diffs)

trunk/kStuff/kLdr/tstkLdrMod.c

@@ -70 +70 @@
 
 /** Dummy import resolver callback. */
-static int BasicTestsGetImport(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol, const char *pchSymbol, size_t cchSymbol,
-                               const char *pszVersion, PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
+static int BasicTestsGetImport(PKLDRMOD pMod, KU32 iImport, KU32 iSymbol, const char *pchSymbol, KSIZE cchSymbol,
+                               const char *pszVersion, PKLDRADDR puValue, KU32 *pfKind, void *pvUser)
 {
     *puValue = 0xdeadface;
@@ -82 +82 @@
  * 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;
+static int TestMemComp(const void *pv1, const void *pv2, KSIZE cb)
+{
+    KSIZE           off;
+    const KU8      *pb1 = (const KU8 *)pv1;
+    const KU8      *pb2 = (const KU8 *)pv2;
     if (!memcmp(pb1, pb2, cb))
         return 0;
@@ -105 +105 @@
 static int BasicTestsRelocate(PKLDRMOD pMod, void *pvBits, void *pvBits2)
 {
-    const size_t cbImage = (size_t)kLdrModSize(pMod);
+    const KSIZE cbImage = (KSIZE)kLdrModSize(pMod);
     int rc;
 
@@ -114 +114 @@
      */
     memset(pvBits2, 0xfe, cbImage);
-    rc = kLdrModGetBits(pMod, pvBits2, (uintptr_t)pvBits, BasicTestsGetImport, NULL);
+    rc = kLdrModGetBits(pMod, pvBits2, (KUPTR)pvBits, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to get image bits, rc=%d (%s) (a)", rc, kLdrErrStr(rc));
@@ -123 +123 @@
      * Short relocation round trip.
      */
-    rc = kLdrModRelocateBits(pMod, pvBits2, 0x1000, (uintptr_t)pvBits, BasicTestsGetImport, NULL);
+    rc = kLdrModRelocateBits(pMod, pvBits2, 0x1000, (KUPTR)pvBits, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to relocate, rc=%d (%s) (b1)", rc, kLdrErrStr(rc));
-    rc = kLdrModRelocateBits(pMod, pvBits2, (uintptr_t)pvBits, 0x1000, BasicTestsGetImport, NULL);
+    rc = kLdrModRelocateBits(pMod, pvBits2, (KUPTR)pvBits, 0x1000, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to relocate, rc=%d (%s) (b2)", rc, kLdrErrStr(rc));
@@ -136 +136 @@
      */
     /* stage one */
-    rc = kLdrModRelocateBits(pMod, pvBits, 0x1000000, (uintptr_t)pvBits, BasicTestsGetImport, NULL);
+    rc = kLdrModRelocateBits(pMod, pvBits, 0x1000000, (KUPTR)pvBits, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to relocate, rc=%d (%s) (c1)", rc, kLdrErrStr(rc));
@@ -147 +147 @@
 
     /* stage two */
-    rc = kLdrModRelocateBits(pMod, pvBits, ~(uintptr_t)0x1010000, 0x1000000, BasicTestsGetImport, NULL);
+    rc = kLdrModRelocateBits(pMod, pvBits, ~(KUPTR)0x1010000, 0x1000000, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to relocate, rc=%d (%s) (c2)", rc, kLdrErrStr(rc));
     memset(pvBits2, 0xef, cbImage);
-    rc = kLdrModGetBits(pMod, pvBits2, ~(uintptr_t)0x1010000, BasicTestsGetImport, NULL);
+    rc = kLdrModGetBits(pMod, pvBits2, ~(KUPTR)0x1010000, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to get image bits, rc=%d (%s) (c2)", rc, kLdrErrStr(rc));
@@ -158 +158 @@
 
     /* stage three */
-    rc = kLdrModRelocateBits(pMod, pvBits, MY_BASEADDRESS, ~(uintptr_t)0x1010000, BasicTestsGetImport, NULL);
+    rc = kLdrModRelocateBits(pMod, pvBits, MY_BASEADDRESS, ~(KUPTR)0x1010000, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to relocate, rc=%d (%s) (c3)", rc, kLdrErrStr(rc));
@@ -169 +169 @@
 
     /* stage four */
-    rc = kLdrModRelocateBits(pMod, pvBits, ~(uintptr_t)0 / 2 - 0x10000, MY_BASEADDRESS, BasicTestsGetImport, NULL);
+    rc = kLdrModRelocateBits(pMod, pvBits, ~(KUPTR)0 / 2 - 0x10000, MY_BASEADDRESS, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to relocate, rc=%d %(s) (c4)", rc, kLdrErrStr(rc));
     memset(pvBits2, 0xdc, cbImage);
-    rc = kLdrModGetBits(pMod, pvBits2, ~(uintptr_t)0 / 2 - 0x10000, BasicTestsGetImport, NULL);
+    rc = kLdrModGetBits(pMod, pvBits2, ~(KUPTR)0 / 2 - 0x10000, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to get image bits, rc=%d (%s) (c4)", rc, kLdrErrStr(rc));
@@ -180 +180 @@
 
     /* return */
-    rc = kLdrModRelocateBits(pMod, pvBits, (uintptr_t)pvBits, ~(uintptr_t)0 / 2 - 0x10000, BasicTestsGetImport, NULL);
+    rc = kLdrModRelocateBits(pMod, pvBits, (KUPTR)pvBits, ~(KUPTR)0 / 2 - 0x10000, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to relocate, rc=%d (%s) (c5)", rc, kLdrErrStr(rc));
     memset(pvBits2, 0xcd, cbImage);
-    rc = kLdrModGetBits(pMod, pvBits2, (uintptr_t)pvBits, BasicTestsGetImport, NULL);
+    rc = kLdrModGetBits(pMod, pvBits2, (KUPTR)pvBits, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to get image bits, rc=%d (%s) (c5)", rc, kLdrErrStr(rc));
@@ -197 +197 @@
  * Dump symbols and check that we can query each of them recursivly.
  */
-static int BasicTestsEnumSymCallback(PKLDRMOD pMod, uint32_t iSymbol, const char *pchSymbol, size_t cchSymbol,
-                                     const char *pszVersion, KLDRADDR uValue, uint32_t fKind, void *pvUser)
+static int BasicTestsEnumSymCallback(PKLDRMOD pMod, KU32 iSymbol, const char *pchSymbol, KSIZE cchSymbol,
+                                     const char *pszVersion, KLDRADDR uValue, KU32 fKind, void *pvUser)
 {
     KLDRADDR    uValue2;
-    uint32_t    fKind2;
+    KU32        fKind2;
     int         rc;
 
@@ -249 +249 @@
  * Dump debugger information and check it for correctness.
  */
-static int BasicTestEnumDbgInfoCallback(PKLDRMOD pMod, uint32_t iDbgInfo, KLDRDBGINFOTYPE enmType,
-                                        int16_t iMajorVer, int16_t iMinorVer, KLDRFOFF offFile, KLDRADDR LinkAddress,
+static int BasicTestEnumDbgInfoCallback(PKLDRMOD pMod, KU32 iDbgInfo, KLDRDBGINFOTYPE enmType,
+                                        KI16 iMajorVer, KI16 iMinorVer, KLDRFOFF offFile, KLDRADDR LinkAddress,
                                         KLDRSIZE cb, const char *pszExtFile, void *pvUser)
 {
@@ -272 +272 @@
 static int BasicTestsSub2(PKLDRMOD pMod, void *pvBits)
 {
-    int32_t cImports;
-    int32_t i;
+    KI32 cImports;
+    KI32 i;
     int rc;
-    uint32_t fKind;
+    KU32 fKind;
     KLDRADDR Value;
     KLDRADDR MainEPAddress;
@@ -395 +395 @@
 {
     int         rc;
-    uint32_t    i;
+    KU32        i;
     void       *pvBits;
-    size_t      cbImage;
+    KSIZE       cbImage;
 
     /*
@@ -479 +479 @@
     printf("* Testing user mapping...\n");
 
-    cbImage = (size_t)kLdrModSize(pMod);
+    cbImage = (KSIZE)kLdrModSize(pMod);
     if (cbImage != kLdrModSize(pMod))
         return Failure("aborting test because the image is too huge!");
-    pvBits = malloc((size_t)cbImage);
+    pvBits = malloc((KSIZE)cbImage);
     if (!pvBits)
         return Failure("failed to allocate %d bytes for the image", cbImage);
 
-    rc = kLdrModGetBits(pMod, pvBits, (uintptr_t)pvBits, BasicTestsGetImport, NULL);
+    rc = kLdrModGetBits(pMod, pvBits, (KUPTR)pvBits, BasicTestsGetImport, NULL);
     if (rc)
         return Failure("failed to get image bits, rc=%d (%s)", rc, kLdrErrStr(rc));
@@ -499 +499 @@
          * Test relocating the bits in a few different ways before we're done with them.
          */
-        void *pvBits2 = malloc((size_t)cbImage);
+        void *pvBits2 = malloc((KSIZE)cbImage);
         if (pvBits2)
         {