From 7b9351d7028577fd2231a61eada17b24314a8f16 Mon Sep 17 00:00:00 2001
From: coco875 <pereira.jannin@gmail.com>
Date: Fri, 19 Sep 2025 22:37:32 +0200
Subject: [PATCH 1/3] fix FORCE_READ for arch with less then 32 bit

---
 src/prebuilt/wasm2c_source_declarations.cc | 2 +-
 src/template/wasm2c.declarations.c         | 2 +-
 test/wasm2c/add.txt                        | 2 +-
 test/wasm2c/check-imports.txt              | 2 +-
 test/wasm2c/export-names.txt               | 2 +-
 test/wasm2c/hello.txt                      | 2 +-
 test/wasm2c/minimal.txt                    | 2 +-
 test/wasm2c/tail-calls.txt                 | 2 +-
 wasm2c/benchmarks/dhrystone/main.c         | 2 +-
 wasm2c/examples/fac/fac.c                  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/prebuilt/wasm2c_source_declarations.cc b/src/prebuilt/wasm2c_source_declarations.cc
index c70ba70940..412362a934 100644
--- a/src/prebuilt/wasm2c_source_declarations.cc
+++ b/src/prebuilt/wasm2c_source_declarations.cc
@@ -256,7 +256,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 )w2c_template"
 R"w2c_template(#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
 )w2c_template"
diff --git a/src/template/wasm2c.declarations.c b/src/template/wasm2c.declarations.c
index a0cd5a7c82..e961cd087f 100644
--- a/src/template/wasm2c.declarations.c
+++ b/src/template/wasm2c.declarations.c
@@ -137,7 +137,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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
diff --git a/test/wasm2c/add.txt b/test/wasm2c/add.txt
index de04bf123f..e9798ebe16 100644
--- a/test/wasm2c/add.txt
+++ b/test/wasm2c/add.txt
@@ -204,7 +204,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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
diff --git a/test/wasm2c/check-imports.txt b/test/wasm2c/check-imports.txt
index b5db913726..6268bb6430 100644
--- a/test/wasm2c/check-imports.txt
+++ b/test/wasm2c/check-imports.txt
@@ -229,7 +229,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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
diff --git a/test/wasm2c/export-names.txt b/test/wasm2c/export-names.txt
index 96bff10325..a390b2e034 100644
--- a/test/wasm2c/export-names.txt
+++ b/test/wasm2c/export-names.txt
@@ -229,7 +229,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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
diff --git a/test/wasm2c/hello.txt b/test/wasm2c/hello.txt
index b79bcd377f..92bfb4a44b 100644
--- a/test/wasm2c/hello.txt
+++ b/test/wasm2c/hello.txt
@@ -236,7 +236,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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
diff --git a/test/wasm2c/minimal.txt b/test/wasm2c/minimal.txt
index 4fdff6d392..c0e7c871ee 100644
--- a/test/wasm2c/minimal.txt
+++ b/test/wasm2c/minimal.txt
@@ -198,7 +198,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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
diff --git a/test/wasm2c/tail-calls.txt b/test/wasm2c/tail-calls.txt
index a5f40b28bc..6744cbce31 100644
--- a/test/wasm2c/tail-calls.txt
+++ b/test/wasm2c/tail-calls.txt
@@ -228,7 +228,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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
diff --git a/wasm2c/benchmarks/dhrystone/main.c b/wasm2c/benchmarks/dhrystone/main.c
index 80a6c561a4..52b01942ca 100644
--- a/wasm2c/benchmarks/dhrystone/main.c
+++ b/wasm2c/benchmarks/dhrystone/main.c
@@ -38,7 +38,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #define FORCE_READ_INT(var) __asm__("" ::"r"(var));
 #else
 #define FORCE_READ_INT(var)
diff --git a/wasm2c/examples/fac/fac.c b/wasm2c/examples/fac/fac.c
index 5c3a80a50a..1e62170333 100644
--- a/wasm2c/examples/fac/fac.c
+++ b/wasm2c/examples/fac/fac.c
@@ -156,7 +156,7 @@ 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__) && __SIZEOF_POINTER__ >= 4
 #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

