X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstub.c;h=2494fc2800b148373d4adb2853d4fddd02d5cb8d;hb=c275e76e346b3996829cf1d66ddd488daab35a30;hp=05adb8eb7aec258724412d0caddace6d5ef402ed;hpb=17e16b3110b4c5124b0707435e0427993d696545;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index 05adb8eb..2494fc28 100644
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -1,9 +1,41 @@
 /*
-AcessOS Basic C Library
-*/
+ * AcessOS Basic C Library
+ */
+#include "stdio_int.h"
+#include "lib.h"
+#include <stdio.h>
+#include <sys/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 int	_SysSetFaultHandler(int (*Handler)(int));
 
+// === GLOBALS ===
 extern char **_envp;
+extern struct sFILE	_iob[];
+extern struct sFILE	*stdin;
+extern struct sFILE	*stdout;
+extern struct sFILE	*stderr;
+// --- CPU Features ---
+#if USE_CPUID
+tCPUID	gCPU_Features;
+#endif
 
+// === CODE ===
 /**
  * \fn int SoMain()
  * \brief Stub Entrypoint
@@ -16,6 +48,74 @@ int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
 {
 	// Init for env.c
 	_envp = 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
+	
+	// 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;
+	
+	#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
+	
+	// Set Error handler
+	_SysSetFaultHandler(ErrorHandler);
 	
 	return 1;
 }
+
+int ErrorHandler(int Fault)
+{
+	 int	i;
+	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