Kernel/Heap - (minor) Commenting spellfixes

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

diff --git a/KernelLand/Kernel/bin/elf.c b/KernelLand/Kernel/bin/elf.c
index 7e1ef5e..d404d6d 100644 (file)
--- a/KernelLand/Kernel/bin/elf.c
+++ b/KernelLand/Kernel/bin/elf.c
@@ -1,11 +1,15 @@
 /*\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
@@ -14,8 +18,10 @@
 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
+       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
@@ -23,8 +29,20 @@ static int   GetSymbol(const char *Name, void **Value, size_t *Size) {
 }\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
+static int     _SysSetMemFlags(tVAddr addr, int flag, int mask) {\r
+       if( mask & 1 ) {\r
+               if( flag ) {\r
+                       // Re-set RO, clear COW\r
+                       MM_SetFlags(addr, MM_PFLAG_RO, MM_PFLAG_RO|MM_PFLAG_COW);\r
+               }\r
+               else {\r
+                       MM_SetFlags(addr, MM_PFLAG_RO|MM_PFLAG_COW, MM_PFLAG_RO|MM_PFLAG_COW);\r
+               }\r
+       }\r
+       return 0;\r
+}\r
 #include "../../../Usermode/Libraries/ld-acess.so_src/elf.c"\r
+// ---- / ----\r
 \r
 #define DEBUG_WARN     1\r
 \r