AcessNative - Cleanup and slight fixes.

[tpg/acess2.git] / AcessNative / ld-acess_src / common.h

diff --git a/AcessNative/ld-acess_src/common.h b/AcessNative/ld-acess_src/common.h
index 05c288b..59be119 100644 (file)
--- a/AcessNative/ld-acess_src/common.h
+++ b/AcessNative/ld-acess_src/common.h
@@ -6,32 +6,43 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <string.h>
 
 extern int     Binary_GetSymbol(const char *SymbolName, uintptr_t *Value);
 extern void    *Binary_LoadLibrary(const char *Path);
 extern void    *Binary_Load(const char *Path, uintptr_t *EntryPoint);
 extern void    Binary_SetReadyToUse(void *Base);
 
+// HACKS - So this can share the usermode elf.c
+static inline void *GetSymbol(const char*sym, size_t*sz)
+{
+       uintptr_t rv;
+       if( Binary_GetSymbol(sym, &rv) )
+               return NULL;
+       return (void*)rv;
+}
+static inline void *LoadLibrary(const char *Name, const char *SearchPath, char **envp)
+{
+       return Binary_LoadLibrary(Name);
+}
+static inline void AddLoaded(const char *Path, void *Base)
+{
+       Binary_SetReadyToUse(Base);
+}
+
 extern int     AllocateMemory(uintptr_t VirtAddr, size_t ByteCount);
 extern uintptr_t       FindFreeRange(size_t ByteCount, int MaxBits);
 
 extern void    Warning(const char *Format, ...);
 extern void    Notice(const char *Format, ...);
 extern void    Debug(const char *Format, ...);
+#define SysDebug       Debug
 
 #define ACESS_SEEK_CUR 0
 #define ACESS_SEEK_SET 1
 #define ACESS_SEEK_END -1
 
-extern int     acess_open(const char *Path, int Flags);
-extern void    acess_close(int FD);
-extern size_t  acess_read(int FD, size_t Bytes, void *Dest);
-extern int     acess_seek(int FD, int64_t Offset, int Dir);
-
-typedef struct {
-       char    *Name;
-       void    *Value;
-}      tSym;
+#include "exports.h"
 
 typedef struct sBinFmt {
        struct sBinFmt  *Next;