FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

platform/android/dlsym-weak: fix code style

This commit is contained in:
mittorn 2023-12-16 20:17:51 +03:00 committed by Alibek Omarov
parent ffe1ff326a
commit 96c367973a
1 changed files with 53 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
engine/platform/android/dlsym-weak.cpp
View File

@ -32,24 +32,26 @@
#include <dlfcn.h>
#include "linker.h"
static Elf_Sym* soinfo_elf_lookup(soinfo* si, unsigned hash, const char* name) {
static Elf_Sym* soinfo_elf_lookup( soinfo* si, unsigned hash, const char* name )
{
Elf_Sym* symtab = si->symtab;
const char* strtab = si->strtab;
if( si->nbucket == 0 )
return NULL;
for (unsigned n = si->bucket[hash % si->nbucket]; n != 0; n = si->chain[n]) {
for( unsigned n = si->bucket[hash % si->nbucket]; n != 0; n = si->chain[n] )
{
Elf_Sym* s = symtab + n;
if( strcmp( strtab + s->st_name, name )) continue;
/* only concern ourselves with global and weak symbol definitions */
switch (ELF_ST_BIND(s->st_info)) {
switch( ELF_ST_BIND( s->st_info ))
{
case STB_GLOBAL:
case STB_WEAK:
if (s->st_shndx == SHN_UNDEF) {
if( s->st_shndx == SHN_UNDEF )
continue;
}
return s;
}
}
@ -57,38 +59,44 @@ static Elf_Sym* soinfo_elf_lookup(soinfo* si, unsigned hash, const char* name) {
return NULL;
}
static Elf_Sym* soinfo_elf_lookup_reverse(soinfo* si, size_t addr) {
static Elf_Sym* soinfo_elf_lookup_reverse(soinfo* si, size_t addr)
{
Elf_Sym* symtab = si->symtab;
if( si->nbucket == 0 )
return NULL;
for( int j = 0; j < si->nbucket; j++ )
for (unsigned n = si->bucket[j]; n != 0; n = si->chain[n]) {
{
for( unsigned n = si->bucket[j]; n != 0; n = si->chain[n] )
{
Elf_Sym* s = symtab + n;
if( s->st_value != addr )continue;
/* only concern ourselves with global and weak symbol definitions */
switch (ELF_ST_BIND(s->st_info)) {
switch( ELF_ST_BIND( s->st_info ))
{
case STB_GLOBAL:
case STB_LOCAL:
case STB_WEAK:
if (s->st_shndx == SHN_UNDEF) {
if (s->st_shndx == SHN_UNDEF)
continue;
}
return s;
}
}
}
return NULL;
}
static unsigned elfhash(const char* _name) {
static unsigned elfhash( const char* _name )
{
const unsigned char* name = ( const unsigned char* ) _name;
unsigned h = 0, g;
while(*name) {
while(*name)
{
h = (h << 4) + *name++;
g = h & 0xf0000000;
h ^= g;
@ -106,7 +114,8 @@ static unsigned elfhash(const char* _name) {
Binary Interface) where in Chapter 5 it discuss resolving "Shared
Object Dependencies" in breadth first search order.
*/
static Elf_Sym* dlsym_handle_lookup(soinfo* si, const char* name) {
static Elf_Sym* dlsym_handle_lookup( soinfo* si, const char* name )
{
return soinfo_elf_lookup( si, elfhash( name ), name );
}
@ -141,21 +150,24 @@ static int dladdr_fallback( const void *addr, Dl_info *info )
extern "C" int __attribute__((visibility("hidden"))) dladdr( const void *addr, Dl_info *info )
{
static int (*pDladdr)( const void *addr, Dl_info *info );
// __android_log_print( ANDROID_LOG_ERROR, "dladdr", "dladdr %p %p %p\n", addr, pDladdr, &dladdr );
typedef int (*PFNDLADDR)( const void *addr, Dl_info *info );
PFNDLADDR pfn_dladdr;
if(!pDladdr)
if( !pfn_dladdr )
{
/* android does not have libdl, but have soinfo record for it from linker
* use dlopen to get this record directly */
void *lib = dlopen( "libdl.so", RTLD_NOW );
if( lib )
*(void**)&pDladdr = dlsym( lib, "dladdr" );
if( (void*)pDladdr == (void*)&dladdr )
pDladdr = 0;
if( !pDladdr )
pDladdr = dladdr_fallback;
pfn_dladdr = (PFNDLADDR)dlsym( lib, "dladdr" );
if( pfn_dladdr == (PFNDLADDR)dladdr )
pfn_dladdr = 0;
if( !pfn_dladdr )
pfn_dladdr = (PFNDLADDR)dladdr_fallback;
}
// __android_log_print( ANDROID_LOG_ERROR, "dladdr", "dladdr %p\n", addr );
return pDladdr( addr, info );
return pfn_dladdr( addr, info );
}