From c38aaf878206ea0a91159c47b5284aa8f821bde6 Mon Sep 17 00:00:00 2001
From: coco875 <pereira.jannin@gmail.com>
Date: Sun, 21 Sep 2025 19:20:16 +0200
Subject: [PATCH 2/3] change condition to detect ez80 instead

---
 src/prebuilt/wasm2c_source_declarations.cc | 2 +-
 src/template/wasm2c.declarations.c         | 2 +-
 test/wasm2c/add.txt                        | 2 +-
 test/wasm2c/check-imports.txt              | 2 +-
 test/wasm2c/export-names.txt               | 2 +-
 test/wasm2c/hello.txt                      | 2 +-
 test/wasm2c/minimal.txt                    | 2 +-
 test/wasm2c/tail-calls.txt                 | 2 +-
 wasm2c/benchmarks/dhrystone/main.c         | 2 +-
 wasm2c/examples/fac/fac.c                  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/prebuilt/wasm2c_source_declarations.cc b/src/prebuilt/wasm2c_source_declarations.cc
index 412362a934..c180730d78 100644
--- a/src/prebuilt/wasm2c_source_declarations.cc
+++ b/src/prebuilt/wasm2c_source_declarations.cc
@@ -256,7 +256,7 @@ R"w2c_template(  WASM_RT_CHECK_BASE(mem);          \
 R"w2c_template(  RANGE_CHECK(mem, a, sizeof(t));
 )w2c_template"
 R"w2c_template(
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
 )w2c_template"
 R"w2c_template(#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
 )w2c_template"
diff --git a/src/template/wasm2c.declarations.c b/src/template/wasm2c.declarations.c
index e961cd087f..7ad1ca3e86 100644
--- a/src/template/wasm2c.declarations.c
+++ b/src/template/wasm2c.declarations.c
@@ -137,7 +137,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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
diff --git a/test/wasm2c/add.txt b/test/wasm2c/add.txt
index e9798ebe16..1ca32608a9 100644
--- a/test/wasm2c/add.txt
+++ b/test/wasm2c/add.txt
@@ -204,7 +204,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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
diff --git a/test/wasm2c/check-imports.txt b/test/wasm2c/check-imports.txt
index 6268bb6430..18fe81025e 100644
--- a/test/wasm2c/check-imports.txt
+++ b/test/wasm2c/check-imports.txt
@@ -229,7 +229,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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
diff --git a/test/wasm2c/export-names.txt b/test/wasm2c/export-names.txt
index a390b2e034..3c09214c42 100644
--- a/test/wasm2c/export-names.txt
+++ b/test/wasm2c/export-names.txt
@@ -229,7 +229,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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
diff --git a/test/wasm2c/hello.txt b/test/wasm2c/hello.txt
index 92bfb4a44b..b6eaa8bb99 100644
--- a/test/wasm2c/hello.txt
+++ b/test/wasm2c/hello.txt
@@ -236,7 +236,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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
diff --git a/test/wasm2c/minimal.txt b/test/wasm2c/minimal.txt
index c0e7c871ee..63d64b08e4 100644
--- a/test/wasm2c/minimal.txt
+++ b/test/wasm2c/minimal.txt
@@ -198,7 +198,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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
diff --git a/test/wasm2c/tail-calls.txt b/test/wasm2c/tail-calls.txt
index 6744cbce31..113c38da40 100644
--- a/test/wasm2c/tail-calls.txt
+++ b/test/wasm2c/tail-calls.txt
@@ -228,7 +228,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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
diff --git a/wasm2c/benchmarks/dhrystone/main.c b/wasm2c/benchmarks/dhrystone/main.c
index 52b01942ca..dea42b99d1 100644
--- a/wasm2c/benchmarks/dhrystone/main.c
+++ b/wasm2c/benchmarks/dhrystone/main.c
@@ -38,7 +38,7 @@ 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))
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
 #define FORCE_READ_INT(var) __asm__("" ::"r"(var));
 #else
 #define FORCE_READ_INT(var)
diff --git a/wasm2c/examples/fac/fac.c b/wasm2c/examples/fac/fac.c
index 1e62170333..95f12e9da1 100644
--- a/wasm2c/examples/fac/fac.c
+++ b/wasm2c/examples/fac/fac.c
@@ -156,7 +156,7 @@ 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));
 
