Skip to content

Commit a55fb94

Browse files
committed
wasm2c: fix big endian guard page support
1 parent f976380 commit a55fb94

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/prebuilt/wasm2c_simd_source_declarations.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ R"w2c_template(#elif defined(__GNUC__) && defined(__aarch64__)
66
)w2c_template"
77
R"w2c_template(#define SIMD_FORCE_READ(var) __asm__("" ::"w"(var));
88
)w2c_template"
9+
R"w2c_template(#elif defined(__s390x__)
10+
)w2c_template"
11+
R"w2c_template(#define SIMD_FORCE_READ(var) __asm__("" ::"d"(var));
12+
)w2c_template"
913
R"w2c_template(#else
1014
)w2c_template"
1115
R"w2c_template(#define SIMD_FORCE_READ(var)

src/template/wasm2c_simd.declarations.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#define SIMD_FORCE_READ(var) __asm__("" ::"x"(var));
33
#elif defined(__GNUC__) && defined(__aarch64__)
44
#define SIMD_FORCE_READ(var) __asm__("" ::"w"(var));
5+
#elif defined(__s390x__)
6+
#define SIMD_FORCE_READ(var) __asm__("" ::"d"(var));
57
#else
68
#define SIMD_FORCE_READ(var)
79
#endif

wasm2c/wasm-rt.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,11 @@ extern "C" {
142142
*
143143
* This defaults to GUARD_PAGES as this is the fastest option, iff the
144144
* requirements of GUARD_PAGES --- 64-bit platforms, MMAP allocation strategy,
145-
* no 64-bit memories, no big-endian --- are met. This falls back to BOUNDS
146-
* otherwise.
145+
* no 64-bit memories --- are met. This falls back to BOUNDS otherwise.
147146
*/
148147

149148
/** Check if Guard checks are supported */
150-
#if UINTPTR_MAX > 0xffffffff && WASM_RT_USE_MMAP && !WABT_BIG_ENDIAN
149+
#if UINTPTR_MAX > 0xffffffff && WASM_RT_USE_MMAP
151150
#define WASM_RT_GUARD_PAGES_SUPPORTED 1
152151
#else
153152
#define WASM_RT_GUARD_PAGES_SUPPORTED 0

0 commit comments

Comments
 (0)