diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/librarian/library.c | 5 | ||||
| -rwxr-xr-x | src/librarian/library_private.h | 8 | ||||
| -rwxr-xr-x | src/wrapped/wrappedlib_init.h | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/librarian/library.c b/src/librarian/library.c index cb2bb575..29ca0f3e 100755 --- a/src/librarian/library.c +++ b/src/librarian/library.c @@ -46,9 +46,9 @@ typedef struct bridged_s { KHASH_MAP_INIT_STR(bridgemap, bridged_t) -KHASH_MAP_IMPL_STR(datamap, uint32_t) KHASH_MAP_IMPL_STR(symbolmap, wrapper_t) KHASH_MAP_IMPL_STR(symbol2map, symbol2_t) +KHASH_MAP_IMPL_STR(datamap, uint64_t) char* Path2Name(const char* path) { @@ -129,7 +129,6 @@ int EmuLib_GetLocal(library_t* lib, const char* name, uintptr_t *offs, uintptr_t int NativeLib_GetLocal(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz) { - // TODO (void)lib; (void)name; (void)offs; (void)sz; return 0; } @@ -537,7 +536,7 @@ int GetElfIndex(library_t* lib) return lib->priv.n.elf_index; } -int getSymbolInMaps(library_t*lib, const char* name, int noweak, uintptr_t *addr, uint32_t *size) +int getSymbolInMaps(library_t *lib, const char* name, int noweak, uintptr_t *addr, uintptr_t *size) { if(!lib->active) return 0; diff --git a/src/librarian/library_private.h b/src/librarian/library_private.h index 6169959e..e2d86ee7 100755 --- a/src/librarian/library_private.h +++ b/src/librarian/library_private.h @@ -23,7 +23,7 @@ typedef struct symbol2_s { KHASH_MAP_DECLARE_STR(symbolmap, wrapper_t) KHASH_MAP_DECLARE_STR(symbol2map, symbol2_t) -KHASH_MAP_DECLARE_STR(datamap, uint32_t) +KHASH_MAP_DECLARE_STR(datamap, uintptr_t) #ifndef MAX_PATH @@ -62,7 +62,7 @@ typedef struct library_s { union { wlib_t w; nlib_t n; - } priv; // private lib data + } priv; // private lib data box64context_t *context; // parent context kh_bridgemap_t *bridgemap; kh_symbolmap_t *symbolmap; @@ -93,10 +93,10 @@ typedef struct map_onesymbol2_s { } map_onesymbol2_t; typedef struct map_onedata_s { const char* name; - uint32_t sz; + uint32_t sz; // TODO: convert to size_t int weak; } map_onedata_t; -int getSymbolInMaps(library_t*lib, const char* name, int noweak, uintptr_t *addr, uint32_t *size); // Add bridges to functions +int getSymbolInMaps(library_t *lib, const char* name, int noweak, uintptr_t *addr, uintptr_t *size); // Add bridges to functions #endif //__LIBRARY_PRIVATE_H_ diff --git a/src/wrapped/wrappedlib_init.h b/src/wrapped/wrappedlib_init.h index cd59efe1..c9fe03a9 100755 --- a/src/wrapped/wrappedlib_init.h +++ b/src/wrapped/wrappedlib_init.h @@ -194,10 +194,10 @@ int FUNC(_fini)(library_t* lib) return 1; } -int FUNC(_get)(library_t* lib, const char* name, uintptr_t *offs, uint32_t *sz) +int FUNC(_get)(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz) { uintptr_t addr = 0; - uint32_t size = 0; + uintptr_t size = 0; #ifdef CUSTOM_FAIL void* symbol = NULL; #endif @@ -217,10 +217,10 @@ int FUNC(_get)(library_t* lib, const char* name, uintptr_t *offs, uint32_t *sz) return 1; } -int FUNC(_getnoweak)(library_t* lib, const char* name, uintptr_t *offs, uint32_t *sz) +int FUNC(_getnoweak)(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz) { uintptr_t addr = 0; - uint32_t size = 0; + uintptr_t size = 0; #ifdef CUSTOM_FAIL void* symbol = NULL; #endif |