summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt87
-rw-r--r--src/wasm-apply-names.c14
-rw-r--r--src/wasm-stack-allocator.c7
3 files changed, 40 insertions, 68 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 190d0911..4136bdea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,60 +189,50 @@ else ()
set(WASM_AST_LEXER_GEN_C src/prebuilt/wasm-ast-lexer-gen.c)
endif ()
-
add_custom_target(everything)
-add_library(wasm-common STATIC
+add_library(libwasm STATIC
src/wasm-allocator.c
+ src/wasm-apply-names.c
+ src/wasm-ast.c
+ src/wasm-ast-checker.c
+ src/wasm-ast-parser-lexer-shared.c
+ src/wasm-ast-writer.c
+ src/wasm-binary-reader-ast.c
+ src/wasm-binary-reader.c
+ src/wasm-binary-reader.c
+ src/wasm-binary-reader-interpreter.c
+ src/wasm-binary-writer.c
+ src/wasm-binary-writer-spec.c
src/wasm-common.c
src/wasm-config.c
+ src/wasm-generate-names.c
+ src/wasm-interpreter.c
+ src/wasm-literal.c
src/wasm-option-parser.c
src/wasm-stack-allocator.c
src/wasm-stream.c
src/wasm-vector.c
src/wasm-writer.c
+ ${WASM_AST_LEXER_GEN_C}
+ ${WASM_AST_PARSER_GEN_C}
)
+set_target_properties(libwasm PROPERTIES OUTPUT_NAME wasm)
# sexpr-wasm
-add_executable(sexpr-wasm
- src/sexpr-wasm.c
- src/wasm-ast.c
- src/wasm-ast-checker.c
- src/wasm-ast-parser-lexer-shared.c
- src/wasm-binary-writer.c
- src/wasm-binary-writer-spec.c
- src/wasm-literal.c
- ${WASM_AST_PARSER_GEN_C}
- ${WASM_AST_LEXER_GEN_C}
-)
+add_executable(sexpr-wasm src/sexpr-wasm.c)
add_dependencies(everything sexpr-wasm)
-target_link_libraries(sexpr-wasm wasm-common)
+target_link_libraries(sexpr-wasm libwasm)
# wasm-wast
-add_executable(wasm-wast
- src/wasm-apply-names.c
- src/wasm-ast.c
- src/wasm-ast-writer.c
- src/wasm-binary-reader.c
- src/wasm-binary-reader-ast.c
- src/wasm-generate-names.c
- src/wasm-literal.c
- src/wasm-wast.c
-)
+add_executable(wasm-wast src/wasm-wast.c)
add_dependencies(everything wasm-wast)
-target_link_libraries(wasm-wast wasm-common)
-
-# wasm-interp-common
-add_library(wasm-interp-common
- src/wasm-binary-reader.c
- src/wasm-binary-reader-interpreter.c
- src/wasm-interpreter.c
-)
+target_link_libraries(wasm-wast libwasm)
# wasm-interp
add_executable(wasm-interp src/wasm-interp.c)
add_dependencies(everything wasm-interp)
-target_link_libraries(wasm-interp wasm-interp-common wasm-common m)
+target_link_libraries(wasm-interp libwasm m)
# stuff that requires squirrel
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/squirrel/squirrel)
@@ -285,36 +275,17 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/squirrel/squirrel)
# wasm-interp-sq
add_executable(wasm-interp-sq src/wasm-interp-sq.c)
add_dependencies(everything wasm-interp-sq)
- target_link_libraries(wasm-interp-sq
- wasm-interp-common
- wasm-common
- libsquirrel
- m
- )
+ target_link_libraries(wasm-interp-sq libwasm libsquirrel m)
endif ()
# emscripten stuff
if (EMSCRIPTEN)
# just dump everything into one binary so we can reference it from JavaScript
- add_executable(libwasm
- src/wasm-apply-names.c
- src/wasm-ast.c
- src/wasm-ast-checker.c
- src/wasm-ast-parser-lexer-shared.c
- src/wasm-ast-writer.c
- src/wasm-binary-reader-ast.c
- src/wasm-binary-reader.c
- src/wasm-binary-writer.c
- src/wasm-binary-writer-spec.c
- src/wasm-emscripten-helpers.c
- src/wasm-generate-names.c
- src/wasm-literal.c
- ${WASM_AST_PARSER_GEN_C}
- ${WASM_AST_LEXER_GEN_C}
- )
- add_dependencies(everything libwasm)
- target_link_libraries(libwasm wasm-interp-common wasm-common)
+ add_executable(libwasmjs src/wasm-emscripten-helpers.c)
+ add_dependencies(everything libwasmjs)
+ target_link_libraries(libwasmjs libwasm)
+ set_target_properties(libwasmjs PROPERTIES OUTPUT_NAME libwasm)
set(WASM_JS ${SEXPR_WASM_SOURCE_DIR}/src/wasm.js)
set(EMSCRIPTEN_EXPORTED_JSON
@@ -328,7 +299,7 @@ if (EMSCRIPTEN)
)
string(REPLACE ";" " " LIBWASM_LINK_FLAGS_STR "${LIBWASM_LINK_FLAGS}")
- set_target_properties(libwasm
+ set_target_properties(libwasmjs
PROPERTIES
LINK_FLAGS "${LIBWASM_LINK_FLAGS_STR}"
LINK_DEPENDS "${WASM_JS};${EMSCRIPTEN_EXPORTED_JSON}"
diff --git a/src/wasm-apply-names.c b/src/wasm-apply-names.c
index 56bd0dac..8b6cbc15 100644
--- a/src/wasm-apply-names.c
+++ b/src/wasm-apply-names.c
@@ -158,47 +158,47 @@ static WasmResult use_name_for_param_and_local_var(Context* ctx,
return WASM_OK;
}
-WasmResult begin_block_expr(WasmExpr* expr, void* user_data) {
+static WasmResult begin_block_expr(WasmExpr* expr, void* user_data) {
Context* ctx = user_data;
CHECK_RESULT(push_label(ctx, &expr->block.label));
return WASM_OK;
}
-WasmResult end_block_expr(WasmExpr* expr, void* user_data) {
+static WasmResult end_block_expr(WasmExpr* expr, void* user_data) {
Context* ctx = user_data;
pop_label(ctx);
return WASM_OK;
}
-WasmResult begin_loop_expr(WasmExpr* expr, void* user_data) {
+static WasmResult begin_loop_expr(WasmExpr* expr, void* user_data) {
Context* ctx = user_data;
CHECK_RESULT(push_label(ctx, &expr->loop.outer));
CHECK_RESULT(push_label(ctx, &expr->loop.inner));
return WASM_OK;
}
-WasmResult end_loop_expr(WasmExpr* expr, void* user_data) {
+static WasmResult end_loop_expr(WasmExpr* expr, void* user_data) {
Context* ctx = user_data;
pop_label(ctx);
pop_label(ctx);
return WASM_OK;
}
-WasmResult begin_br_expr(WasmExpr* expr, void* user_data) {
+static WasmResult begin_br_expr(WasmExpr* expr, void* user_data) {
Context* ctx = user_data;
WasmLabel* label = find_label_by_var(ctx, &expr->br.var);
CHECK_RESULT(use_name_for_var(ctx->allocator, label, &expr->br.var));
return WASM_OK;
}
-WasmResult begin_br_if_expr(WasmExpr* expr, void* user_data) {
+static WasmResult begin_br_if_expr(WasmExpr* expr, void* user_data) {
Context* ctx = user_data;
WasmLabel* label = find_label_by_var(ctx, &expr->br.var);
CHECK_RESULT(use_name_for_var(ctx->allocator, label, &expr->br.var));
return WASM_OK;
}
-WasmResult begin_br_table_expr(WasmExpr* expr, void* user_data) {
+static WasmResult begin_br_table_expr(WasmExpr* expr, void* user_data) {
Context* ctx = user_data;
size_t i;
WasmVarVector* targets = &expr->br_table.targets;
diff --git a/src/wasm-stack-allocator.c b/src/wasm-stack-allocator.c
index 7df136fb..335c8f1b 100644
--- a/src/wasm-stack-allocator.c
+++ b/src/wasm-stack-allocator.c
@@ -213,7 +213,7 @@ static void stack_free(WasmAllocator* allocator,
chunk->current = p;
}
-void stack_destroy(WasmAllocator* allocator) {
+static void stack_destroy(WasmAllocator* allocator) {
WasmStackAllocator* stack_allocator = (WasmStackAllocator*)allocator;
/* destroy the free chunks */
WasmStackAllocatorChunk* chunk = stack_allocator->next_free;
@@ -232,7 +232,7 @@ void stack_destroy(WasmAllocator* allocator) {
}
}
-WasmAllocatorMark stack_mark(WasmAllocator* allocator) {
+static WasmAllocatorMark stack_mark(WasmAllocator* allocator) {
WasmStackAllocator* stack_allocator = (WasmStackAllocator*)allocator;
/* allocate the space for the mark, but copy the current stack state now, so
@@ -256,7 +256,8 @@ WasmAllocatorMark stack_mark(WasmAllocator* allocator) {
return allocated_mark;
}
-void stack_reset_to_mark(WasmAllocator* allocator, WasmAllocatorMark mark) {
+static void stack_reset_to_mark(WasmAllocator* allocator,
+ WasmAllocatorMark mark) {
WasmStackAllocator* stack_allocator = (WasmStackAllocator*)allocator;
StackAllocatorMark* stack_mark = (StackAllocatorMark*)mark;
WasmStackAllocatorChunk* chunk = stack_allocator->last;
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-29 00:40:50 +0000