X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstub.c;h=a1c67ffb26ab48447e24465a70cb4199981d23f4;hb=b7d9f86f7a1c23be18b50d5c647fd5d3c08369c3;hp=9f629ba409502479ab23ecdd2d1421ba3fe9d63f;hpb=47e9dfd89189fc6b150bd6b20229cb047c7e0858;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index 9f629ba4..a1c67ffb 100644
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -3,20 +3,32 @@
  */
 #include "stdio_int.h"
 #include "lib.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <acess/sys.h>
 
 #define USE_CPUID	0
 
+// === TYPES ===
+typedef struct {
+	intptr_t	Base;
+	char	*Name;
+}	tLoadedLib;
+
 // === PROTOTYPES ===
 #if USE_CPUID
 static void	cpuid(uint32_t Num, uint32_t *EAX, uint32_t *EBX, uint32_t *EDX, uint32_t *ECX);
 #endif
+ int	ErrorHandler(int Fault);
+
+// === IMPORTS ===
+extern tLoadedLib	gLoadedLibraries[64];
+extern void	*_crt0_exit_handler;
+extern void	_stdio_init(void);
+extern void	_call_atexit_handlers(void);
 
 // === GLOBALS ===
-extern char **_envp;
-extern struct sFILE	_iob[];
-extern struct sFILE	*stdin;
-extern struct sFILE	*stdout;
-extern struct sFILE	*stderr;
+extern char **environ;
 // --- CPU Features ---
 #if USE_CPUID
 tCPUID	gCPU_Features;
@@ -31,18 +43,24 @@ tCPUID	gCPU_Features;
  * \param argv	Unused - Arguments (NULL for current version of ld-acess)
  * \param envp	Environment Pointer
  */
-int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
+int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, argv), char **envp)
 {
 	// Init for env.c
-	_envp = envp;
-	
-	// Init FileIO Pointers
-	stdin = &_iob[0];
-	stdin->FD = 0;	stdin->Flags = FILE_FLAG_MODE_READ;
-	stdout = &_iob[1];
-	stdout->FD = 1;	stdout->Flags = FILE_FLAG_MODE_WRITE;
-	stderr = &_iob[2];
-	stderr->FD = 2;	stderr->Flags = FILE_FLAG_MODE_WRITE;
+	environ = envp;
+
+	#if 0	
+	{
+		 int	i = 0;
+		char	**tmp;
+		_SysDebug("envp = %p", envp);
+		for(tmp = envp; *tmp; tmp++,i++)
+		{
+			_SysDebug("envp[%i] = '%s'", i, *tmp);
+		}
+	}
+	#endif
+
+	_stdio_init();	
 	
 	#if USE_CPUID
 	{
@@ -53,9 +71,32 @@ int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
 	}
 	#endif
 	
+	_crt0_exit_handler = _call_atexit_handlers;
+
+	// Set Error handler
+	_SysSetFaultHandler(ErrorHandler);
+	
 	return 1;
 }
 
+int ErrorHandler(int Fault)
+{
+	 int	i;
+
+	extern void ldacess_DumpLoadedLibraries(void);	
+	ldacess_DumpLoadedLibraries();
+
+	fprintf(stderr, "ErrorHandler: (Fault = %i)\n", Fault);
+	fprintf(stderr, "Loaded Libraries:\n");
+	for( i = 0; i < 64; i ++ )
+	{
+		//if(gLoadedLibraries[i].Base == 0)	continue;
+	//	fprintf(stderr, "%02i: %p  %s\n", i, gLoadedLibraries[i].Base, gLoadedLibraries[i].Name);
+	}
+	fprintf(stderr, "\n");
+	exit(-1);
+	return -1;
+}
 
 #if USE_CPUID
 /**