Kernel - Change virtual memory API to use void* for virtual addresses

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

diff --git a/KernelLand/Kernel/bin/elf.c b/KernelLand/Kernel/bin/elf.c
index 16da915..7f65d89 100644 (file)
--- a/KernelLand/Kernel/bin/elf.c
+++ b/KernelLand/Kernel/bin/elf.c
@@ -1,19 +1,48 @@
 /*\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(...)  LOG(v)\r
-#define DISABLE_ELF64\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
+#define SysDebug(v...) LOG(v)\r
+#if BITS <= 32\r
+# define DISABLE_ELF64\r
+#endif\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)     0\r
+#define LoadLibrary(a,b,c)     (Log_Debug("ELF", "Module requested lib '%s'",a),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((void*)addr, MM_PFLAG_RO, MM_PFLAG_RO|MM_PFLAG_COW);\r
+               }\r
+               else {\r
+                       MM_SetFlags((void*)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
@@ -50,7 +79,7 @@ tBinary *Elf_Load(int fp)
        switch(hdr.e_ident[4])  // EI_CLASS\r
        {\r
        case ELFCLASS32:\r
-               return Elf_Load32(fp, (Elf32_Ehdr*)&hdr);\r
+               return Elf_Load32(fp, (void*)&hdr);\r
        case ELFCLASS64:\r
                return Elf_Load64(fp, &hdr);\r
        default:\r
@@ -291,7 +320,7 @@ tBinary *Elf_Load32(int FD, Elf32_Ehdr *Header)
 \r
 int Elf_Relocate(void *Base)\r
 {\r
-       return  ElfRelocate(Base, (char**){NULL}, "") != NULL;\r
+       return ElfRelocate(Base, (char**){NULL}, "") != NULL;\r
 }\r
 int Elf_GetSymbol(void *Base, const char *Name, Uint *ret)\r
 {\r