Miscellaneous changes

- cycle_per_step is hooked by build variable CYCLE_PER_STEP, so
  hard-coded is not needed.
- emscripten_cancel_main_loop is done in src/emulate.c, so show the
  terminating log at there too.
- Drop redundant WASM assets.
- Add ignore list and apply Black formatter for
  tools/gen-elf-list-js.py.

Author: ChinYikMing

assets/html/index.html

@@ -6,8 +6,8 @@ WEB_JS_RESOURCES := $(ASSETS)/js
 EXPORTED_FUNCS := _main,_indirect_rv_halt
 DEMO_DIR := demo
 WEB_FILES := $(BIN).js \
-	     $(BIN).wasm \
-	     $(BIN).worker.js \
+             $(BIN).wasm \
+             $(BIN).worker.js \
              $(OUT)/elf_list.js
 
 ifeq ("$(CC_IS_EMCC)", "1")

assets/js/coi-serviceworker.min.js

@@ -1175,6 +1175,7 @@ void rv_step(void *arg)
     if (rv_has_halted(rv)) {
         emscripten_cancel_main_loop();
         rv_delete(rv); /* clean up and reuse memory */
+        rv_log_info("RISC-V emulator is destroyed");
     }
 #endif
 }

assets/js/pre.js

@@ -615,7 +615,6 @@ void rv_run(riscv_t *rv)
            attr->data.user.elf_program
 #endif
     );
-    attr->cycle_per_step = 100000000;
 
     if (!(attr->run_flag & (RV_RUN_TRACE | RV_RUN_GDBSTUB))) {
 #ifdef __EMSCRIPTEN__

mk/wasm.mk

@@ -1,33 +1,58 @@
 #!/usr/bin/env python3
 
+# Formatted by black: https://github.com/psf/black
+
 import os
 
-def list_files(d):
+
+def list_files(d, ignore_list=None):
+    if ignore_list is None:
+        ignore_list = []
     try:
         if d == "build":
-            files = [f for f in os.listdir(d) if (os.path.isfile(os.path.join(d, f)) and f.endswith('.elf'))]
+            files = [
+                f
+                for f in os.listdir(d)
+                if os.path.isfile(os.path.join(d, f))
+                and f.endswith(".elf")
+                and not any(f.endswith(ign) or f.startswith(ign) for ign in ignore_list)
+            ]
         else:
             parent_dir = os.path.dirname(d)
             files = [
                 os.path.relpath(os.path.join(d, f), start=parent_dir)
                 for f in os.listdir(d)
                 if os.path.isfile(os.path.join(d, f))
+                and not any(
+                    f.endswith(ign) or os.path.join(d, f).endswith(ign)
+                    for ign in ignore_list
+                )
             ]
         return files
     except FileNotFoundError:
-        print(f"Directory {directory} not found.")
+        print(f"Directory {d} not found.")
         return []
 
+
 elf_exec_dirs = ["build", "build/riscv32"]
+msg_less_ignore_files = [
+    "cc.elf",
+    "chacha20.elf",
+    "riscv32/lena",
+    "riscv32/puzzle",
+    "riscv32/line",
+    "riscv32/captcha",
+]  # List of files to ignore
 elf_exec_list = []
 
 for d in elf_exec_dirs:
-    files = list_files(d)
+    files = list_files(d, ignore_list=msg_less_ignore_files)
     elf_exec_list.extend(files)
-#print(elf_exec_list)
+
 
 def gen_elf_list_js():
     js_code = f"const elfFiles = {elf_exec_list};\n"
     print(js_code)
 
+
 gen_elf_list_js()