Bring wasm service up

After merging #474, multiple executables were moved to other location
(build/riscv32), which caused the wasm service to fail. The intuitive
solution is to embed build/riscv32 into the wasm. Also, executables that
stored in rv32emu-prebuilt must be pulled before embedding into wasm, so
emcc_deps should depend on the artifact target.

Additionally, the Makefile's distclean target does not fully clean wasm
artifacts, as CC=emcc might not be set during make distclean. To fix
this, the declaration of the WEB_FILES and DEMO_DIR wasm-related
variables has been reordered.

Related: #486

Author: ChinYikMing

assets/html/index.html

@@ -136,32 +136,32 @@
       var spinnerElement = document.getElementById('spinner');
 
       var elfFiles = [
-        "doom.elf",
+        "riscv32/doom",
         "smolnes.elf",
-        "quake.elf",
-        "coremark.elf",
-        "dhrystone.elf",
-        "pi.elf",
-        "donut.elf",
-        "aes.elf",
+        "riscv32/quake",
+        "riscv32/coremark",
+        "riscv32/dhrystone",
+        "riscv32/pi",
+        "riscv32/donut",
+        "riscv32/aes",
         "coro.elf",
-        "fcalc.elf",
-        "hamilton.elf",
+        "riscv32/fcalc",
+        "riscv32/hamilton",
         "hello.elf",
         "ieee754.elf",
         "jit-bf.elf",
-        "maj2random.elf",
-        "mandelbrot.elf",
-        "nqueens.elf",
-        "nyancat.elf",
+        "riscv32/maj2random",
+        "riscv32/mandelbrot",
+        "riscv32/nqueens",
+        "riscv32/nyancat",
         "perfcount.elf",
-        "qrcode.elf",
+        "riscv32/qrcode",
         "readelf.elf",
-        "richards.elf",
-        "rvsim.elf",
-        "scimark2.elf",
-        "spirograph.elf",
-        "stream.elf",
+        "riscv32/richards",
+        "riscv32/rvsim",
+        "riscv32/scimark2",
+        "riscv32/spirograph",
+        "riscv32/stream",
       ];
 
       var runButton = document.getElementById("runButton");

mk/wasm.mk

@@ -1,14 +1,15 @@
 CFLAGS_emcc ?=
-deps_emcc :=
+deps_emcc := artifact
 ASSETS := assets
 WEB_HTML_RESOURCES := $(ASSETS)/html
 WEB_JS_RESOURCES := $(ASSETS)/js
 EXPORTED_FUNCS := _main,_indirect_rv_halt
-
-ifeq ("$(CC_IS_EMCC)", "1")
+DEMO_DIR := demo
 WEB_FILES := $(BIN).js \
 	     $(BIN).wasm \
 	     $(BIN).worker.js
+
+ifeq ("$(CC_IS_EMCC)", "1")
 BIN := $(BIN).js
 
 # TCO
@@ -28,6 +29,7 @@ CFLAGS_emcc += -sINITIAL_MEMORY=2GB \
 	       -sSTACK_SIZE=4MB \
 	       -sPTHREAD_POOL_SIZE=navigator.hardwareConcurrency \
 	       --embed-file build@/ \
+	       --embed-file build/riscv32@/riscv32 \
 	       --embed-file build/timidity@/etc/timidity \
 	       -DMEM_SIZE=0x40000000 \
 	       -DCYCLE_PER_STEP=2000000 \
@@ -77,7 +79,6 @@ else
 endif
 
 # used to serve wasm locally
-DEMO_DIR := demo
 DEMO_IP := 127.0.0.1
 DEMO_PORT := 8000