Move source files for wasm

Author: tyfkda

wasm/.babelrc .babelrc

@@ -18,13 +18,13 @@ jobs:
       with:
         node-version: 16.x
     - name: Install NPM packages
-      run: cd wasm && npm ci
+      run: npm ci
     - name: Build release
-      run: make -C wasm release
+      run: make release-wcc
     - name: Upload artifact
       uses: actions/upload-pages-artifact@v1
       with:
-        path: wasm/release
+        path: release
 
   deploy:
     runs-on: ubuntu-latest

wasm/.eslintrc.js .eslintrc.js

@@ -25,6 +25,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: setup
-      run: cd wasm && npm install
+      run: npm ci
     - name: test
-      run:  make -C wasm test test-gen2
+      run:  make test-wcc test-wcc-gen2

.github/workflows/deploywcc.yml

@@ -30,3 +30,15 @@ core
 /dump_expr*
 /dump_ir*
 /dump_type*
+
+### wasm
+
+a.wasm
+/wcc
+/cc.wasm
+/gen3cc.wasm
+/tests/*.wasm
+
+/public/
+/release/
+node_modules

.github/workflows/test.yml

@@ -140,7 +140,8 @@ test-all: test test-gen2 diff-gen23
 .PHONY: clean
 clean:
 	rm -rf cc1 cpp as ld xcc $(OBJ_DIR) $(LIB_DIR) a.out gen2* gen3* tmp.s \
-		dump_expr* dump_ir* dump_type*
+		dump_expr* dump_ir* dump_type* \
+		wcc cc.wasm a.wasm public release
 	$(MAKE) -C tests clean
 
 ### Library
@@ -197,6 +198,92 @@ self-hosting:	$(TARGET)cpp $(TARGET)cc1 $(TARGET)as $(TARGET)ld $(TARGET)xcc
 test-self-hosting:	self-hosting
 	$(MAKE) PREFIX=$(TARGET) -C tests clean cc-tests
 
+
+### Wasm version
+
+WCC_DIR:=src/wcc
+
+WCC_SRCS:=$(wildcard $(WCC_DIR)/*.c) \
+	$(CC1_DIR)/lexer.c $(CC1_DIR)/type.c $(CC1_DIR)/var.c $(CC1_DIR)/ast.c $(CC1_DIR)/parser.c $(CC1_DIR)/parser_expr.c \
+	$(CPP_DIR)/preprocessor.c $(CPP_DIR)/pp_parser.c $(CPP_DIR)/macro.c \
+	$(UTIL_DIR)/util.c $(UTIL_DIR)/table.c
+WCC_OBJS:=$(addprefix $(OBJ_DIR)/,$(notdir $(WCC_SRCS:.c=.o)))
+
+$(OBJ_DIR)/%.o: $(WCC_DIR)/%.c
+	@mkdir -p $(OBJ_DIR)
+	$(CC) $(CFLAGS) -I$(CPP_DIR) -c -o $@ $<
+
+wcc: $(PARENT_DEPS) $(WCC_OBJS)
+	$(CC) -o $@ $(WCC_OBJS) $(LDFLAGS)
+
+.PHONY: test-wcc
+test-wcc:	wcc
+	$(MAKE) -C tests clean test-wcc
+
+#### Self hosting
+
+.PHONY: wcc-gen2
+wcc-gen2:	wcc
+	$(MAKE) HOST_TARGET=wcc HOST_CC="./wcc" WCC_TARGET= wcc-self-hosting
+.PHONY: test-wcc-gen2
+test-wcc-gen2: wcc-gen2
+	$(MAKE) TARGET_CC="node ../tool/runwasm.js ../cc.wasm --" test-wcc-self-hosting
+
+.PHONY: wcc-gen3
+wcc-gen3:	wcc-gen2
+	$(MAKE) HOST_TARGET=gen2 HOST_CC="node ./tool/runwasm.js ./cc.wasm --" WCC_TARGET=gen3 wcc-self-hosting
+
+.PHONY: wcc-diff-gen23
+wcc-diff-gen23:	wcc-gen2 wcc-gen3
+	diff -b cc.wasm gen3cc.wasm
+
+.PHONY: wcc-self-hosting
+wcc-self-hosting:	$(WCC_TARGET)cc.wasm
+
+.PHONY: test-wcc-self-hosting
+test-wcc-self-hosting:
+	$(MAKE) WCC="$(TARGET_CC)" -C tests test-wcc
+
+WCC_LIBS:=$(LIBSRC_DIR)/_wasm/crt0.c $(LIBSRC_DIR)/_wasm/libc.c
+
+$(WCC_TARGET)cc.wasm:	$(WCC_SRCS) $(WCC_LIBS)
+	$(HOST_CC) -o $@ \
+		-I$(CC1_DIR) -I$(CPP_DIR) -I$(UTIL_DIR) \
+		$(WCC_SRCS)
+
+#### www
+
+ASSETS_DIR:=public
+
+.PHONY:	assets
+assets:	wcc-gen2 $(ASSETS_DIR)/cc.wasm $(ASSETS_DIR)/libs.json
+
+$(ASSETS_DIR)/cc.wasm:	cc.wasm
+	mkdir -p $(ASSETS_DIR)
+	cp cc.wasm $@
+
+$(ASSETS_DIR)/libs.json:	$(WCC_DIR)/www/lib_list.json
+	mkdir -p $(ASSETS_DIR)
+	node tool/pack_libs.js $(WCC_DIR)/www/lib_list.json > $@
+
+.PHONY: update-wcc-lib
+update-wcc-lib:
+	find libsrc/* -type d \
+		| egrep -v \(crt0\|math\|_wasm\) \
+		| while read d; do \
+			ls -1 $$d/*.c; \
+		  done \
+		| sed -e 's/libsrc/../g' \
+		| sort \
+		| awk '{print "#include \"" $$0 "\""}' \
+		> libsrc/_wasm/libc.c
+	npx ts-node tool/update_lib_list.ts
+
+.PHONY: release-wcc
+release-wcc:	assets
+	npm run release
+
+
 ### Debug
 
 DEBUG_CFLAGS:=$(subst -MMD,,$(CFLAGS))

.gitignore

@@ -70,7 +70,65 @@ C compiler:
 
 ### WebAssembly
 
-[WCC](https://github.com/tyfkda/xcc/blob/main/wasm/README.md): Compile C to WebAssembly.
+Compile C to WebAssembly.
+
+[Online demo](https://tyfkda.github.io/xcc/)
+
+#### Requirements
+
+#### Build
+
+Requirements:
+
+  * node.js (>=16), npm
+
+Setup:
+
+```sh
+$ npm install
+```
+
+Build:
+
+```sh
+$ make wcc
+```
+
+Generated files:
+
+  * `wcc`: Compiler entry
+
+#### Usage
+
+Compile:
+
+```sh
+$ ./wcc -o hello.wasm examples/hello.c
+```
+
+Command line options:
+
+  * `-o <filename>`: Set output filename (default: `a.wasm`)
+  * `-I <path>`:     Add include path
+  * `-D <label>(=value)`:  Define macro
+  * `-entry-point=func_name`:  Specify entry point (default: _start)
+  * `-e func_name,...`:  Export function names (comma separated)
+  * `--stack-size=<size>`:  Set stack size (default: 8192)
+  * `-nodefaultlibs`:  Ignore libc
+  * `-nostdlib`:  Ignore libc and crt0
+  * `--verbose`:  Output debug information
+
+#### Run
+
+```sh
+$ node tool/runwasm.js hello.wasm
+Hello, world!
+```
+
+#### Missing features
+
+  * `goto` statement
+  * `setjmp`
 
 
 ### Reference

Makefile

@@ -28,11 +28,11 @@ import del from 'del'
 const ROOT_DIR = `${__dirname}`
 const DEST_DIR = `${ROOT_DIR}/public`
 const ASSETS_DIR = `${DEST_DIR}`
-const SRC_TS_DIR = `${ROOT_DIR}/src/www`
+const SRC_TS_DIR = `${ROOT_DIR}/src/wcc/www`
 const SRC_TS_FILES = `${SRC_TS_DIR}/**/*.ts`
-const SRC_HTML_DIR = `${ROOT_DIR}/src/www`
+const SRC_HTML_DIR = `${ROOT_DIR}/src/wcc/www`
 const SRC_HTML_FILES = `${SRC_HTML_DIR}/*.html`
-const SRC_SASS_FILES = `${ROOT_DIR}/src/www/**/*.scss`
+const SRC_SASS_FILES = `${ROOT_DIR}/src/wcc/www/**/*.scss`
 const SRC_TEST_DIR = `${ROOT_DIR}/test`
 const SRC_TEST_FILES = `${SRC_TEST_DIR}/**/*.spec.ts`
 const RELEASE_DIR = `${ROOT_DIR}/release`

README.md

@@ -0,0 +1,95 @@
+#include "../misc/basename.c"
+#include "../misc/dirname.c"
+#include "../misc/errno.c"
+#include "../misc/isalnum.c"
+#include "../misc/isalpha.c"
+#include "../misc/isdigit.c"
+#include "../misc/isspace.c"
+#include "../misc/isxdigit.c"
+#include "../misc/longjmp.c"
+#include "../misc/rng_xor64.c"
+#include "../misc/setjmp.c"
+#include "../misc/tolower.c"
+#include "../misc/toupper.c"
+#include "../stdio/assert.c"
+#include "../stdio/fclose.c"
+#include "../stdio/fdopen.c"
+#include "../stdio/fflush.c"
+#include "../stdio/fgetc.c"
+#include "../stdio/fgets.c"
+#include "../stdio/fileno.c"
+#include "../stdio/fopen.c"
+#include "../stdio/fprintf.c"
+#include "../stdio/fputc.c"
+#include "../stdio/fputs.c"
+#include "../stdio/fread.c"
+#include "../stdio/fseek.c"
+#include "../stdio/ftell.c"
+#include "../stdio/fwrite.c"
+#include "../stdio/getc.c"
+#include "../stdio/getchar.c"
+#include "../stdio/getline.c"
+#include "../stdio/perror.c"
+#include "../stdio/printf.c"
+#include "../stdio/puts.c"
+#include "../stdio/remove.c"
+#include "../stdio/snprintf.c"
+#include "../stdio/sprintf.c"
+#include "../stdio/stdin.c"
+#include "../stdio/tmpfile.c"
+#include "../stdio/vfprintf.c"
+#include "../stdio/vprintf.c"
+#include "../stdio/vsnprintf.c"
+#include "../stdio/vsprintf.c"
+#include "../stdlib/atoi.c"
+#include "../stdlib/calloc.c"
+#include "../stdlib/drand48.c"
+#include "../stdlib/erand48.c"
+#include "../stdlib/exit.c"
+#include "../stdlib/malloc.c"
+#include "../stdlib/mkstemp.c"
+#include "../stdlib/mkstemps.c"
+#include "../stdlib/qsort.c"
+#include "../stdlib/realloc.c"
+#include "../stdlib/strtod.c"
+#include "../stdlib/strtol.c"
+#include "../stdlib/strtoul.c"
+#include "../string/memchr.c"
+#include "../string/memcmp.c"
+#include "../string/memcpy.c"
+#include "../string/memmove.c"
+#include "../string/memset.c"
+#include "../string/strcasecmp.c"
+#include "../string/strcat.c"
+#include "../string/strchr.c"
+#include "../string/strcmp.c"
+#include "../string/strcpy.c"
+#include "../string/strdup.c"
+#include "../string/strlen.c"
+#include "../string/strncasecmp.c"
+#include "../string/strncat.c"
+#include "../string/strncmp.c"
+#include "../string/strncpy.c"
+#include "../string/strndup.c"
+#include "../string/strrchr.c"
+#include "../string/strstr.c"
+#include "../unistd/brk.c"
+#include "../unistd/chmod.c"
+#include "../unistd/close.c"
+#include "../unistd/dup.c"
+#include "../unistd/execve.c"
+#include "../unistd/execvp.c"
+#include "../unistd/fork.c"
+#include "../unistd/getcwd.c"
+#include "../unistd/getrandom.c"
+#include "../unistd/ioctl.c"
+#include "../unistd/isatty.c"
+#include "../unistd/kill.c"
+#include "../unistd/lseek.c"
+#include "../unistd/open.c"
+#include "../unistd/pipe.c"
+#include "../unistd/read.c"
+#include "../unistd/unlink.c"
+#include "../unistd/wait4.c"
+#include "../unistd/waitpid.c"
+#include "../unistd/write.c"

wasm/gulpfile.babel.js gulpfile.babel.js

@@ -902,7 +902,6 @@ int main(int argc, char *argv[]) {
   define_macro("__ILP32__");
   define_macro("__WASM");
   add_system_inc_path(cat_path(root, "include"));
-  add_system_inc_path(cat_path(root, "../include"));
 
   init_compiler();
 
@@ -1074,7 +1073,7 @@ int main(int argc, char *argv[]) {
 
   // if (out_type >= OutExecutable)
   {
-    vec_push(lib_paths, cat_path(root, "./lib"));
+    vec_push(lib_paths, cat_path(root, "./libsrc/_wasm"));
     if (!nostdlib)
       add_lib(lib_paths, "crt0.c", sources);
     if (!nodefaultlibs && !nostdlib)

wasm/lib/crt0.c libsrc/_wasm/crt0.c

@@ -7,7 +7,7 @@
     <meta name="twitter:site" content="@tyfkda">
     <meta name="twitter:title" content="C-compiler on a browser">
     <meta name="twitter:description" content="You can edit, compile and run C code on your browser!">
-    <meta name="twitter:image" content="https://raw.githubusercontent.com/tyfkda/xcc/main/wasm/wcc.png">
+    <meta name="twitter:image" content="https://raw.githubusercontent.com/tyfkda/xcc/main/wcc.png">
     <meta name="twitter:player:height" content="512">
     <meta name="twitter:player:width" content="400">
     <title>C-compiler on WASM</title>