diff options
Diffstat (limited to 'src/include')
| -rwxr-xr-x | src/include/box64context.h | 25 | ||||
| -rwxr-xr-x | src/include/library.h | 4 | ||||
| -rwxr-xr-x | src/include/wrappedlibs.h | 4 |
3 files changed, 14 insertions, 19 deletions
diff --git a/src/include/box64context.h b/src/include/box64context.h index 5dc2399d..036a2b6d 100755 --- a/src/include/box64context.h +++ b/src/include/box64context.h @@ -136,23 +136,14 @@ typedef struct box64context_s { pthread_mutex_t mutex_bridge; library_t *libclib; // shortcut to libc library (if loaded, so probably yes) - library_t *sdl1lib; // shortcut to SDL1 library (if loaded) - void* sdl1allocrw; - void* sdl1freerw; library_t *sdl1mixerlib; - library_t *sdl2lib; // shortcut to SDL2 library (if loaded) - void* sdl2allocrw; - void* sdl2freerw; + library_t *sdl2lib; library_t *sdl2mixerlib; - library_t *x11lib; - library_t *zlib; - library_t *vorbisfile; - library_t *vorbis; - library_t *asound; - library_t *pulse; - library_t *d3dadapter9; - library_t *libglu; linkmap_t *linkmap; + void* sdl1allocrw; // SDL1 AllocRW/FreeRW function + void* sdl1freerw; + void* sdl2allocrw; // SDL2 AllocRW/FreeRW function + void* sdl2freerw; int deferedInit; elfheader_t **deferedInitList; @@ -166,9 +157,9 @@ typedef struct box64context_s { uintptr_t *auxval_start; - cleanup_t *cleanups; // atexit functions - int clean_sz; - int clean_cap; + cleanup_t *cleanups; // atexit functions + int clean_sz; + int clean_cap; zydis_dec_t *dec; // trace diff --git a/src/include/library.h b/src/include/library.h index 006e61f4..1bd9be3a 100755 --- a/src/include/library.h +++ b/src/include/library.h @@ -10,6 +10,10 @@ typedef struct box64context_s box64context_t; typedef struct x64emu_s x64emu_t; typedef struct needed_libs_s needed_libs_t; +#define LIB_NATIVE 0 +#define LIB_EMULATED 1 +#define LIB_UNNKNOW -1 + library_t *NewLibrary(const char* path, box64context_t* box64); int AddSymbolsLibrary(lib_t* maplib, library_t* lib, x64emu_t* emu); int FinalizeLibrary(library_t* lib, lib_t* local_maplib, int bindnow, x64emu_t* emu); diff --git a/src/include/wrappedlibs.h b/src/include/wrappedlibs.h index 6cb350c4..5ff61939 100755 --- a/src/include/wrappedlibs.h +++ b/src/include/wrappedlibs.h @@ -10,8 +10,8 @@ typedef void (*wrappedlib_fini_t)(library_t * lib); typedef int (*wrappedlib_get_t)(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz, int version, const char* vername, int local); void setNeededLibs(library_t* lib, int n, ...); -#define SETALT(A) lib->altmy = strdup(#A) -#define SETALTPREFIX(A) lib->priv.w.altprefix = strdup(A) +#define SETALT(A) lib->w.altmy = strdup(#A) +#define SETALTPREFIX(A) lib->w.altprefix = strdup(A) typedef struct wrappedlib_s { const char* name; |