diff options
| author | Shravan Narayan <shravanrn@gmail.com> | 2024-10-12 23:50:12 -0500 |
|---|---|---|
| committer | Shravan Narayan <shravanrn@gmail.com> | 2024-10-14 21:39:40 -0500 |
| commit | 2b4e2c7664a61c94fc316a0d526913634c4ff7e6 (patch) | |
| tree | b5fb6365cadc76155525d5a8a4ec86d0d1f6c099 /test/wasm2c/minimal.txt | |
| parent | 7fdccf7147e7c33e5a13a9c099bdafbc4d3d62e2 (diff) | |
| download | wabt-2b4e2c7664a61c94fc316a0d526913634c4ff7e6.tar.gz wabt-2b4e2c7664a61c94fc316a0d526913634c4ff7e6.tar.bz2 wabt-2b4e2c7664a61c94fc316a0d526913634c4ff7e6.zip | |
wasm2c: Cleanup of handling of WASM_RT_USE_SEGUE macro
Diffstat (limited to 'test/wasm2c/minimal.txt')
| -rw-r--r-- | test/wasm2c/minimal.txt | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/test/wasm2c/minimal.txt b/test/wasm2c/minimal.txt index 7ffa3bca..532bc141 100644 --- a/test/wasm2c/minimal.txt +++ b/test/wasm2c/minimal.txt @@ -81,35 +81,15 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res #define MEM_ADDR(mem, addr, n) &(mem)->data[addr] #endif -#ifndef WASM_RT_USE_SEGUE -// Memory functions can use the segue optimization if allowed. The segue -// optimization uses x86 segments to point to a linear memory. We use this -// optimization when: -// -// (1) Segue is allowed using WASM_RT_ALLOW_SEGUE -// (2) on x86_64 without WABT_BIG_ENDIAN enabled -// (3) the Wasm module uses a single unshared imported or exported memory -// (4) the compiler supports: intrinsics for (rd|wr)gsbase, "address namespaces" -// for accessing pointers, and supports memcpy on pointers with custom -// "address namespaces". GCC does not support the memcpy requirement, so -// this leaves only clang for now. -// (5) The OS provides a way to query if (rd|wr)gsbase is allowed by the kernel -// or the implementation has to use a syscall for this. -// (6) The OS doesn't replace the segment register on context switch which -// eliminates windows for now -// -// While more OS can be supported in the future, we only support linux for now -#if WASM_RT_ALLOW_SEGUE && !WABT_BIG_ENDIAN && \ - (defined(__x86_64__) || defined(_M_X64)) && IS_SINGLE_UNSHARED_MEMORY && \ - __clang__ && __has_builtin(__builtin_ia32_wrgsbase64) && \ - !defined(_WIN32) && defined(__linux__) -#define WASM_RT_USE_SEGUE 1 +// We can only use Segue for this module if it uses a single unshared imported +// or exported memory +#if WASM_RT_USE_SEGUE && IS_SINGLE_UNSHARED_MEMORY +#define WASM_RT_USE_SEGUE_FOR_THIS_MODULE 1 #else -#define WASM_RT_USE_SEGUE 0 -#endif +#define WASM_RT_USE_SEGUE_FOR_THIS_MODULE 0 #endif -#if WASM_RT_USE_SEGUE +#if WASM_RT_USE_SEGUE_FOR_THIS_MODULE // POSIX uses FS for TLS, GS is free static inline void* wasm_rt_segue_read_base() { if (wasm_rt_fsgsbase_inst_supported) { @@ -185,7 +165,7 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a, TRAP(OOB); #endif -#if WASM_RT_USE_SEGUE && WASM_RT_SANITY_CHECKS +#if WASM_RT_USE_SEGUE_FOR_THIS_MODULE && WASM_RT_SANITY_CHECKS #include <stdio.h> #define WASM_RT_CHECK_BASE(mem) \ if (((uintptr_t)((mem)->data)) != ((uintptr_t)wasm_rt_segue_read_base())) { \ |