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
Fixes to MakeReleaseSet script
[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
3356a27
..
d44008f
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,16
+25,8
@@
#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 {
typedef struct {
-
Uint
Base;
+
void *
Base;
char *Name;
} tLoadedLib;
char *Name;
} tLoadedLib;
@@
-37,35
+34,35
@@
typedef struct {
extern tLoadedLib gLoadedLibraries[MAX_LOADED_LIBRARIES];
// === Main ===
extern tLoadedLib gLoadedLibraries[MAX_LOADED_LIBRARIES];
// === Main ===
-extern
int DoRelocate( Uint base, char **envp, char *Filename
);
+extern
void *DoRelocate(void *Base, char **envp, const char *Filename
);
// === Library/Symbol Manipulation ==
// === Library/Symbol Manipulation ==
-extern
Uint LoadLibrary(char *filename,
char *SearchDir, char **envp);
-extern void AddLoaded(c
har *File, Uint
base);
-extern
Uint GetSymbol(
char *name);
-extern int GetSymbolFromBase(
Uint base, char *name, Uint
*ret);
+extern
void *LoadLibrary(const char *Filename, const
char *SearchDir, char **envp);
+extern void AddLoaded(c
onst char *File, void *
base);
+extern
void *GetSymbol(const
char *name);
+extern int GetSymbolFromBase(
void *base, const char *name, void *
*ret);
// === Library Functions ===
extern char *strcpy(char *dest, const char *src);
extern char *strcat(char *dest, const char *src);
extern int strcmp(const char *s1, const char *s2);
extern int strlen(const char *str);
// === Library Functions ===
extern char *strcpy(char *dest, const char *src);
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(char *filename);
+extern int file_exists(c
onst c
har *filename);
// === System Calls ===
extern void _exit(int retval);
// === System Calls ===
extern void _exit(int retval);
-extern void SysDebug(c
har *fmt, ...);
//!< Now implemented in main.c
-extern void SysDebugV(char *fmt, ...);
-extern
Uint SysLoadBin(char *path, Uint
*entry);
-extern
Uint SysUnloadBin(Uint
Base);
+extern void SysDebug(c
onst char *fmt, ...);
//!< Now implemented in main.c
+extern void SysDebugV(c
onst c
har *fmt, ...);
+extern
void *SysLoadBin(const char *path, void *
*entry);
+extern
int SysUnloadBin(void *
Base);
extern void SysSetFaultHandler(int (*Hanlder)(int));
extern void SysSetFaultHandler(int (*Hanlder)(int));
-extern int open(char *filename, int flags);
-extern
void
close(int fd);
+extern int open(c
onst c
har *filename, int flags);
+extern
int
close(int fd);
// === ELF Loader ===
// === ELF Loader ===
-extern int ElfGetSymbol(
Uint Base, char *name, Uint
*ret);
+extern int ElfGetSymbol(
void *Base, const char *name, void *
*ret);
// === PE Loader ===
// === PE Loader ===
-extern int PE_GetSymbol(
Uint Base, char *Name, Uint
*ret);
+extern int PE_GetSymbol(
void *Base, const char *Name, void *
*ret);
#endif
#endif
UCC
git Repository :: git.ucc.asn.au