Merge branch 'master' of github.com:thepowersgang/acess2

[tpg/acess2.git] / KernelLand / Kernel / bin / elf.c

diff --git a/KernelLand/Kernel/bin/elf.c b/KernelLand/Kernel/bin/elf.c
index 76724bc..f4c73e2 100644 (file)
--- a/KernelLand/Kernel/bin/elf.c
+++ b/KernelLand/Kernel/bin/elf.c
@@ -1,21 +1,37 @@
 /*\r
- * Acess v0.1\r
- * ELF Executable Loader Code\r
+ * Acess2 Kernel\r
+ * - By John Hodge (thePowersGang)\r
+ *\r
+ * elf.c\r
+ * - ELF Executable Loader Code\r
  */\r
 #define DEBUG  0\r
 #include <acess.h>\r
 #include <binary.h>\r
 \r
+// ---- Import linking code from userland\r
 #define _COMMON_H\r
 #define SysDebug(v...) LOG(v)\r
 #if BITS <= 32\r
 # define DISABLE_ELF64\r
 #endif\r
-void   *GetSymbol(const char *Name, size_t *Size);\r
-void   *GetSymbol(const char *Name, size_t *Size) { Uint val; Binary_GetSymbol(Name, &val); if(Size)*Size=0; return (void*)val; };\r
+static int     GetSymbol(const char *Name, void **Value, size_t *Size);\r
+static int     GetSymbol(const char *Name, void **Value, size_t *Size) {\r
+       Uint val;\r
+       if(!Binary_GetSymbol(Name, &val)) {\r
+               Log_Notice("ELF", "Lookup of '%s' failed", Name);\r
+               return 0;\r
+       }\r
+       if(Size)\r
+               *Size=0;\r
+       *Value = (void*)val;\r
+       return 1;\r
+}\r
 #define AddLoaded(a,b) do{}while(0)\r
 #define LoadLibrary(a,b,c)     (Log_Debug("ELF", "Module requested lib '%s'",a),0)\r
+#define _SysSetMemFlags(ad,f,m)        do{}while(0)\r
 #include "../../../Usermode/Libraries/ld-acess.so_src/elf.c"\r
+// ---- / ----\r
 \r
 #define DEBUG_WARN     1\r
 \r