diff options
| -rw-r--r-- | anc/dummy/0123.asm | 4 | ||||
| -rw-r--r-- | anc/null/0123.asm | 4 | ||||
| -rw-r--r-- | arch/null/arch.c (renamed from arch/dummy/arch.c) | 0 | ||||
| -rw-r--r-- | arch/null/plots.cpp (renamed from arch/dummy/plots.cpp) | 0 | ||||
| -rw-r--r-- | arch/null/vars.py (renamed from arch/dummy/vars.py) | 2 | ||||
| -rwxr-xr-x | salis.py | 2 | ||||
| -rw-r--r-- | test/test_build.py | 16 |
7 files changed, 14 insertions, 14 deletions
diff --git a/anc/dummy/0123.asm b/anc/dummy/0123.asm deleted file mode 100644 index d52a6a6..0000000 --- a/anc/dummy/0123.asm +++ /dev/null @@ -1,4 +0,0 @@ -dummy 00 -dummy 01 -dummy 02 -dummy 03 diff --git a/anc/null/0123.asm b/anc/null/0123.asm new file mode 100644 index 0000000..396e572 --- /dev/null +++ b/anc/null/0123.asm @@ -0,0 +1,4 @@ +null 00 +null 01 +null 02 +null 03 diff --git a/arch/dummy/arch.c b/arch/null/arch.c index 1fcfbc3..1fcfbc3 100644 --- a/arch/dummy/arch.c +++ b/arch/null/arch.c diff --git a/arch/dummy/plots.cpp b/arch/null/plots.cpp index 8cece2f..8cece2f 100644 --- a/arch/dummy/plots.cpp +++ b/arch/null/plots.cpp diff --git a/arch/dummy/vars.py b/arch/null/vars.py index fce888a..edc5b66 100644 --- a/arch/dummy/vars.py +++ b/arch/null/vars.py @@ -1,4 +1,4 @@ -inst_set = [(["dummy", f"{i:02x}"], symbol) for i, symbol in enumerate( +inst_set = [(["null", f"{i:02x}"], symbol) for i, symbol in enumerate( "⠀⠁⠂⠃⠄⠅⠆⠇⡀⡁⡂⡃⡄⡅⡆⡇⠈⠉⠊⠋⠌⠍⠎⠏⡈⡉⡊⡋⡌⡍⡎⡏⠐⠑⠒⠓⠔⠕⠖⠗⡐⡑⡒⡓⡔⡕⡖⡗⠘⠙⠚⠛⠜⠝⠞⠟⡘⡙⡚⡛⡜⡝⡞⡟" "⠠⠡⠢⠣⠤⠥⠦⠧⡠⡡⡢⡣⡤⡥⡦⡧⠨⠩⠪⠫⠬⠭⠮⠯⡨⡩⡪⡫⡬⡭⡮⡯⠰⠱⠲⠳⠴⠵⠶⠷⡰⡱⡲⡳⡴⡵⡶⡷⠸⠹⠺⠻⠼⠽⠾⠿⡸⡹⡺⡻⡼⡽⡾⡿" "⢀⢁⢂⢃⢄⢅⢆⢇⣀⣁⣂⣃⣄⣅⣆⣇⢈⢉⢊⢋⢌⢍⢎⢏⣈⣉⣊⣋⣌⣍⣎⣏⢐⢑⢒⢓⢔⢕⢖⢗⣐⣑⣒⣓⣔⣕⣖⣗⢘⢙⢚⢛⢜⢝⢞⢟⣘⣙⣚⣛⣜⣝⣞⣟" @@ -92,7 +92,7 @@ options = { (("u", "ui"), (new, load), fmt_id): {"metavar": "UI", "help": "user interface", "default": "curses", "required": False, "type": str}, (("U", "ui-path"), (new, load), fmt_id): {"metavar": "PATH", "help": "path to search for UIs", "default": "ui", "required": False, "type": str}, (("v", "no-vsync"), (client,), fmt_id): {"action": "store_true", "help": "disable vsync", "required": False}, - (("v", "vm-arch"), (new,), fmt_id): {"metavar": "ARCH", "help": "VM architecture", "default": "dummy", "required": False, "type": str}, + (("v", "vm-arch"), (new,), fmt_id): {"metavar": "ARCH", "help": "VM architecture", "default": "null", "required": False, "type": str}, (("x", "cpp-compiler"), (client,), fmt_id): {"metavar": "CXX", "help": "C++ compiler to use", "default": "g++", "required": False, "type": str}, (("X", "cpp-compiler-flags"), (client,), fmt_id): {"metavar": "FLAGS", "help": "base set of flags to pass to C++ compiler", "default": "-Wall -Wextra -Werror -pedantic -std=c++20 -lstdc++", "required": False, "type": str}, (("y", "sync-pow"), (new,), fmt_id): {"metavar": "POW", "help": "core sync interval exponent; sync events occur every N steps, where N = 2^{POW}", "default": 20, "required": False, "type": pos}, diff --git a/test/test_build.py b/test/test_build.py index e0fecef..a57c09d 100644 --- a/test/test_build.py +++ b/test/test_build.py @@ -12,8 +12,8 @@ class TestBuild(SalisTest): for ui in ["curses", "daemon"] ) - def cmds_new_dummy(self): - return self.cmds_new("0123", "dummy") + def cmds_new_null(self): + return self.cmds_new("0123", "null") def cmds_new_v1(self): return self.cmds_new("55a", "v1") @@ -41,16 +41,16 @@ class TestBuild(SalisTest): for optimized in ["", "-o"] ) - def test_dummy_new(self): - for cmd in self.cmds_new_dummy(): + def test_null_new(self): + for cmd in self.cmds_new_null(): SalisTest.run_subprocess(cmd) def test_v1_new(self): for cmd in self.cmds_new_v1(): SalisTest.run_subprocess(cmd) - def test_dummy_load(self): - SalisTest.run_subprocess(next(self.cmds_new_dummy())) + def test_null_load(self): + SalisTest.run_subprocess(next(self.cmds_new_null())) for cmd in self.cmds_load(): SalisTest.run_subprocess(cmd) @@ -62,12 +62,12 @@ class TestBuild(SalisTest): SalisTest.run_subprocess(cmd) def test_server(self): - SalisTest.run_subprocess(next(self.cmds_new_dummy())) + SalisTest.run_subprocess(next(self.cmds_new_null())) for cmd in self.cmds_server(): SalisTest.run_subprocess(cmd) - @SalisTest.run_ui_test(anc="0123", anc_path="anc", name="def.sim", ui="null", ui_path="test/ui", vm_arch="dummy") + @SalisTest.run_ui_test(anc="0123", anc_path="anc", name="def.sim", ui="null", ui_path="test/ui", vm_arch="null") def test_client(self): with SalisTest.run_pipe(f"./salis.py server -H{self.tempdir.name}") as server_proc: for line in server_proc.stdout: |