X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstub.c;h=a1c67ffb26ab48447e24465a70cb4199981d23f4;hb=8735311896d1bd38ae79f1aa604ed81712bd5d97;hp=a10d9d1114472a8c2742d98e20cb12fb37b50336;hpb=eb80b37c619769496f3fca58d54c4a4b8d8fac4a;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index a10d9d11..a1c67ffb 100644
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -2,13 +2,39 @@
  * AcessOS Basic C Library
  */
 #include "stdio_int.h"
+#include "lib.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <acess/sys.h>
 
-extern char **_envp;
-extern struct sFILE	_iob[];
-extern struct sFILE	*stdin;
-extern struct sFILE	*stdout;
-extern struct sFILE	*stderr;
+#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 **environ;
+// --- CPU Features ---
+#if USE_CPUID
+tCPUID	gCPU_Features;
+#endif
+
+// === CODE ===
 /**
  * \fn int SoMain()
  * \brief Stub Entrypoint
@@ -17,18 +43,78 @@ extern struct sFILE	*stderr;
  * \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;
+	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
+	{
+		uint32_t	ecx, edx;
+		cpuid(1, NULL, NULL, &edx, &ecx);
+		gCPU_Features.SSE  = edx & (1 << 25);	// SSE
+		gCPU_Features.SSE2 = edx & (1 << 26);	// SSE2
+	}
+	#endif
 	
-	// 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;
+	_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
+/**
+ * \brief Call the CPUID opcode
+ */
+static void cpuid(uint32_t Num, uint32_t *EAX, uint32_t *EBX, uint32_t *EDX, uint32_t *ECX)
+{
+	uint32_t	eax, ebx, edx, ecx;
+	
+	__asm__ __volatile__ (
+		"cpuid"
+		: "=a"(eax), "=c"(ecx), "=d"(edx)
+		: "a"(Num)
+		);
+	
+	if(EAX)	*EAX = eax;
+	if(EBX)	*EBX = ebx;
+	if(EDX)	*EDX = edx;
+	if(ECX)	*ECX = ecx;
+}
+#endif