Migrate to new wasi module name format

Author: shravanrn

CMakeLists.txt

@@ -81,18 +81,30 @@ endif()
 add_subdirectory("${catch2_SOURCE_DIR}")
 list(APPEND CMAKE_MODULE_PATH "${catch2_SOURCE_DIR}/contrib")
 
-if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "AMD64")
+string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" CMAKE_HOST_SYSTEM_PROCESSOR_LOWER)
+
+if (${CMAKE_HOST_SYSTEM_PROCESSOR_LOWER} MATCHES "x86_64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR_LOWER} MATCHES "amd64")
+  if (WIN32)
+    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-windows.tar.gz")
+  elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-macos.tar.gz")
+  elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-linux.tar.gz")
+  else()
+    set (wasi-clang-url "")
+  endif()
+elseif (${CMAKE_HOST_SYSTEM_PROCESSOR_LOWER} MATCHES "arm64")
   if (WIN32)
-    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0.m-mingw.tar.gz")
+    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-arm64-windows.tar.gz")
   elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-macos.tar.gz")
+    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-arm64-macos.tar.gz")
   elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-21/wasi-sdk-21.0-linux.tar.gz")
+    set (wasi-clang-url "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-arm64-linux.tar.gz")
   else()
     set (wasi-clang-url "")
   endif()
 else()
-  message(STATUS "Host platform found: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+  message(STATUS "Host platform found: ${CMAKE_HOST_SYSTEM_PROCESSOR_LOWER}")
   set (wasi-clang-url "")
 endif()
 

include/rlbox_wasm2c_sandbox.hpp

@@ -114,6 +114,15 @@
 #  error "Expected definition for RLBOX_WASM2C_MODULE_NAME"
 #endif
 
+// Concat after macro expansion
+#define RLBOX_WASM2C_CONCAT2_HELPER(x, y) x##y
+#define RLBOX_WASM2C_CONCAT(x, y) RLBOX_WASM2C_CONCAT2_HELPER(x, y)
+#define RLBOX_WASM2C_CONCAT3_HELPER(x, y, z) x##y##z
+#define RLBOX_WASM2C_CONCAT3(x, y, z) RLBOX_WASM2C_CONCAT3_HELPER(x, y, z)
+
+// #define RLBOX_WASM2C_MANGLED_MODULE_NAME() RLBOX_WASM2C_MODULE_NAME
+#define RLBOX_WASM2C_MANGLED_MODULE_NAME() RLBOX_WASM2C_CONCAT3(0x24, RLBOX_WASM2C_MODULE_NAME, 0x2Ewasm)
+
 // Need an extra macro to expand RLBOX_WASM2C_MODULE_NAME
 #define INVOKE_DEFINE_RLBOX_WASM2C_MODULE_TYPE(modname)                        \
   DEFINE_RLBOX_WASM2C_MODULE_TYPE(modname)
@@ -125,27 +134,19 @@
   DEFINE_RLBOX_WASM2C_EXPORTED_MODULE_ATTRIBS(modname)
 
 // Define the base wasm2c module type
-INVOKE_DEFINE_RLBOX_WASM2C_MODULE_TYPE(RLBOX_WASM2C_MODULE_NAME);
-
-// Concat after macro expansion
-#define RLBOX_WASM2C_CONCAT2(x, y) x##y
-#define RLBOX_WASM2C_CONCAT(x, y) RLBOX_WASM2C_CONCAT2(x, y)
+INVOKE_DEFINE_RLBOX_WASM2C_MODULE_TYPE(RLBOX_WASM2C_MANGLED_MODULE_NAME());
 
 #define RLBOX_WASM_MODULE_TYPE_CURR                                            \
-  RLBOX_WASM2C_CONCAT(rlbox_wasm2c_module_type_, RLBOX_WASM2C_MODULE_NAME)
+  RLBOX_WASM2C_CONCAT(rlbox_wasm2c_module_type_, RLBOX_WASM2C_MANGLED_MODULE_NAME())
 
 #define RLBOX_WASM2C_STRINGIFY(x) RLBOX_WASM2C_STRINGIFY2(x)
 #define RLBOX_WASM2C_STRINGIFY2(x) #x
 
 #define RLBOX_WASM2C_MODULE_NAME_STR                                           \
   RLBOX_WASM2C_STRINGIFY(RLBOX_WASM2C_MODULE_NAME)
 
-#define RLBOX_WASM2C_MODULE_FUNC_HELPER2(part1, part2, part3)                  \
-  part1##part2##part3
-#define RLBOX_WASM2C_MODULE_FUNC_HELPER(part1, part2, part3)                   \
-  RLBOX_WASM2C_MODULE_FUNC_HELPER2(part1, part2, part3)
 #define RLBOX_WASM2C_MODULE_FUNC(name)                                         \
-  RLBOX_WASM2C_MODULE_FUNC_HELPER(w2c_, RLBOX_WASM2C_MODULE_NAME, name)
+  RLBOX_WASM2C_CONCAT3(w2c_, RLBOX_WASM2C_MANGLED_MODULE_NAME(), name)
 
 namespace rlbox {
 
@@ -558,7 +559,7 @@ class rlbox_wasm2c_sandbox
       sandbox_memory_info = &local_sandbox_memory_info;
       sandbox_callback_table = &local_sandbox_callback_table;
 
-      INVOKE_DEFINE_RLBOX_WASM2C_IMPORTED_MODULE_ATTRIBS(RLBOX_WASM2C_MODULE_NAME);
+      INVOKE_DEFINE_RLBOX_WASM2C_IMPORTED_MODULE_ATTRIBS(RLBOX_WASM2C_MANGLED_MODULE_NAME());
 
       *sandbox_memory_info = create_wasm2c_memory(
         *initial_memory_pages, custom_capacity, instance_name? instance_name : "rlbox_wasm2c");
@@ -583,7 +584,7 @@ class rlbox_wasm2c_sandbox
       auto create_instance_func = (RLBOX_WASM_MODULE_TYPE_CURR::create_instance_imported_t) RLBOX_WASM_MODULE_TYPE_CURR::create_instance;
       create_instance_func(&wasm2c_instance, &sandbox_memory_env, &wasi_env);
     } else {
-      INVOKE_DEFINE_RLBOX_WASM2C_EXPORTED_MODULE_ATTRIBS(RLBOX_WASM2C_MODULE_NAME);
+      INVOKE_DEFINE_RLBOX_WASM2C_EXPORTED_MODULE_ATTRIBS(RLBOX_WASM2C_MANGLED_MODULE_NAME());
       sandbox_memory_info = get_exported_memory(&wasm2c_instance);
       sandbox_callback_table = get_exported_table(&wasm2c_instance);