tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "riscv64: fix ifuncs, improve the ifunc tests." into main am: d53ad05e38 am: c512636d31 am: 96591865e3 am: b889ba04ca

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2695693

Change-Id: I00e555e7a6e3c1cc6a6a8c2cacc90e75cbd0cf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-08-22 17:21:24 +00:00 committed by Automerger Merge Worker
commit 28765348af
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libc/bionic/bionic_call_ifunc_resolver.cpp
View file

@ -58,12 +58,12 @@ ElfW(Addr) __bionic_call_ifunc_resolver(ElfW(Addr) resolver_addr) {
}
return reinterpret_cast<ifunc_resolver_t>(resolver_addr)(hwcap);
#elif defined(__riscv)
// This argument and its value is just a placeholder for now,
// but it means that if we do pass something in future (such as
// getauxval() and/or hwprobe key/value pairs), callees will be able to
// recognize what they're being given.
typedef ElfW(Addr) (*ifunc_resolver_t)(void*);
return reinterpret_cast<ifunc_resolver_t>(resolver_addr)(nullptr);
// The pointer argument is currently unused, but reserved for future
// expansion. If we pass nullptr from the beginning, it'll be easier
// to recognize if/when we pass actual data (and matches glibc).
typedef ElfW(Addr) (*ifunc_resolver_t)(uint64_t, void*);
static uint64_t hwcap = getauxval(AT_HWCAP);
return reinterpret_cast<ifunc_resolver_t>(resolver_addr)(hwcap, nullptr);
#else
typedef ElfW(Addr) (*ifunc_resolver_t)(void);
return reinterpret_cast<ifunc_resolver_t>(resolver_addr)();

26
tests/ifunc_test.cpp
View file

@ -60,6 +60,26 @@ extern "C" fn_ptr_t hwcap_resolver(unsigned long hwcap) {
return ret42;
}
#elif defined(__riscv)
#include <sys/hwprobe.h>
static uint64_t g_hwcap;
static riscv_hwprobe g_hwprobes[] = {{.key = RISCV_HWPROBE_KEY_IMA_EXT_0}};
extern "C" fn_ptr_t hwcap_resolver(uint64_t hwcap, void* null) {
// Check hwcap like arm32/arm64.
g_hwcap = hwcap;
// For now, the pointer argument is reserved for future expansion.
if (null != NULL) abort();
// Ensure that __riscv_hwprobe() can be called from an ifunc.
if (__riscv_hwprobe(g_hwprobes, 1, 0, nullptr, 0) != 0) return nullptr;
return ret42;
}
#else
extern "C" fn_ptr_t hwcap_resolver() {
@ -81,6 +101,12 @@ TEST(ifunc, hwcap) {
EXPECT_EQ(getauxval(AT_HWCAP2), g_arg._hwcap2);
#elif defined(__arm__)
EXPECT_EQ(getauxval(AT_HWCAP), g_hwcap);
#elif defined(__riscv)
EXPECT_EQ(getauxval(AT_HWCAP), g_hwcap);
riscv_hwprobe probes[] = {{.key = RISCV_HWPROBE_KEY_IMA_EXT_0}};
ASSERT_EQ(0, __riscv_hwprobe(probes, 1, 0, nullptr, 0));
EXPECT_EQ(probes[0].value, g_hwprobes[0].value);
#endif
}