small changes

Signed-off-by: Shaw Summa <[email protected]>

Author: ShawSumma

.clang-format

@@ -2,4 +2,4 @@
 Language: Cpp
 BasedOnStyle:  Google
 IndentWidth: 4
-ColumnLimit: 0
+ColumnLimit: 0

.gitignore

@@ -1,24 +1,12 @@
-.DS_Store
-.vscode/*
-bin/*
-err.txt
-install
-miniwasm
-miniwasm.exe
-out.*
-test/bench/results.json
-test/core/*
-test/*.wasm
-*.core
-*.exe
-*.exp
-*.gcda
-*.ilk
-*.lib
-*.o
-*.pdb
-*.tmp
-*.wasm
-*.wat
-*.profdata
-spec
+*
+!test
+!src
+!res
+!.github
+!.clang-format
+!.gitignore
+!bench.py
+!LICENSE
+!makefile
+!README.md
+!results.txt

bench.py

@@ -33,7 +33,7 @@
 emccflags = ['-msimd128']
 emccflags = []
 if len(engines) == 0:
-    engines = ['wasm3', os.path.join(cur, 'bin/miniwasm')]
+    engines = ['wasm3', os.path.join(cur, 'build/opt/bin/miniwasm')]
 engines.extend(['wasmer', 'wasmtime'])
 
 if len(args.test) == 0: 

main/miniwasm.c

@@ -1,5 +1,4 @@
 #include "../src/ast.h"
-#include "../src/interp/interp.h"
 #include "../src/read_bin.h"
 #include "../src/write_bin.h"
 

main/wasm2wasm.c

@@ -1,5 +1,4 @@
 #include "../src/ast.h"
-#include "../src/interp/interp.h"
 #include "../src/read_wat.h"
 #include "../src/write_bin.h"
 

main/wat2wasm.c

@@ -1,109 +1,89 @@
 
-PYTHON ?= python3
-OPT ?= -O2
+MODE ?= opt
 
-INSTALL ?= install
+BUILD_DIR = ./build/$(MODE)/
+BIN_DIR = $(BUILD_DIR)bin/
+OBJ_DIR = $(BUILD_DIR)obj/
+TEST_DIR = $(BUILD_DIR)test/
 
-EMCC ?= emcc
+PYTHON ?= python3
 
 PROG_SRCS := main/wat2wat.c main/wasm2wat.c main/wat2wasm.c main/wasm2wasm.c main/miniwasm.c main/raywasm.c main/runtime/rlruntime.c
-PROG_OBJS := $(PROG_SRCS:%.c=%.o)
+PROG_OBJS := $(PROG_SRCS:%.c=$(OBJ_DIR)%.o)
 
-WEB49_SRCS := src/lib.c src/read_bin.c src/read_wat.c src/write_wat.c src/write_bin.c src/io.c src/tables.c src/interp/interp.c src/opt/tree.c src/opt/tee.c src/ast.c src/api/wasi.c
-WEB49_OBJS := $(WEB49_SRCS:%.c=%.o)
+WEB49_SRCS := src/lib.c src/read_bin.c src/read_wat.c src/write_wat.c src/write_bin.c src/io.c src/tables.c src/interp/interp.c src/opt/tree.c src/opt/tee.c src/ast.c src/wasi/wasi.c
+WEB49_OBJS := $(WEB49_SRCS:%.c=$(OBJ_DIR)%.o)
 
 OBJS := $(WEB49_OBJS)
 
-UNAME_S_CMD != uname -s
-
-UNAME_S ?= $(UNAME_S_CMD)
-
-RGLFW_M_OR_C_Windows = c
-RGLFW_M_OR_C_FreeBSD = c
-RGLFW_M_OR_C_Linux = c
-RGLFW_M_OR_C_Darwin = m
-
 TEST_PREFIX = test/core
 
 TEST_FILES != find $(TEST_PREFIX) -name '*.wast'
 TEST_OUTPUTS = $(TEST_FILES:%.wast=%.txt)
 
-default: all
+# modes
+FLAGS_san = -g3 -ggdb -fsanitize=address,undefined
+FLAGS_debug = -g3 -ggdb
 
-all: bins
+CLAGS_opt = -O3
+LDFLAGS_opt = -flto
 
-# install web49
+CFLAGS += $(CFLAGS_$(MODE)) $(FLAGS_$(MODE))
+LDFLAGS += $(LDFLAGS_$(MODE)) $(FLAGS_$(MODE))
 
-install: bins
-	cp bin/miniwasm $(INSTALL)
-	chmod $(INSTALL)/miniwasm
+default: all
 
-# tests
+all: bins test
 
-test: results.txt
+# tests
 
-results.txt: $(TEST_OUTPUTS)
-	@cat /dev/null $(TEST_OUTPUTS) | sort > results.txt
+TESTS != find test -type f -name '*.wast'
+TEST_LOGS = $(TESTS:%.wast=$(TEST_DIR)log/%.log)
+TEST_RESULT = $(TEST_DIR)result
 
-$(TEST_OUTPUTS): bin/miniwasm $(@:%.txt=%.wast) | $(TEST_PREFIX)
-	@./bin/miniwasm $(@:%.txt=%.wast) 2>$(@:%.txt=%.log); \
-		if test $$? -eq 0; \
-		then mv $(@:%.txt=%.log) $(@:%.txt=%.pass.log) && echo "PASS $(@:$(TEST_PREFIX)/%.txt=%)" > $(@); \
-		else mv $(@:%.txt=%.log) $(@:%.txt=%.fail.log) && echo "FAIL $(@:$(TEST_PREFIX)/%.txt=%)" > $(@); \
-		fi
+test: $(TEST_RESULT)
 
-# test/wasi:
-# 	test -d wasi-testsuite || git clone https://github.com/WebAssembly/wasi-testsuite spec --depth 1
-# 	rm -fr test/wasi 
+$(TEST_RESULT): $(TEST_LOGS)
+	@echo -n > $(TEST_RESULT).pass
+	@echo -n > $(TEST_RESULT).fail
+	@sort -u $(TEST_RESULT).pass -o $(TEST_RESULT).pass
+	@sort -u $(TEST_RESULT).fail -o $(TEST_RESULT).fail
+	@cat $(TEST_RESULT).pass > $(TEST_RESULT)
+	@echo >> $(TEST_RESULT)
+	@cat $(TEST_RESULT).fail >> $(TEST_RESULT)
+	@rm $(TEST_RESULT).pass $(TEST_RESULT).fail
 
-test/core:
-	test -d spec || git clone https://github.com/WebAssembly/spec/ spec --depth 1
-	rm -fr test/core
-	cp -r spec/test/core test/core
-	rm -r test/core/simd/meta
+$(TEST_DIR)log/%.log: %.wast $(BIN_DIR)miniwasm
+	@mkdir -p $(dir $(@))
+	@echo $(BIN_DIR)miniwasm $(<); if $(BIN_DIR)miniwasm $(<) 2>$(@); then echo pass $(<) >> $(TEST_RESULT).pass; else echo fail $(<) >> $(TEST_RESULT).fail; fi
 
 # bin
 
-bins: bin/wasm2wat bin/wat2wasm bin/wasm2wasm bin/wat2wat bin/miniwasm
-
-bin/miniwasm: main/miniwasm.o $(OBJS)
-	@mkdir -p bin
-	$(CC) $(OPT) main/miniwasm.o $(OBJS) -o $(@) -lm $(LDFLAGS)
+MAINS != find main -type f -name '*.c'
+MAIN_BINS = $(MAINS:main/%.c=$(BIN_DIR)%)
 
-bin/wat2wasm: main/wat2wasm.o $(OBJS)
-	@mkdir -p bin
-	$(CC) $(OPT) main/wat2wasm.o $(OBJS) -o $(@) -lm $(LDFLAGS)
+bins: $(MAIN_BINS)
 
-bin/wasm2wat: main/wasm2wat.o $(OBJS)
-	@mkdir -p bin
-	$(CC) $(OPT) main/wasm2wat.o $(OBJS) -o $(@) -lm $(LDFLAGS)
+$(BIN_DIR)%: $(OBJ_DIR)main/%.o $(OBJS)
+	@mkdir -p $(dir $(@))
+	$(CC) $(^) -o $(@) -lm $(LDFLAGS)
 
-bin/wasm2wasm: main/wasm2wasm.o $(OBJS)
-	@mkdir -p bin
-	$(CC) $(OPT) main/wasm2wasm.o $(OBJS) -o $(@) -lm $(LDFLAGS)
+# intermediate files
 
-bin/wat2wat: main/wat2wat.o $(OBJS)
-	@mkdir -p bin
-	$(CC) $(OPT) main/wat2wat.o $(OBJS) -o $(@) -lm $(LDFLAGS)
+$(OBJ_DIR)%.o: %.c
+	@mkdir -p $(dir $(@))
+	$(CC) -c $(OPT) $(<) -o $(@) $(CFLAGS)
 
 # util
 
+.PHONY: format
 format: .dummy
 	find src main -name '*.c' | xargs -I FILENAME clang-format -style=file -i FILENAME
 	find src main -name '*.h' | xargs -I FILENAME clang-format -style=file -i FILENAME
 	find src main -name '*.inc' | xargs -I FILENAME clang-format -style=file -i FILENAME
 
+.PHONY: clean
 clean: .dummy
-	find src main -name '*.o' | xargs rm
-	find bin -type f | xargs rm
-	find test/core -name '*.txt' | xargs rm
-	find test/core -name '*.log' | xargs rm
-
-# intermediate files
-
-$(PROG_OBJS) $(WEB49_OBJS): $(@:%.o=%.c)
-	$(CC) -c $(OPT) $(@:%.o=%.c) -o $(@) $(CFLAGS)
-
-# dummy
+	rm -rf build
 
 .dummy:

makefile

@@ -9,6 +9,7 @@ FAIL custom
 FAIL data
 FAIL elem
 FAIL exports
+FAIL f64_cmp
 FAIL float_exprs
 FAIL float_literals
 FAIL float_memory
@@ -90,14 +91,14 @@ FAIL simd/simd_store8_lane
 FAIL stack
 FAIL start
 FAIL table
-FAIL table-sub
 FAIL table_copy
 FAIL table_fill
 FAIL table_get
 FAIL table_grow
 FAIL table_init
 FAIL table_set
 FAIL table_size
+FAIL table-sub
 FAIL token
 FAIL tokens
 FAIL unreached-invalid
@@ -118,7 +119,6 @@ PASS f32_bitwise
 PASS f32_cmp
 PASS f64
 PASS f64_bitwise
-PASS f64_cmp
 PASS fac
 PASS float_misc
 PASS forward

results.txt

@@ -17,13 +17,13 @@ void web49_free_module(web49_module_t mod) {
         web49_section_t section = mod.sections[i];
         switch (section.header.id) {
             case WEB49_SECTION_ID_CUSTOM: {
-                web49_section_custom_t cur = section.custom_section;
+                web49_section_custom_t cur = section.section.custom;
                 web49_free(cur.name);
                 web49_free(cur.payload);
                 break;
             }
             case WEB49_SECTION_ID_TYPE: {
-                web49_section_type_t cur = section.type_section;
+                web49_section_type_t cur = section.section.type;
                 for (size_t j = 0; j < cur.num_entries; j++) {
                     web49_section_type_entry_t ent = cur.entries[j];
                     web49_free(ent.params);
@@ -33,7 +33,7 @@ void web49_free_module(web49_module_t mod) {
                 break;
             }
             case WEB49_SECTION_ID_IMPORT: {
-                web49_section_import_t cur = section.import_section;
+                web49_section_import_t cur = section.section.import;
                 for (size_t j = 0; j < cur.num_entries; j++) {
                     web49_section_import_entry_t ent = cur.entries[j];
                     web49_free(ent.module_str);
@@ -43,22 +43,22 @@ void web49_free_module(web49_module_t mod) {
                 break;
             }
             case WEB49_SECTION_ID_FUNCTION: {
-                web49_section_function_t cur = section.function_section;
+                web49_section_function_t cur = section.section.function;
                 web49_free(cur.entries);
                 break;
             }
             case WEB49_SECTION_ID_TABLE: {
-                web49_section_table_t cur = section.table_section;
+                web49_section_table_t cur = section.section.table;
                 web49_free(cur.entries);
                 break;
             }
             case WEB49_SECTION_ID_MEMORY: {
-                web49_section_memory_t cur = section.memory_section;
+                web49_section_memory_t cur = section.section.memory;
                 web49_free(cur.entries);
                 break;
             }
             case WEB49_SECTION_ID_GLOBAL: {
-                web49_section_global_t cur = section.global_section;
+                web49_section_global_t cur = section.section.global;
                 for (size_t j = 0; j < cur.num_entries; j++) {
                     web49_section_global_entry_t ent = cur.entries[j];
                     web49_free_instr(ent.init_expr);
@@ -67,7 +67,7 @@ void web49_free_module(web49_module_t mod) {
                 break;
             }
             case WEB49_SECTION_ID_EXPORT: {
-                web49_section_export_t cur = section.export_section;
+                web49_section_export_t cur = section.section.export;
                 for (size_t j = 0; j < cur.num_entries; j++) {
                     web49_section_export_entry_t ent = cur.entries[j];
                     web49_free(ent.field_str);
@@ -79,7 +79,7 @@ void web49_free_module(web49_module_t mod) {
                 break;
             }
             case WEB49_SECTION_ID_ELEMENT: {
-                web49_section_element_t cur = section.element_section;
+                web49_section_element_t cur = section.section.element;
                 for (size_t j = 0; j < cur.num_entries; j++) {
                     web49_section_element_entry_t ent = cur.entries[j];
                     web49_free(ent.elems);
@@ -88,7 +88,7 @@ void web49_free_module(web49_module_t mod) {
                 break;
             }
             case WEB49_SECTION_ID_CODE: {
-                web49_section_code_t cur = section.code_section;
+                web49_section_code_t cur = section.section.code;
                 for (size_t j = 0; j < cur.num_entries; j++) {
                     web49_section_code_entry_t ent = cur.entries[j];
                     for (size_t k = 0; k < ent.num_instrs; k++) {
@@ -101,7 +101,7 @@ void web49_free_module(web49_module_t mod) {
                 break;
             }
             case WEB49_SECTION_ID_DATA: {
-                web49_section_data_t cur = section.data_section;
+                web49_section_data_t cur = section.section.data;
                 for (size_t j = 0; j < cur.num_entries; j++) {
                     web49_free(cur.entries[j].data);
                 }
@@ -204,7 +204,7 @@ web49_section_t web49_module_get_section(web49_module_t mod, web49_section_id_t
 uint32_t web49_module_num_func_imports(web49_module_t mod) {
     for (size_t i = 0; i < mod.num_sections; i++) {
         if (mod.sections[i].header.id == WEB49_SECTION_ID_IMPORT) {
-            web49_section_import_t *pimport = &mod.sections[i].import_section;
+            web49_section_import_t *pimport = &mod.sections[i].section.import;
             if (pimport->num_func_imports == 0) {
                 pimport->num_func_imports = 1;
                 for (size_t j = 0; j < pimport->num_entries; j++) {