HPCC-33154 Refactor WebAssembly Support

Added list / set support Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Jan 2, 2025 · 75808aa · 75808aa
1 parent 70ccefc
commit 75808aa
Show file tree

Hide file tree

Showing 42 changed files with 2,379 additions and 472 deletions.
diff --git a/plugins/wasmembed/.gitignore b/plugins/wasmembed/.gitignore
@@ -0,0 +1 @@
+ref/
diff --git a/plugins/wasmembed/CMakeLists.txt b/plugins/wasmembed/CMakeLists.txt
@@ -3,8 +3,11 @@ project(wasmembed)
 if(WASMEMBED)
     ADD_PLUGIN(wasmembed)
     if(MAKE_WASMEMBED)
-
         set(CMAKE_CXX_STANDARD 20)
+        set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+        add_subdirectory(component-model)
+
         find_path(WASMTIME_CPP_API_INCLUDE_DIRS "wasmtime-cpp-api/wasmtime.hh"
             PATHS ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
         )
@@ -21,6 +24,7 @@ if(WASMEMBED)
         include_directories(
             ${WASMTIME_CPP_API_INCLUDE_DIRS}/wasmtime-c-api
             ${WASMTIME_CPP_API_INCLUDE_DIRS}/wasmtime-cpp-api
+
             ./../../system/include
             ./../../system/jlib
             ./../../rtl/eclrtl
@@ -37,12 +41,12 @@ if(WASMEMBED)
         add_library(wasmembed SHARED 
             wasmembed.cpp
             secure-enclave.cpp
-            abi.cpp
             util.cpp
         )
 
         target_link_libraries(wasmembed
             ${WASMTIME_LIB}
+            component-model-cpp
             eclrtl
             jlib
         )

diff --git a/plugins/wasmembed/abi.cpp b/plugins/wasmembed/abi.cpp
diff --git a/plugins/wasmembed/abi.hpp b/plugins/wasmembed/abi.hpp
diff --git a/plugins/wasmembed/component-model/CMakeLists.txt b/plugins/wasmembed/component-model/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/plugins/wasmembed/component-model/src/CMakeLists.txt b/plugins/wasmembed/component-model/src/CMakeLists.txt
@@ -0,0 +1,42 @@
+project(component-model-cpp)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(SRC
+    boolean.cpp
+    boolean.hpp
+    context.hpp
+    context.cpp
+    float.hpp
+    float.cpp
+    integer.hpp
+    integer.cpp
+    list.hpp
+    list.cpp
+    load.hpp
+    load.cpp
+    string.hpp
+    string.cpp
+    traits.hpp
+    traits.cpp
+    util.hpp
+    util.cpp
+)
+
+add_library(${PROJECT_NAME} STATIC
+    ${SRC}
+)
+
+target_link_libraries(${PROJECT_NAME} 
+)
+
+target_compile_definitions(${PROJECT_NAME} 
+    PRIVATE CMCPP_EXPORTS
+)
+target_compile_options(${PROJECT_NAME} PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/permissive->")
+
+target_include_directories(
+    ${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+                         $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+)
diff --git a/plugins/wasmembed/component-model/src/boolean.cpp b/plugins/wasmembed/component-model/src/boolean.cpp
@@ -0,0 +1,19 @@
+#include "boolean.hpp"
+#include "integer.hpp"
+#include "util.hpp"
+
+namespace cmcpp
+{
+    namespace boolean
+    {
+        void store(CallContext &cx, const bool_t &v, offset ptr)
+        {
+            integer::store<uint8_t>(cx, v, ptr);
+        }
+
+        bool_t load(const CallContext &cx, uint32_t ptr)
+        {
+            return convert_int_to_bool(integer::load<uint8_t>(cx, ptr));
+        }
+    }
+}