Usermode/libc - Makefile update, move stdin/... to .data for R_*_COPY to work

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index c615b6e..d5aa216 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,9 +4,11 @@
 -include ../Makefile.cfg\r
 \r
 CPPFLAGS += \r
-CFLAGS   += -Wall -Werror -Wextra\r
+CFLAGS   += -nostdlib -Wall -Werror -Wextra\r
 ASFLAGS  +=\r
-LDFLAGS  += -Map map.txt\r
+LDFLAGS  += -nostdlib\r
+PRELINK  := $(CRTI) $(CRTBEGIN) $(OUTPUTDIR)/Libs/crt0S.o\r
+LIBS     += $(LIBGCC_PATH) $(CRTEND) $(CRTN)\r
 \r
 INCFILES := stdio.h stdlib.h\r
 \r

diff --git a/Usermode/Libraries/libc.so_src/signals.c b/Usermode/Libraries/libc.so_src/signals.c
index 5e32fc8..532f09b 100644 (file)
--- a/Usermode/Libraries/libc.so_src/signals.c
+++ b/Usermode/Libraries/libc.so_src/signals.c
@@ -41,6 +41,7 @@ int raise(int signal)
 void abort(void)
 {
        // raise(SIGABRT);
+       _SysDebug("abort() - %p", __builtin_return_address(0));
        _exit(-1);
 }
 

diff --git a/Usermode/Libraries/libc.so_src/stdio.c b/Usermode/Libraries/libc.so_src/stdio.c
index 7969f4c..a0008d3 100644 (file)
--- a/Usermode/Libraries/libc.so_src/stdio.c
+++ b/Usermode/Libraries/libc.so_src/stdio.c
@@ -14,6 +14,9 @@
 \r
 #define DEBUG_BUILD    0\r
 \r
+#define LOG_WARN(f,...)        _SysDebug("WARN: %s: "f, __func__ ,## __VA_ARGS__)\r
+#define LOG_NOTICE(f,...)      _SysDebug("NOTE: %s: "f, __func__ ,## __VA_ARGS__)\r
+\r
 // === CONSTANTS ===\r
 #define        _stdin  0\r
 #define        _stdout 1\r
@@ -27,9 +30,9 @@ struct sFILE  *get_file_struct();
 \r
 // === GLOBALS ===\r
 struct sFILE   _iob[STDIO_MAX_STREAMS];        // IO Buffer\r
-struct sFILE   *stdin; // Standard Input\r
-struct sFILE   *stdout;        // Standard Output\r
-struct sFILE   *stderr;        // Standard Error\r
+struct sFILE   *stdin = &_iob[0];      // Standard Input\r
+struct sFILE   *stdout = &_iob[1];     // Standard Output\r
+struct sFILE   *stderr = &_iob[2];     // Standard Error\r
 ///\note Initialised in SoMain\r
 static const int STDIN_BUFSIZ = 512;\r
 static const int STDOUT_BUFSIZ = 512;\r
@@ -38,19 +41,16 @@ static const int STDOUT_BUFSIZ = 512;
 void _stdio_init(void)\r
 {\r
        // Init FileIO Pointers\r
-       stdin = &_iob[0];\r
        stdin->FD = 0;\r
        stdin->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_READ|FILE_FLAG_LINEBUFFERED|FILE_FLAG_OURBUFFER;\r
        stdin->Buffer = malloc(STDIN_BUFSIZ);\r
        stdin->BufferSpace = STDIN_BUFSIZ;\r
 \r
-       stdout = &_iob[1];\r
        stdout->FD = 1;\r
        stdout->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_WRITE|FILE_FLAG_LINEBUFFERED|FILE_FLAG_OURBUFFER;\r
        stdout->Buffer = malloc(STDOUT_BUFSIZ);\r
        stdout->BufferSpace = STDOUT_BUFSIZ;\r
        \r
-       stderr = &_iob[2];\r
        stderr->FD = 2;\r
        stderr->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_WRITE;\r
 }\r
@@ -682,19 +682,24 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 {\r
        size_t  ret;\r
        \r
-       if(!fp || fp->FD == -1)\r
+       if(!fp || fp->FD == -1) {\r
+               LOG_WARN("bad fp %p", fp);\r
                return -1;\r
+       }\r
        if( size == 0 || num == 0 )\r
                return 0;\r
        \r
        if( _GetFileMode(fp) != FILE_FLAG_MODE_READ ) {\r
                errno = 0;\r
+               LOG_WARN("not open for read");\r
                return -1;\r
        }\r
 \r
        // Don't read if EOF is set\r
-       if( fp->Flags & FILE_FLAG_EOF )\r
+       if( fp->Flags & FILE_FLAG_EOF ) {\r
+               LOG_NOTICE("EOF");\r
                return 0;\r
+       }\r
 \r
        \r
        if( fp->FD == FD_MEMFILE ) {\r
@@ -702,6 +707,7 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
        }\r
        else if( fp->FD == FD_MEMSTREAM ) {\r
                //return _fread_memstream(ptr, size, num, fp);\r
+               LOG_WARN("Reading from a mem stream");\r
                errno = EBADF;\r
                return 0;\r
        }\r
@@ -745,6 +751,8 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
                                extra, size, num\r
                                );\r
                }\r
+               LOG_NOTICE("Incomplete read %i/%i bytes (object size %i)",\r
+                       ret, bytes, size);\r
        }\r
        \r
        return ret / size;\r

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index a1c67ff..922943e 100644 (file)
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -45,21 +45,8 @@ tCPUID       gCPU_Features;
  */\r
 int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, argv), char **envp)\r
 {\r
-       // Init for env.c\r
        environ = envp;\r
 \r
-       #if 0   \r
-       {\r
-                int    i = 0;\r
-               char    **tmp;\r
-               _SysDebug("envp = %p", envp);\r
-               for(tmp = envp; *tmp; tmp++,i++)\r
-               {\r
-                       _SysDebug("envp[%i] = '%s'", i, *tmp);\r
-               }\r
-       }\r
-       #endif\r
-\r
        _stdio_init();  \r
        \r
        #if USE_CPUID\r
@@ -76,7 +63,7 @@ int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, ar
        // Set Error handler\r
        _SysSetFaultHandler(ErrorHandler);\r
        \r
-       return 1;\r
+       return 0;\r
 }\r
 \r
 int ErrorHandler(int Fault)\r