Skip to content

fix FORCE_READ for ez80 #2639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix FORCE_READ for ez80 #2639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b9351d
fix FORCE_READ for arch with less then 32 bit
coco875 Sep 19, 2025
c38aaf8
change condition to detect ez80 instead
coco875 Sep 21, 2025
426b9a2
fix linter
coco875 Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/prebuilt/wasm2c_source_declarations.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ R"w2c_template( WASM_RT_CHECK_BASE(mem); \
R"w2c_template( RANGE_CHECK(mem, a, sizeof(t));
)w2c_template"
R"w2c_template(
#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
)w2c_template"
R"w2c_template(#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
)w2c_template"
Expand Down
3 changes: 2 additions & 1 deletion src/template/wasm2c.declarations.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
3 changes: 2 additions & 1 deletion test/wasm2c/add.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
3 changes: 2 additions & 1 deletion test/wasm2c/check-imports.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
3 changes: 2 additions & 1 deletion test/wasm2c/export-names.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
3 changes: 2 additions & 1 deletion test/wasm2c/hello.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
3 changes: 2 additions & 1 deletion test/wasm2c/minimal.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
3 changes: 2 additions & 1 deletion test/wasm2c/tail-calls.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
3 changes: 2 additions & 1 deletion wasm2c/benchmarks/dhrystone/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ static inline void memory_fill(wasm_rt_memory_t* mem, u32 d, u32 val, u32 n) {

#define MEMCHECK(mem, a, t) RANGE_CHECK(mem, a, sizeof(t))

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
#else
#define FORCE_READ_INT(var)
Expand Down
3 changes: 2 additions & 1 deletion wasm2c/examples/fac/fac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
WASM_RT_CHECK_BASE(mem); \
RANGE_CHECK(mem, a, sizeof(t));

#ifdef __GNUC__
#if defined(__GNUC__) && \
!(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
// Clang on Mips requires "f" constraints on floats
// See https://github.com/llvm/llvm-project/issues/64241
Expand Down
Loading