Skip to content

Commit 9adf1f7

Browse files
GordonSmithGordonSmith
committed
feat: Add unload method to mirror load
Refactor code to enable debugging of C++ code in Chromium Move wasm.js creation into CMake Signed-off-by: Gordon Smith <[email protected]>
1 parent a311393 commit 9adf1f7

File tree

21 files changed

+607
-145
lines changed

21 files changed

+607
-145
lines changed

‎.vscode/launch.json‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
{
8+
"name": "sfx-wasm",
9+
"request": "launch",
10+
"runtimeArgs": [
11+
"run-script",
12+
"gen-sfx-graphviz"
13+
],
14+
"runtimeExecutable": "npm",
15+
"skipFiles": [
16+
"<node_internals>/**"
17+
],
18+
"type": "node"
19+
},
720
{
821
"name": "index.html",
922
"type": "msedge",
@@ -50,10 +63,11 @@
5063
"sourceMapPathOverrides": {
5164
"webpack:///./*": "${workspaceRoot}/*",
5265
"webpack:///*": "/*"
53-
}
66+
},
5467
},
5568
{
5669
"name": "test-node",
70+
"type": "node",
5771
"request": "launch",
5872
"runtimeArgs": [
5973
"run-script",
@@ -63,7 +77,11 @@
6377
"skipFiles": [
6478
"<node_internals>/**"
6579
],
66-
"type": "node"
80+
"outFiles": [
81+
"${workspaceFolder}/**/*.js",
82+
"${workspaceFolder}/**/*.c",
83+
"!**/node_modules/**"
84+
],
6785
},
6886
{
6987
"name": "cli rollup wasm",

‎CMakeLists.txt‎

Lines changed: 77 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,93 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 3.9.2)
1+
cmake_minimum_required(VERSION 3.9.2)
22

3-
PROJECT(cpp)
3+
set(REPO_DIR ${CMAKE_CURRENT_SOURCE_DIR})
4+
set(VCPKG_FILES_DIR "${CMAKE_BINARY_DIR}" CACHE STRING "Folder for vcpkg download, build and installed files")
5+
set(CMAKE_TOOLCHAIN_FILE ${REPO_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
6+
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${REPO_DIR}/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake)
7+
set(VCPKG_ROOT ${REPO_DIR}/vcpkg)
8+
set(VCPKG_OVERLAY_PORTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg-overlays)
9+
set(VCPKG_VERBOSE OFF)
10+
set(VCPKG_TARGET_TRIPLET "wasm32-emscripten")
11+
file(REMOVE ${REPO_DIR}/vcpkg/vcpkg)
412

5-
SET(CMAKE_INSTALL_PREFIX "..")
6-
SET(VCPKG_INCLUDE_DIR ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
13+
project(cpp)
14+
15+
option(ENABLE_SANITIZERS "Enable Clang's sanitizer options" OFF)
16+
17+
set(CMAKE_INSTALL_PREFIX "..")
18+
set(VCPKG_INCLUDE_DIR ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
719

820
# See: https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
9-
SET(EM_FLAGS
10-
"-s ASSERTIONS=0"
11-
"-s INVOKE_RUN=0"
12-
"-s ALLOW_MEMORY_GROWTH=1"
13-
"-s WASM=1"
14-
"-s ENVIRONMENT=web"
15-
"-s FILESYSTEM=0"
16-
# "-s MINIMAL_RUNTIME=1"
17-
"-s MODULARIZE=1"
18-
"-s EXPORT_ES6=1"
19-
"-s IGNORE_CLOSURE_COMPILER_ERRORS=0"
20-
"-s USE_ES6_IMPORT_META=0"
21-
# "-s WASM_BIGINT=1"
22-
"-s STANDALONE_WASM=0"
23-
"-s BINARYEN_ASYNC_COMPILATION=1"
24-
# "-s DYNAMIC_EXECUTION=0"
21+
set(EM_CPP_FLAGS "")
22+
23+
set(EM_LINK_FLAGS
24+
"-sASSERTIONS=0"
25+
"-sINVOKE_RUN=0"
26+
"-sALLOW_MEMORY_GROWTH=1"
27+
"-sWASM=1"
28+
"-sENVIRONMENT=webview"
29+
"-sFILESYSTEM=0"
30+
# "-sMINIMAL_RUNTIME=1"
31+
"-sMODULARIZE=1"
32+
"-sEXPORT_ES6=1"
33+
"-sIGNORE_CLOSURE_COMPILER_ERRORS=0"
34+
# "-sWASM_BIGINT=1"
35+
"-sSTANDALONE_WASM=0"
36+
"-sBINARYEN_ASYNC_COMPILATION=1"
37+
# "-sDYNAMIC_EXECUTION=0"
2538
"--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/pre.js"
2639
"--post-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/post.js"
2740
)
2841

29-
IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
30-
SET(EM_FLAGS
31-
${EM_FLAGS}
42+
43+
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
44+
set(EM_LINK_FLAGS
45+
${EM_LINK_FLAGS}
46+
"-sUSE_ES6_IMPORT_META=1"
3247
"-gsource-map"
33-
"--source-map-base ${CMAKE_CURRENT_SOURCE_DIR}"
48+
"--source-map-base ./" # Debugging c++ only works in browser with "Experimental DWARF support turned on"
49+
)
50+
51+
if (ENABLE_SANITIZERS)
52+
set(EM_CPP_FLAGS
53+
${EM_CPP_FLAGS}
54+
"-fsanitize=address"
55+
)
56+
57+
set(EM_LINK_FLAGS
58+
${EM_LINK_FLAGS}
59+
"-fsanitize=address"
60+
"-sENVIRONMENT=web,node"
61+
)
62+
endif ()
63+
else ()
64+
set(EM_LINK_FLAGS
65+
${EM_LINK_FLAGS}
66+
"-sUSE_ES6_IMPORT_META=0"
3467
)
35-
ENDIF()
68+
endif ()
3669

37-
SET(EMSDK_DIR "${CMAKE_SOURCE_DIR}/emsdk")
38-
SET(EXPAT_DIR "${CMAKE_SOURCE_DIR}/src-expat/expat")
39-
SET(GRAPHVIZ_DIR "${CMAKE_SOURCE_DIR}/src-graphviz")
70+
set(EMSDK_DIR "${CMAKE_SOURCE_DIR}/emsdk")
71+
set(EXPAT_DIR "${CMAKE_SOURCE_DIR}/src-expat/expat")
72+
set(GRAPHVIZ_DIR "${CMAKE_SOURCE_DIR}/src-graphviz")
4073

4174
set(CMAKE_CXX_STANDARD 20)
4275
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4376
set(CMAKE_CXX_EXTENSIONS OFF)
4477

45-
ADD_SUBDIRECTORY(cpp)
78+
set(PACK_MODE "")
79+
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
80+
set(PACK_MODE "-d")
81+
endif ()
82+
83+
function(packWasm targetID)
84+
add_custom_target(sfx-${targetID} ALL
85+
COMMAND node ./utils/sfx-wasm.js ${PACK_MODE} ${CMAKE_CURRENT_BINARY_DIR}/${targetID}.wasm > ${REPO_DIR}/lib-esm/${targetID}.wasm.js
86+
WORKING_DIRECTORY ${REPO_DIR}
87+
COMMENT "SFX Wasm ${targetID}"
88+
)
89+
90+
add_dependencies(sfx-${targetID} ${targetID} base91lib zstdlib)
91+
endfunction ()
92+
93+
add_subdirectory(cpp)

‎cpp/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ADD_SUBDIRECTORY(base91)
2-
ADD_SUBDIRECTORY(expat)
3-
ADD_SUBDIRECTORY(graphviz)
4-
ADD_SUBDIRECTORY(zstd)
1+
add_subdirectory(base91)
2+
add_subdirectory(expat)
3+
add_subdirectory(graphviz)
4+
add_subdirectory(zstd)

‎cpp/base91/CMakeLists.txt‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
1-
PROJECT(base91lib)
1+
project(base91lib)
22

33
find_package(unofficial-base91 CONFIG REQUIRED)
44

55
# See: https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
6-
SET(EM_FLAGS
7-
${EM_FLAGS}
6+
string(REPLACE ";" " " CPP_FLAGS "${EM_CPP_FLAGS}")
7+
8+
set(EM_LINK_FLAGS
9+
${EM_LINK_FLAGS}
810
"-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
911
"-s EXPORTED_FUNCTIONS=\"[]\""
1012
"-s EXPORTED_RUNTIME_METHODS=\"[]\""
1113
"--post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js"
1214
)
13-
STRING(REPLACE ";" " " LINK_FLAGS "${EM_FLAGS}")
15+
string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")
1416

1517
# Generate Glue from IDL file ---
16-
ADD_CUSTOM_COMMAND(
18+
add_custom_command(
1719
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/main.idl
1820
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp
1921
COMMAND python3 ${CMAKE_BINARY_DIR}/../emsdk/upstream/emscripten/tools/webidl_binder.py ${CMAKE_CURRENT_SOURCE_DIR}/main.idl ${CMAKE_CURRENT_BINARY_DIR}/main_glue
2022
)
21-
SET_PROPERTY(SOURCE main.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp)
23+
set_property(SOURCE main.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp)
2224
# --- --- ---
2325

24-
INCLUDE_DIRECTORIES(
26+
include_directories(
2527
${VCPKG_INCLUDE_DIR}
2628
${CMAKE_CURRENT_BINARY_DIR}
2729
)
2830

29-
ADD_EXECUTABLE(base91lib
31+
add_executable(base91lib
3032
main.cpp
3133
)
3234

33-
SET_TARGET_PROPERTIES(base91lib PROPERTIES LINK_FLAGS "${LINK_FLAGS} -s ENVIRONMENT=webview")
35+
set_target_properties(base91lib PROPERTIES COMPILE_FLAGS "${CPP_FLAGS}")
36+
set_target_properties(base91lib PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
3437

35-
TARGET_LINK_LIBRARIES(base91lib
38+
target_link_libraries(base91lib
3639
PRIVATE unofficial::base91::base91
3740
)
41+
42+
packWasm(base91lib)
43+

‎cpp/expat/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ADD_SUBDIRECTORY(expatlib)
1+
add_subdirectory(expatlib)

‎cpp/expat/expatlib/CMakeLists.txt‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,42 @@
1-
PROJECT(expatlib)
1+
project(expatlib)
22

33
find_package(expat CONFIG REQUIRED)
44

55
# See: https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
6-
SET(EM_FLAGS
7-
${EM_FLAGS}
6+
string(REPLACE ";" " " CPP_FLAGS "${EM_CPP_FLAGS}")
7+
8+
set(EM_LINK_FLAGS
9+
${EM_LINK_FLAGS}
810
"-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
911
"-s EXPORTED_FUNCTIONS=\"['_malloc']\""
1012
"-s EXPORTED_RUNTIME_METHODS=\"[]\""
1113
"--post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js"
1214
)
13-
STRING(REPLACE ";" " " LINK_FLAGS "${EM_FLAGS}")
15+
string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")
1416

1517
# Generate Glue from IDL file ---
16-
ADD_CUSTOM_COMMAND(
18+
add_custom_command(
1719
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/main.idl
1820
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp
1921
COMMAND python3 ${CMAKE_BINARY_DIR}/../emsdk/upstream/emscripten/tools/webidl_binder.py ${CMAKE_CURRENT_SOURCE_DIR}/main.idl ${CMAKE_CURRENT_BINARY_DIR}/main_glue
2022
)
21-
SET_PROPERTY(SOURCE main.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp)
23+
set_property(SOURCE main.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp)
2224
# --- --- ---
2325

24-
INCLUDE_DIRECTORIES(
26+
include_directories(
2527
${VCPKG_INCLUDE_DIR}
2628
${CMAKE_CURRENT_BINARY_DIR}
2729
)
2830

29-
ADD_EXECUTABLE(expatlib
31+
add_executable(expatlib
3032
main.cpp
3133
)
3234

33-
SET_TARGET_PROPERTIES(expatlib PROPERTIES LINK_FLAGS "${LINK_FLAGS} -s ENVIRONMENT=webview")
35+
set_target_properties(base91lib PROPERTIES COMPILE_FLAGS "${CPP_FLAGS}")
36+
set_target_properties(expatlib PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
3437

35-
TARGET_LINK_LIBRARIES(expatlib
38+
target_link_libraries(expatlib
3639
expat::expat
3740
)
41+
42+
packWasm(expatlib)

‎cpp/graphviz/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
PROJECT(graphlayout)
1+
project(graphlayout)
22

33
find_package(expat CONFIG REQUIRED)
44

5-
SET(GRAPHVIZ_LIB_DIR "${GRAPHVIZ_DIR}/lib")
6-
SET(GRAPHVIZ_PLUGIN_DIR "${GRAPHVIZ_DIR}/plugin")
7-
SET(GRAPHVIZ_BUILD_DIR "${GRAPHVIZ_DIR}/build")
5+
set(GRAPHVIZ_LIB_DIR "${GRAPHVIZ_DIR}/lib")
6+
set(GRAPHVIZ_PLUGIN_DIR "${GRAPHVIZ_DIR}/plugin")
7+
set(GRAPHVIZ_BUILD_DIR "${GRAPHVIZ_DIR}/build")
88

9-
INCLUDE_DIRECTORIES(
9+
include_directories(
1010
${CMAKE_CURRENT_SOURCE_DIR}
1111
${VCPKG_INCLUDE_DIR}
1212
)

0 commit comments

Comments
 (0)