-#if defined(__GNUC__) && __SIZEOF_POINTER__ >= 4
+#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

From 426b9a26adef34753db0c18c9ebad5a4d7994201 Mon Sep 17 00:00:00 2001
From: coco875 <pereira.jannin@gmail.com>
Date: Sun, 21 Sep 2025 19:52:35 +0200
Subject: [PATCH 3/3] fix linter

---
 src/prebuilt/wasm2c_source_declarations.cc | 3 ++-
 src/template/wasm2c.declarations.c         | 3 ++-
 test/wasm2c/add.txt                        | 3 ++-
 test/wasm2c/check-imports.txt              | 3 ++-
 test/wasm2c/export-names.txt               | 3 ++-
 test/wasm2c/hello.txt                      | 3 ++-
 test/wasm2c/minimal.txt                    | 3 ++-
 test/wasm2c/tail-calls.txt                 | 3 ++-
 wasm2c/benchmarks/dhrystone/main.c         | 3 ++-
 wasm2c/examples/fac/fac.c                  | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/prebuilt/wasm2c_source_declarations.cc b/src/prebuilt/wasm2c_source_declarations.cc
index c180730d78..d0847717fd 100644
--- a/src/prebuilt/wasm2c_source_declarations.cc
+++ b/src/prebuilt/wasm2c_source_declarations.cc
@@ -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(
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#if defined(__GNUC__) && \
+    !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
 )w2c_template"
 R"w2c_template(#define FORCE_READ_INT(var) __asm__("" ::"r"(var));
 )w2c_template"
diff --git a/src/template/wasm2c.declarations.c b/src/template/wasm2c.declarations.c
index 7ad1ca3e86..83685d8a62 100644
--- a/src/template/wasm2c.declarations.c
+++ b/src/template/wasm2c.declarations.c
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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
diff --git a/test/wasm2c/add.txt b/test/wasm2c/add.txt
index 1ca32608a9..9225ca71e2 100644
--- a/test/wasm2c/add.txt
+++ b/test/wasm2c/add.txt
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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
diff --git a/test/wasm2c/check-imports.txt b/test/wasm2c/check-imports.txt
index 18fe81025e..03f6cf2949 100644
--- a/test/wasm2c/check-imports.txt
+++ b/test/wasm2c/check-imports.txt
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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
diff --git a/test/wasm2c/export-names.txt b/test/wasm2c/export-names.txt
index 3c09214c42..8957188546 100644
--- a/test/wasm2c/export-names.txt
+++ b/test/wasm2c/export-names.txt
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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
diff --git a/test/wasm2c/hello.txt b/test/wasm2c/hello.txt
index b6eaa8bb99..d8ad4149e8 100644
--- a/test/wasm2c/hello.txt
+++ b/test/wasm2c/hello.txt
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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
diff --git a/test/wasm2c/minimal.txt b/test/wasm2c/minimal.txt
index 63d64b08e4..1aa2f65644 100644
--- a/test/wasm2c/minimal.txt
+++ b/test/wasm2c/minimal.txt
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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
diff --git a/test/wasm2c/tail-calls.txt b/test/wasm2c/tail-calls.txt
index 113c38da40..c9ab803806 100644
--- a/test/wasm2c/tail-calls.txt
+++ b/test/wasm2c/tail-calls.txt
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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
diff --git a/wasm2c/benchmarks/dhrystone/main.c b/wasm2c/benchmarks/dhrystone/main.c
index dea42b99d1..57cf387253 100644
--- a/wasm2c/benchmarks/dhrystone/main.c
+++ b/wasm2c/benchmarks/dhrystone/main.c
@@ -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))
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#if defined(__GNUC__) && \
+    !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
 #define FORCE_READ_INT(var) __asm__("" ::"r"(var));
 #else
 #define FORCE_READ_INT(var)
diff --git a/wasm2c/examples/fac/fac.c b/wasm2c/examples/fac/fac.c
index 95f12e9da1..515b73acfc 100644
--- a/wasm2c/examples/fac/fac.c
+++ b/wasm2c/examples/fac/fac.c
@@ -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));
 
-#if defined(__GNUC__) && !(defined(_EZ80) || defined(__ez80) || defined(__ez80__))
+#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