git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DiskTool - Added 'cat' command
[tpg/acess2.git]
/
Usermode
/
Libraries
/
ld-acess.so_src
/
common.h
diff --git
a/Usermode/Libraries/ld-acess.so_src/common.h
b/Usermode/Libraries/ld-acess.so_src/common.h
index
941baf3
..
6f67811
100644
(file)
--- a/
Usermode/Libraries/ld-acess.so_src/common.h
+++ b/
Usermode/Libraries/ld-acess.so_src/common.h
@@
-7,9
+7,14
@@
#ifndef _COMMON_H
#define _COMMON_H
#ifndef _COMMON_H
#define _COMMON_H
-#define NULL ((void*)0)
-
+#include <stddef.h>
#include <stdarg.h>
#include <stdarg.h>
+#include <stdint.h>
+
+typedef uintptr_t Uint;
+typedef uint8_t Uint8;
+typedef uint16_t Uint16;
+typedef uint32_t Uint32;
// HACK: Replace with underscored
#define SysDebug _SysDebug
// HACK: Replace with underscored
#define SysDebug _SysDebug
@@
-20,14
+25,6
@@
#define SYSTEM_LIB_DIR "/Acess/Libs/"
// === Types ===
#define SYSTEM_LIB_DIR "/Acess/Libs/"
// === Types ===
-typedef unsigned int Uint;
-typedef unsigned char Uint8;
-typedef unsigned short Uint16;
-typedef unsigned long Uint32;
-typedef signed char Sint8;
-typedef signed short Sint16;
-typedef signed long Sint32;
-
typedef struct {
void *Base;
char *Name;
typedef struct {
void *Base;
char *Name;
@@
-42,8
+39,8
@@
extern void *DoRelocate(void *Base, char **envp, const char *Filename);
// === Library/Symbol Manipulation ==
extern void *LoadLibrary(const char *Filename, const char *SearchDir, char **envp);
extern void AddLoaded(const char *File, void *base);
// === Library/Symbol Manipulation ==
extern void *LoadLibrary(const char *Filename, const char *SearchDir, char **envp);
extern void AddLoaded(const char *File, void *base);
-extern void *GetSymbol(const char *name);
-extern int GetSymbolFromBase(void *base, const char *name, void **ret);
+extern void *GetSymbol(const char *name
, size_t *size
);
+extern int GetSymbolFromBase(void *base, const char *name, void **ret
, size_t *size
);
// === Library Functions ===
extern char *strcpy(char *dest, const char *src);
// === Library Functions ===
extern char *strcpy(char *dest, const char *src);
@@
-51,6
+48,7
@@
extern char *strcat(char *dest, const char *src);
extern int strcmp(const char *s1, const char *s2);
extern int strlen(const char *str);
extern int file_exists(const char *filename);
extern int strcmp(const char *s1, const char *s2);
extern int strlen(const char *str);
extern int file_exists(const char *filename);
+extern void *memcpy(void *dest, const void *src, size_t len);
// === System Calls ===
extern void _exit(int retval);
// === System Calls ===
extern void _exit(int retval);
@@
-59,13
+57,15
@@
extern void SysDebugV(const char *fmt, ...);
extern void *SysLoadBin(const char *path, void **entry);
extern int SysUnloadBin(void *Base);
extern void SysSetFaultHandler(int (*Hanlder)(int));
extern void *SysLoadBin(const char *path, void **entry);
extern int SysUnloadBin(void *Base);
extern void SysSetFaultHandler(int (*Hanlder)(int));
-extern int open(const char *filename, int flags);
+extern int open(const char *filename, int flags
, ...
);
extern int close(int fd);
// === ELF Loader ===
extern int close(int fd);
// === ELF Loader ===
-extern int ElfGetSymbol(void *Base, const char *name, void **ret);
+extern void *ElfRelocate(void *Base, char **envp, const char *Filename);
+extern int ElfGetSymbol(void *Base, const char *name, void **ret, size_t *Size);
// === PE Loader ===
// === PE Loader ===
-extern int PE_GetSymbol(void *Base, const char *Name, void **ret);
+extern void *PE_Relocate(void *Base, char **envp, const char *Filename);
+extern int PE_GetSymbol(void *Base, const char *Name, void **ret, size_t *Size);
#endif
#endif
UCC
git Repository :: git.ucc.asn.au