resolve comments

Author: celinehoang177

Makefile

@@ -19,7 +19,7 @@ LINDFS_DIRS := \
 	       var/run
 
 .PHONY: build 
-build: sysroot lind-boot lindfs
+build: generate-syscall-mappings sysroot lind-boot lindfs
 	@echo "Build complete"
 
 .PHONY: all
@@ -66,6 +66,10 @@ build_glibc:
 build-dir:
 	mkdir -p $(BUILD_DIR)
 
+.PHONY: generate-syscall-mappings
+generate-syscall-mappings: build-dir
+	python3 scripts/generate_syscall_mappings.py
+
 .PHONY: sync-sysroot
 sync-sysroot:
 	$(RM) -r $(SYSROOT_DIR)

docs/contribute/toolchain.md

@@ -35,7 +35,19 @@ options.
     Matching builtins are available in the *lind-wasm* repo under
     [`src/glibc/wasi`](https://github.com/Lind-Project/lind-wasm/tree/main/src/glibc/wasi).
 
-3. __Build *glibc* and generate sysroot__ (see [`make sysroot`](https://github.com/Lind-Project/lind-wasm/blob/main/Makefile))
+3. __Generate syscall mappings__ (see [`make generate-syscall-mappings`](https://github.com/Lind-Project/lind-wasm/blob/main/Makefile))
+
+    Auto-generates syscall mapping constants from `src/glibc/lind_syscall/lind_syscall_num.h` 
+    and produces `src/sysdefs/src/constants/syscall_const.rs`. This must run before building *glibc* 
+    and *wasmtime* to ensure Rust code has the correct syscall definitions.
+
+    ```bash
+    python3 scripts/generate_syscall_mappings.py
+    ```
+
+    The source of truth is the Linux x86_64 syscall table as defined in the *glibc* header file.
+
+4. __Build *glibc* and generate sysroot__ (see [`make sysroot`](https://github.com/Lind-Project/lind-wasm/blob/main/Makefile))
     1. Configure and compile *glibc* for the *WASI* target with *Clang*
 
     2. Compile extra files:
@@ -51,7 +63,7 @@ options.
         along with headers and a pre-built C runtime into a
         sysroot directory structure as required by *Clang*.
 
-4. __Build custom wasmtime__ (see [`make wasmtime`](https://github.com/Lind-Project/lind-wasm/blob/main/Makefile))
+5. __Build custom wasmtime__ (see [`make wasmtime`](https://github.com/Lind-Project/lind-wasm/blob/main/Makefile))
 
       Builds `src/wasmtime` workspace. Custom dependencies `fdtables`, `RawPOSIX`
       and `sysdefs` are included in the build automatically.

scripts/generate_syscall_mappings.py

@@ -2,8 +2,9 @@
 # Auto-generates syscall mapping constants for lind-wasm.
 #
 # Reads syscall definitions from glibc's lind_syscall_num.h and generates:
-#  - src/sysdefs/src/constants/syscall_const.rs (full set)
-#  - src/wasmtime/crates/lind-utils/src/lind_syscall_numbers.rs (minimal set)
+#  - src/sysdefs/src/constants/syscall_const.rs (full set of syscalls)
+#
+# This script should be run before building lind-boot and glibc.
 #
 # Source of truth: src/glibc/lind_syscall/lind_syscall_num.h
 
@@ -62,37 +63,7 @@ def generate_rust_constants(syscalls: dict[str, int]) -> str:
     return "\n".join(lines)
 
 
-def get_minimal_syscalls() -> dict[str, int]:
-    """Return the minimal set of syscalls needed by Wasmtime runtime."""
-    return {
-        'MMAP_SYSCALL': 9,
-        'CLONE_SYSCALL': 56,
-        'FORK_SYSCALL': 57,
-        'EXEC_SYSCALL': 59,
-        'EXIT_SYSCALL': 60,
-        'EXIT_GROUP_SYSCALL': 231,
-    }
-
-
-def generate_wasmtime_minimal(minimal: dict[str, int]) -> str:
-    """Generate minimal Rust constants for wasmtime lind_syscall_numbers.rs."""
-    lines = [
-        "// Minimal set of syscall numbers used by Wasmtime side for Lind",
-        "// Keeps the runtime minimal and the rawposix dispatcher handles the rest",
-        "// Source of truth: Linux x86_64 syscall table",
-        "//   https://github.com/torvalds/linux/blob/v6.16-rc1/arch/x86/entry/syscalls/syscall_64.tbl",
-        "// (Historical overview: https://filippo.io/linux-syscall-table/)",
-        "// Keep these in sync with glibc's lind_syscall_num.h and RawPOSIX dispatcher",
-    ]
-
-    # Sort by syscall number
-    sorted_syscalls = sorted(minimal.items(), key=lambda x: x[1])
-
-    for name, number in sorted_syscalls:
-        lines.append(f"pub const {name}: i32 = {number};")
 
-    lines.append("")
-    return "\n".join(lines)
 
 
 def write_file(path: str, content: str) -> None:
@@ -104,31 +75,24 @@ def write_file(path: str, content: str) -> None:
 
 
 def main() -> None:
-    """Generate all syscall mapping files."""
+    """Generate syscall mapping constants from glibc header."""
     # Find workspace root (should be run from lind-wasm directory)
     workspace_root = Path(__file__).parent.parent
 
     c_header = workspace_root / "src/glibc/lind_syscall/lind_syscall_num.h"
     rust_sysdefs_out = workspace_root / "src/sysdefs/src/constants/syscall_const.rs"
-    rust_wasmtime_out = workspace_root / "src/wasmtime/crates/lind-utils/src/lind_syscall_numbers.rs"
 
     print("Parsing syscall definitions...")
     syscalls = parse_c_header(str(c_header))
     print(f"Found {len(syscalls)} syscall definitions")
 
-    # Generate full Rust constants for sysdefs
+    # Generate Rust constants for sysdefs
     print("\nGenerating sysdefs constants...")
     rust_content = generate_rust_constants(syscalls)
     write_file(str(rust_sysdefs_out), rust_content)
 
-    # Generate minimal constants for wasmtime
-    print("Generating wasmtime minimal constants...")
-    minimal = get_minimal_syscalls()
-    wasmtime_content = generate_wasmtime_minimal(minimal)
-    write_file(str(rust_wasmtime_out), wasmtime_content)
-
-    print("\nDone!")
+    print("Done!")
 
 
 if __name__ == "__main__":
-    main()
+    main()