redo "lib: use ctassert macro" correctly

yamt · Aug 12, 2024 · 5a2faca · 5a2faca
1 parent 0325d19
commit 5a2faca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/lib/exec.c b/lib/exec.c
@@ -35,14 +35,14 @@
  *
  * Note: on i386, alignof(uint64_t) == 4.
  */
-ctassert(sizeof(_Atomic uint8_t) == sizeof(uint8_t), "atomic 8 size");
-ctassert(sizeof(_Atomic uint16_t) == sizeof(uint16_t), "atomic 16 size");
-ctassert(sizeof(_Atomic uint32_t) == sizeof(uint32_t), "atomic 32 size");
-ctassert(sizeof(_Atomic uint64_t) == sizeof(uint64_t), "atomic 64 size");
-ctassert(alignof(_Atomic uint8_t) <= 1, "atomic 8 align");
-ctassert(alignof(_Atomic uint16_t) <= 2, "atomic 16 align");
-ctassert(alignof(_Atomic uint32_t) <= 4, "atomic 32 align");
-ctassert(alignof(_Atomic uint64_t) <= 8, "atomic 64 align");
+ctassert(sizeof(_Atomic uint8_t) == sizeof(uint8_t));
+ctassert(sizeof(_Atomic uint16_t) == sizeof(uint16_t));
+ctassert(sizeof(_Atomic uint32_t) == sizeof(uint32_t));
+ctassert(sizeof(_Atomic uint64_t) == sizeof(uint64_t));
+ctassert(alignof(_Atomic uint8_t) <= 1);
+ctassert(alignof(_Atomic uint16_t) <= 2);
+ctassert(alignof(_Atomic uint32_t) <= 4);
+ctassert(alignof(_Atomic uint64_t) <= 8);
 
 void
 frame_clear(struct funcframe *frame)

diff --git a/lib/lock.h b/lib/lock.h
@@ -66,12 +66,13 @@ void toywasm_cv_broadcast(pthread_cond_t *cv, struct toywasm_mutex *lock)
 __END_EXTERN_C
 
 #else /* defined(USE_PTHREAD) */
-#define TOYWASM_MUTEX_DEFINE(name) ctassert(1, "suppress -Wextra-semi")
+/* use ctassert to suppress -Wextra-semi */
+#define TOYWASM_MUTEX_DEFINE(name) ctassert(1)
 #define toywasm_mutex_init(a)
 #define toywasm_mutex_destroy(a)
 #define toywasm_mutex_lock(a)
 #define toywasm_mutex_unlock(a)
-#define TOYWASM_CV_DEFINE(name) ctassert(1, "suppress -Wextra-semi")
+#define TOYWASM_CV_DEFINE(name) ctassert(1)
 #define toywasm_cv_init(a)
 #define toywasm_cv_destroy(a)
 #define toywasm_cv_timedwait(a, lk, abs) timespec_sleep(CLOCK_REALTIME, abs)

diff --git a/lib/type.h b/lib/type.h
@@ -158,9 +158,9 @@ union v128 {
         double f64[2];
 };
 
-ctassert(sizeof(float) == 4, "float");
-ctassert(sizeof(double) == 8, "double");
-ctassert(sizeof(union v128) == 16, "v128");
+ctassert(sizeof(float) == 4);
+ctassert(sizeof(double) == 8);
+ctassert(sizeof(union v128) == 16);
 
 #if defined(TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING)
 #if !defined(TOYWASM_USE_SMALL_CELLS)
@@ -244,8 +244,7 @@ struct val {
  * in that case, the last 4 byte of the structure is just an unused padding.
  */
 ctassert(sizeof(struct val) == VAL_NCELLS * 4 ||
-                 sizeof(struct val) == (VAL_NCELLS + 1) * 4,
-         "struct val");
+         sizeof(struct val) == (VAL_NCELLS + 1) * 4);
 #endif
 
 struct localchunk {