atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

looper.c: make objretcall less hacky

Browse Source 
the old method failed when building with -Os on arm64
This commit is contained in:
Julian Winkler
2023-06-06 18:36:06 +02:00
committed by Mis012
parent 183d9fe6b7
commit 824b821f5a
1 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/libandroid/looper.c
View File

@@ -4,44 +4,27 @@
typedef void ALooper; typedef void ALooper;
typedef int (*Looper_callbackFunc)(int fd, int events, void* data); typedef int (*Looper_callbackFunc)(int fd, int events, void* data);
/* helpers for creating wrappers for methods which use C++ itanium ABI */ // dummy strong pointer class
struct sp {
#ifdef __aarch64__ ALooper *ptr;
#define ITANIUM_OBJRETCALL_DEC(ret_type, mangled_name, ...) \ /* the struct has to be larger then 16 bytes, because on aarch64 the
void mangled_name(__VA_ARGS__); /* r8 used instead of implicit parameter, fun innit */ * calling convention for returning structs larger than 16 bytes is the
#else * same as the calling convention for returning large C++ objects */
#define ITANIUM_OBJRETCALL_DEC(ret_type, mangled_name, ...) \ char filler[16];
void mangled_name(ret_type **ret, ##__VA_ARGS__) /* implicit first parameter used for return value */ };
#endif
inline __attribute__((__always_inline__)) void * itanium_objretcall(void (*func)(), ...)
{
#ifdef __aarch64__
void *ret;
register void **addr_of_ret asm("r8"); /* arm wants to be special :( */
__asm__ ("" : : "" (addr_of_ret)); /* apparently __attribute__((used)) is not a thing */
addr_of_ret = &ret;
func(__builtin_va_arg_pack());
return ret;
#else
void *ret;
func(&ret, __builtin_va_arg_pack());
return ret;
#endif
}
/* --- */ /* --- */
ITANIUM_OBJRETCALL_DEC(ALooper, _ZN7android6Looper12getForThreadEv); struct sp _ZN7android6Looper12getForThreadEv(void);
ALooper * ALooper_forThread(void) ALooper * ALooper_forThread(void)
{ {
return itanium_objretcall(_ZN7android6Looper12getForThreadEv); return _ZN7android6Looper12getForThreadEv().ptr;
} }
ITANIUM_OBJRETCALL_DEC(ALooper, _ZN7android6Looper7prepareEi, int opts); struct sp _ZN7android6Looper7prepareEi(int opts);
ALooper * ALooper_prepare(int opts) ALooper * ALooper_prepare(int opts)
{ {
return itanium_objretcall(_ZN7android6Looper7prepareEi, opts); return _ZN7android6Looper7prepareEi(opts).ptr;
} }
void _ZNK7android7RefBase9incStrongEPKv(ALooper *this, void *unused); void _ZNK7android7RefBase9incStrongEPKv(ALooper *this, void *unused);