wasm2c: Fix platform specific mutex support

Author: shravanrn

wasm2c/wasm-rt-mem-impl-helper.inc

@@ -47,18 +47,14 @@
 #define MEMORY_API_NAME(name) name##_shared
 #define MEMORY_CELL_TYPE _Atomic volatile uint8_t*
 
-#if WASM_RT_USE_C11THREADS
-#define MEMORY_LOCK_VAR_INIT(name) C11_MEMORY_LOCK_VAR_INIT(name)
-#define MEMORY_LOCK_AQUIRE(name) C11_MEMORY_LOCK_AQUIRE(name)
-#define MEMORY_LOCK_RELEASE(name) C11_MEMORY_LOCK_RELEASE(name)
+#if WASM_RT_USE_CRITICALSECTION
+#define MEMORY_LOCK_VAR_INIT(name) WIN_MEMORY_LOCK_VAR_INIT(name)
+#define MEMORY_LOCK_AQUIRE(name) WIN_MEMORY_LOCK_AQUIRE(name)
+#define MEMORY_LOCK_RELEASE(name) WIN_MEMORY_LOCK_RELEASE(name)
 #elif WASM_RT_USE_PTHREADS
 #define MEMORY_LOCK_VAR_INIT(name) PTHREAD_MEMORY_LOCK_VAR_INIT(name)
 #define MEMORY_LOCK_AQUIRE(name) PTHREAD_MEMORY_LOCK_AQUIRE(name)
 #define MEMORY_LOCK_RELEASE(name) PTHREAD_MEMORY_LOCK_RELEASE(name)
-#elif WASM_RT_USE_CRITICALSECTION
-#define MEMORY_LOCK_VAR_INIT(name) WIN_MEMORY_LOCK_VAR_INIT(name)
-#define MEMORY_LOCK_AQUIRE(name) WIN_MEMORY_LOCK_AQUIRE(name)
-#define MEMORY_LOCK_RELEASE(name) WIN_MEMORY_LOCK_RELEASE(name)
 #endif
 
 #endif

wasm2c/wasm-rt-mem-impl.c

@@ -29,22 +29,6 @@
 extern void WASM_RT_GROW_FAILED_HANDLER();
 #endif
 
-#define C11_MEMORY_LOCK_VAR_INIT(name)                \
-  if (mtx_init(&(name), mtx_plain) != thrd_success) { \
-    fprintf(stderr, "Lock init failed\n");            \
-    abort();                                          \
-  }
-#define C11_MEMORY_LOCK_AQUIRE(name)          \
-  if (mtx_lock(&(name)) != thrd_success) {    \
-    fprintf(stderr, "Lock acquire failed\n"); \
-    abort();                                  \
-  }
-#define C11_MEMORY_LOCK_RELEASE(name)         \
-  if (mtx_unlock(&(name)) != thrd_success) {  \
-    fprintf(stderr, "Lock release failed\n"); \
-    abort();                                  \
-  }
-
 #define PTHREAD_MEMORY_LOCK_VAR_INIT(name)      \
   if (pthread_mutex_init(&(name), NULL) != 0) { \
     fprintf(stderr, "Lock init failed\n");      \

wasm2c/wasm-rt.h

@@ -67,14 +67,10 @@ extern "C" {
 #include <windows.h>
 #define WASM_RT_MUTEX CRITICAL_SECTION
 #define WASM_RT_USE_CRITICALSECTION 1
-#elif defined(__APPLE__) || defined(__STDC_NO_THREADS__)
+#else
 #include <pthread.h>
 #define WASM_RT_MUTEX pthread_mutex_t
 #define WASM_RT_USE_PTHREADS 1
-#else
-#include <threads.h>
-#define WASM_RT_MUTEX mtx_t
-#define WASM_RT_USE_C11THREADS 1
 #endif
 
 #endif