Update SAIL and RISCOF test repos. Recompile SAIL.

cr1901 · Jan 14, 2025 · 2c1d769 · 2c1d769
1 parent 11f970d
commit 2c1d769
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/doc/development/testing.md b/doc/development/testing.md
@@ -525,12 +525,17 @@ opam switch create create ocaml-base-compiler.4.08.1
 opam install sail -y
 ```
 
-Then, to actually _rebuild_ the SAIL RISC-V emulators in a _hopefully_ turnkey
+Then, to actually _(re)build_ the SAIL RISC-V emulators in a _hopefully_ turnkey
 fashion, run `pdm doit _build_sail`. As with other `doit` tasks, this should
 not be relied upon for normal development. Note that the actual build requires
 `make`; `opam` only handles installing dependencies, and delegates to `make`
 for building.
 
+```{hint}
+You will probably want to run `pdm doit forget _decompress_sail` afterwards,
+so that your fresh new SAIL emulator replaces the old one :).
+```
+
 ```{todo}
 It'd be nice to remove the immediate dependency on `make`. Since we don't want
 to _install_ the emulators in the system, it should be in principle possible to

diff --git a/dodo.py b/dodo.py
@@ -209,7 +209,8 @@ def opam_vars():  # noqa: D103
             continue
         tmp = var.split("=")
         k, v = tmp
-        vars[k] = v
+        # I don't remember needing this at the end of 2023...
+        vars[k] = v.strip("'")
 
     return {"env": vars}
 

diff --git a/tests/riscof/bin/riscv_sim_RV32.gz b/tests/riscof/bin/riscv_sim_RV32.gz
diff --git a/tests/riscof/riscv-arch-test b/tests/riscof/riscv-arch-test
diff --git a/tests/riscof/sail-riscv b/tests/riscof/sail-riscv