Changeset 2967 for trunk/kLdr/testcase/tst-3-driver.c

Timestamp:

Feb 13, 2007, 11:28:46 PM (18 years ago)

Author:

bird

Message:

More testcase fun.

File:

• trunk/kLdr/testcase/tst-3-driver.c (modified) (4 diffs)

trunk/kLdr/testcase/tst-3-driver.c

@@ -72 +72 @@
 
 
+/**
+ * External symbol used by the testcase module.
+ */
+static int Tst3Ext(int iFortyTwo)
+{
+    if (iFortyTwo != 42)
+        return 256;
+    return 42;
+}
+
+
+/**
+ * Callback for resolving the Tst3Ext import.
+ */
 static int GetImport(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol, const char *pchSymbol, size_t cchSymbol,
                      const char *pszVersion, PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
 {
-    /** todo */
-    return -1;
+    if (*pfKind != KLDRSYMKIND_REQ_FLAT)
+        return -1;
+
+    if (    !strncmp(pchSymbol, "Tst3Ext", strlen("Tst3Ext"))
+        ||  !strncmp(pchSymbol, "_Tst3Ext", strlen("_Tst3Ext")))
+    {
+        *puValue = (uintptr_t)&Tst3Ext;
+        *pfKind = KLDRSYMKIND_CODE | (sizeof(pfKind) == 4 ? KLDRSYMKIND_32BIT : KLDRSYMKIND_64BIT);
+        return 0;
+    }
+
+    return -2;
 }
 
@@ -100 +124 @@
     /* get bits. */
     cbImage = kLdrModSize(pMod);
-    pvBits = malloc((size_t)cbImage);
+    pvBits = malloc((size_t)cbImage + 0xfff);
     if (pvBits)
     {
-        KLDRADDR BaseAddress = (uintptr_t)pvBits;
-        rc = kLdrModGetBits(pMod, pvBits, BaseAddress, GetImport, NULL);
+        void *pvBits2 = (void *)( ((uintptr_t)pvBits + 0xfff) & ~(uintptr_t)0xfff );
+
+        KLDRADDR BaseAddress = (uintptr_t)pvBits2;
+        rc = kLdrModGetBits(pMod, pvBits2, BaseAddress, GetImport, NULL);
         if (!rc)
         {
-            const char *pszSym = MY_NAME("Tst3");
             KLDRADDR EntryPoint;
 
             /* call into it */
-            rc = kLdrModQuerySymbol(pMod, pvBits, BaseAddress, NIL_KLDRMOD_SYM_ORDINAL, pszSym, strlen(pszSym), NULL, NULL, NULL,
+            rc = kLdrModQuerySymbol(pMod, pvBits2, BaseAddress, NIL_KLDRMOD_SYM_ORDINAL, "_Tst3", strlen("_Tst3"), NULL, NULL, NULL,
                                     &EntryPoint, NULL);
+            if (rc == KLDR_ERR_SYMBOL_NOT_FOUND)
+                rc = kLdrModQuerySymbol(pMod, pvBits2, BaseAddress, NIL_KLDRMOD_SYM_ORDINAL, "Tst3", strlen("Tst3"), NULL, NULL, NULL,
+                                        &EntryPoint, NULL);
             if (!rc)
             {
@@ -120 +148 @@
                 {
                     /* relocate twice and try again. */
-                    rc = kLdrModRelocateBits(pMod, pvBits, BaseAddress + 0x22000, BaseAddress, GetImport, NULL);
+                    rc = kLdrModRelocateBits(pMod, pvBits2, BaseAddress + 0x22000, BaseAddress, GetImport, NULL);
                     if (!rc)
                     {
-                        rc = kLdrModRelocateBits(pMod, pvBits, BaseAddress, BaseAddress + 0x22000, GetImport, NULL);
+                        rc = kLdrModRelocateBits(pMod, pvBits2, BaseAddress, BaseAddress + 0x22000, GetImport, NULL);
                         if (!rc)
                         {
@@ -178 +206 @@
      */
     if (!g_cErrors)
-        printf("tst-0-driver: SUCCESS\n");
+        printf("tst-3-driver: SUCCESS\n");
     else
-        printf("tst-0-driver: FAILURE - %d errors\n", g_cErrors);
+        printf("tst-3-driver: FAILURE - %d errors\n", g_cErrors);
     return !!g_cErrors;
 }