Halfway through deciding where to put the error handlers, I've settled on libc

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / stub.c

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index 55f4ca6..d1ee56e 100644 (file)
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -8,11 +8,20 @@
 \r
 #define USE_CPUID      0\r
 \r
+// === TYPES ===\r
+typedef struct {\r
+       intptr_t        Base;\r
+       char    *Name;\r
+}      tLoadedLib;\r
+\r
 // === PROTOTYPES ===\r
 #if USE_CPUID\r
 static void    cpuid(uint32_t Num, uint32_t *EAX, uint32_t *EBX, uint32_t *EDX, uint32_t *ECX);\r
 #endif\r
-void   ErrorHandler(int Fault);\r
+ int   ErrorHandler(int Fault);\r
+\r
+// === IMPORTS ===\r
+extern tLoadedLib      gLoadedLibraries[64];\r
 \r
 // === GLOBALS ===\r
 extern char **_envp;\r
@@ -56,14 +65,24 @@ int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
        }\r
        #endif\r
        \r
+       // Set Error handler\r
        _SysSetFaultHandler(ErrorHandler);\r
        \r
        return 1;\r
 }\r
 \r
-void ErrorHandler(int Fault)\r
+int ErrorHandler(int Fault)\r
 {\r
-       fprintf(stderr, "Fault = %i\n", Fault);\r
+        int    i;\r
+       fprintf(stderr, "ErrorHandler: (Fault = %i)\n", Fault);\r
+       fprintf(stderr, "Loaded Libraries:\n");\r
+       for( i = 0; i < 64; i ++ )\r
+       {\r
+               //if(gLoadedLibraries[i].Base == 0)     continue;\r
+       //      fprintf(stderr, "%02i: %p  %s\n", i, gLoadedLibraries[i].Base, gLoadedLibraries[i].Name);\r
+       }\r
+       fprintf(stderr, "\n");\r
+       return -1;\r
 }\r
 \r
 #if USE_CPUID\r