Fixes to VM8086 handler to remove operand size errors.

[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 a10d9d1..55f4ca6 100644 (file)
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -2,13 +2,30 @@
  * AcessOS Basic C Library\r
  */\r
 #include "stdio_int.h"\r
+#include "lib.h"\r
+#include <stdio.h>\r
+#include <sys/sys.h>\r
 \r
+#define USE_CPUID      0\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
+\r
+// === GLOBALS ===\r
 extern char **_envp;\r
 extern struct sFILE    _iob[];\r
 extern struct sFILE    *stdin;\r
 extern struct sFILE    *stdout;\r
 extern struct sFILE    *stderr;\r
+// --- CPU Features ---\r
+#if USE_CPUID\r
+tCPUID gCPU_Features;\r
+#endif\r
 \r
+// === CODE ===\r
 /**\r
  * \fn int SoMain()\r
  * \brief Stub Entrypoint\r
@@ -30,5 +47,42 @@ int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
        stderr = &_iob[2];\r
        stderr->FD = 2; stderr->Flags = FILE_FLAG_MODE_WRITE;\r
        \r
+       #if USE_CPUID\r
+       {\r
+               uint32_t        ecx, edx;\r
+               cpuid(1, NULL, NULL, &edx, &ecx);\r
+               gCPU_Features.SSE  = edx & (1 << 25);   // SSE\r
+               gCPU_Features.SSE2 = edx & (1 << 26);   // SSE2\r
+       }\r
+       #endif\r
+       \r
+       _SysSetFaultHandler(ErrorHandler);\r
+       \r
        return 1;\r
 }\r
+\r
+void ErrorHandler(int Fault)\r
+{\r
+       fprintf(stderr, "Fault = %i\n", Fault);\r
+}\r
+\r
+#if USE_CPUID\r
+/**\r
+ * \brief Call the CPUID opcode\r
+ */\r
+static void cpuid(uint32_t Num, uint32_t *EAX, uint32_t *EBX, uint32_t *EDX, uint32_t *ECX)\r
+{\r
+       uint32_t        eax, ebx, edx, ecx;\r
+       \r
+       __asm__ __volatile__ (\r
+               "cpuid"\r
+               : "=a"(eax), "=c"(ecx), "=d"(edx)\r
+               : "a"(Num)\r
+               );\r
+       \r
+       if(EAX) *EAX = eax;\r
+       if(EBX) *EBX = ebx;\r
+       if(EDX) *EDX = edx;\r
+       if(ECX) *ECX = ecx;\r
+}\r
+#endif\r