Changeset 1546

Timestamp:

Oct 7, 2004, 8:42:16 AM (21 years ago)

Author:

bird

Message:

Dynamic loading.
Logging groups.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/logstrict.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/misc/dlclose.c (added)
• src/lib/misc/dlerror.c (added)
• src/lib/misc/dlfcn_data.c (added)
• src/lib/misc/dlfcn_private.h (added)
• src/lib/misc/dlopen.c (added)
• src/lib/misc/dlsym.c (added)
• src/lib/sys/b_ldrClose.c (added)
• src/lib/sys/b_ldrOpen.c (added)
• src/lib/sys/b_ldrSymbol.c (added)
• src/lib/sys/logstrict.c (modified) (1 diff, 1 prop)
• src/lib/sys/sharedpm.c (modified) (1 diff, 1 prop)
• src/libdl/dlsym.c (modified) (1 diff, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -340 +340 @@
 
 
+/** @defgroup __libc_Back_ldr   LIBC Backend - Loader
+ * @{ */
+
+/**
+ * Opens a shared library.
+ *
+ * @returns 0 on success.
+ * @returns Native error number.
+ * @param   pszLibrary      Name of library to load.
+ * @param   fFlags          Flags - ignored.
+ * @param   ppvModule       Where to store the handle.
+ * @param   pszError        Where to store error information.
+ * @param   cchError        Size of error buffer.
+ */
+int  __libc_Back_ldrOpen(const char *pszLibrary, int fFlags, void **ppvModule, char *pszError, size_t cchError);
+
+/**
+ * Finds a symbol in an open shared library.
+ *
+ * @returns 0 on success.
+ * @returns Native error number.
+ * @param   pvModule        Module handle returned by __libc_Back_ldrOpen();
+ * @param   pszSymbol       Name of the symbol we're to find in pvModule.
+ * @param   ppfn            Where to store the symbol address.
+ */
+int __libc_Back_ldrSymbol(void *pvHandle,  const char *pszSymbol, void **ppfn);
+
+/**
+ * Closes a shared library.
+ *
+ * @returns 0 on success.
+ * @returns Native error number.
+ * @param   pvModule        Module handle returned by __libc_Back_ldrOpen();
+ */
+int  __libc_Back_ldrClose(void *pvModule);
+
+
+/** @} */
+
+
+
+
 
 /** @defgroup __libc_Back_misc   LIBC Backend - Miscellaneous

trunk/src/emx/include/InnoTekLIBC/logstrict.h

@@ -183 +183 @@
 
 /** Backend FS APIs. */
+#define __LIBC_LOG_GRP_BACK_LDR     22
+/** Backend FS APIs. */
 #define __LIBC_LOG_GRP_BACK_FS      23
 /** Shared Process Database and LIBC Shared Memory APIs. */
-#define __LIBC_LOG_GRP_SPM          24
+#define __LIBC_LOG_GRP_BACK_SPM     24
 /** Fork APIs. */
 #define __LIBC_LOG_GRP_FORK         25

trunk/src/emx/src/lib/libc.def

@@ -1191 +1191 @@
     "___libc_Back_fsDriveDefaultSet" @1211
     "__realrealpath" @1212
+    "___libc_Timebomb" @1217
+    "___libc_Back_ldrClose" @1218
+    "___libc_Back_ldrOpen" @1219
+    "___libc_Back_ldrSymbol" @1220
+    "__std_dlclose" @1221
+    "__std_dlerror" @1222
+    "__std_dlopen" @1223
+    "__std_dlsym" @1224

trunk/src/emx/src/lib/sys/logstrict.c

@@ -449 +449 @@
             { 1, "future" },            /* 20 */
             { 1, "future" },            /* 21 */
-            { 1, "future" },            /* 22 */
-            { 1, "future" },            /* 23 */
-            { 1, "SPM" },               /* 24 */
+            { 1, "BACK_LDR" },          /* 22 */
+            { 1, "BACK_FS" },           /* 23 */
+            { 1, "BACK_SPM" },          /* 24 */
             { 1, "FORK" },              /* 25 */
             { 1, "BACK_IO" },           /* 26 */

trunk/src/emx/src/lib/sys/sharedpm.c

@@ -70 +70 @@
 #include <InnoTekLIBC/sharedpm.h>
 #include <InnoTekLIBC/fork.h>
-#define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_SPM
+#define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_BACK_SPM
 #include <InnoTekLIBC/logstrict.h>
 #include "syscalls.h"

trunk/src/emx/src/libdl/dlsym.c

@@ -45 +45 @@
     PFN     pfn;                        /* Returned symbol pointer. */
 
-    rc = DosQueryProcAddr((HMODULE)pvHandle, 0, pszSymbol, &pfn);
+    rc = DosQueryProcAddr((HMODULE)pvHandle, (long)pszSymbol < 0x10000 ? (long)pszSymbol : 0, pszSymbol, &pfn);
     dlfcn_enmLastOp     = dlfcn_dlsym;
     dlfcn_ulLastError   = rc;