diff options
| author | Wojciech Kosior <kwojtus@protonmail.com> | 2020-09-03 20:22:41 +0200 |
|---|---|---|
| committer | Wojciech Kosior <kwojtus@protonmail.com> | 2020-09-03 20:22:41 +0200 |
| commit | efd0269b55e2db03f5c12d6f47b00b0c2a57ff66 (patch) | |
| tree | d5715c26f8a7b935baea0af6558f9d415e110f21 | |
| parent | 43f4e586acf76f3ec08d5892ba784ba6ac5d1932 (diff) | |
| download | AGH-engineering-thesis-efd0269b55e2db03f5c12d6f47b00b0c2a57ff66.tar.gz AGH-engineering-thesis-efd0269b55e2db03f5c12d6f47b00b0c2a57ff66.zip | |
rename stack_machine to stack_machine_old (prepare for redesign of the machine)
46 files changed, 18 insertions, 17 deletions
@@ -19,7 +19,7 @@ MACROASM_FLAGS := -Iinclude/ -E # It made sense to just list all of those in this variable # and then prepend stack_machine_ to each element -STACK_MACHINE_TESTS := \ +STACK_MACHINE_OLD_TESTS := \ store \ load_store \ multiinstructions_load_store \ @@ -41,7 +41,7 @@ TESTS := \ sram_slave \ embedded_bram_slave \ soc_simple_display \ - $(addprefix stack_machine_,$(STACK_MACHINE_TESTS)) + $(addprefix stack_machine_old_,$(STACK_MACHINE_OLD_TESTS)) # For each of these Makefile will attempt to generate VGAdump.ppm # and compare it to VGAdump_expected.ppm inside that test's directory @@ -141,10 +141,11 @@ tests/vga/test.vvp : tests/vga/test.v design/vga.v models/vga_display.v \ include/messages.vh $(IV) $(IVFLAGS) -s vga_test $^ -o $@ -tests/stack_machine_%/test.vvp : tests/stack_machine_%/words_to_verify.mem \ - tests/stack_machine_%/instructions.mem \ - tests/stack_machine_%/test.v models/slave.v \ - design/stack_machine.v design/div.v include/messages.vh +tests/stack_machine_old_%/test.vvp : \ + tests/stack_machine_old_%/words_to_verify.mem \ + tests/stack_machine_old_%/instructions.mem \ + tests/stack_machine_old_%/test.v models/slave.v \ + design/stack_machine_old.v design/div.v include/messages.vh $(IV) $(IVFLAGS) -s stack_machine_test \ -DINSTRUCTIONS_COUNT=$(call FILE_LINES,$(filter %ions.mem,$^)) \ -DWORDS_TO_VERIFY_COUNT=$(call FILE_LINES,$<) \ diff --git a/design/stack_machine.v b/design/stack_machine_old.v index d466cc8..d466cc8 100644 --- a/design/stack_machine.v +++ b/design/stack_machine_old.v diff --git a/tests/stack_machine_add/test.v b/tests/stack_machine_add/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_add/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_cond_jump/test.v b/tests/stack_machine_cond_jump/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_cond_jump/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_div/test.v b/tests/stack_machine_div/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_div/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_jump/test.v b/tests/stack_machine_jump/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_jump/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_load_store/test.v b/tests/stack_machine_load_store/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_load_store/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_mul/test.v b/tests/stack_machine_mul/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_mul/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_multiinstructions_load_store/test.v b/tests/stack_machine_multiinstructions_load_store/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_multiinstructions_load_store/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_multiinstructions_load_store/words_to_verify.mem b/tests/stack_machine_multiinstructions_load_store/words_to_verify.mem deleted file mode 120000 index b2e490b..0000000 --- a/tests/stack_machine_multiinstructions_load_store/words_to_verify.mem +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_load_store/words_to_verify.mem
\ No newline at end of file diff --git a/tests/stack_machine_add/instructions.s.tcl b/tests/stack_machine_old_add/instructions.s.tcl index c3cfe4d..c3cfe4d 100755 --- a/tests/stack_machine_add/instructions.s.tcl +++ b/tests/stack_machine_old_add/instructions.s.tcl diff --git a/tests/stack_machine_old_add/test.v b/tests/stack_machine_old_add/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_add/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_add/words_to_verify.mem b/tests/stack_machine_old_add/words_to_verify.mem index db077bc..db077bc 100644 --- a/tests/stack_machine_add/words_to_verify.mem +++ b/tests/stack_machine_old_add/words_to_verify.mem diff --git a/tests/stack_machine_cond_jump/instructions.s.tcl b/tests/stack_machine_old_cond_jump/instructions.s.tcl index 467a719..467a719 100755 --- a/tests/stack_machine_cond_jump/instructions.s.tcl +++ b/tests/stack_machine_old_cond_jump/instructions.s.tcl diff --git a/tests/stack_machine_old_cond_jump/test.v b/tests/stack_machine_old_cond_jump/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_cond_jump/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_cond_jump/words_to_verify.mem b/tests/stack_machine_old_cond_jump/words_to_verify.mem index 4b77b8a..4b77b8a 100644 --- a/tests/stack_machine_cond_jump/words_to_verify.mem +++ b/tests/stack_machine_old_cond_jump/words_to_verify.mem diff --git a/tests/stack_machine_div/instructions.s.tcl b/tests/stack_machine_old_div/instructions.s.tcl index e2d55dc..e2d55dc 100755 --- a/tests/stack_machine_div/instructions.s.tcl +++ b/tests/stack_machine_old_div/instructions.s.tcl diff --git a/tests/stack_machine_old_div/test.v b/tests/stack_machine_old_div/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_div/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_div/words_to_verify.mem b/tests/stack_machine_old_div/words_to_verify.mem index 8543226..8543226 100644 --- a/tests/stack_machine_div/words_to_verify.mem +++ b/tests/stack_machine_old_div/words_to_verify.mem diff --git a/tests/stack_machine_jump/instructions.s.tcl b/tests/stack_machine_old_jump/instructions.s.tcl index f681fc9..f681fc9 100755 --- a/tests/stack_machine_jump/instructions.s.tcl +++ b/tests/stack_machine_old_jump/instructions.s.tcl diff --git a/tests/stack_machine_old_jump/test.v b/tests/stack_machine_old_jump/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_jump/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_jump/words_to_verify.mem b/tests/stack_machine_old_jump/words_to_verify.mem index 4fded2b..4fded2b 100644 --- a/tests/stack_machine_jump/words_to_verify.mem +++ b/tests/stack_machine_old_jump/words_to_verify.mem diff --git a/tests/stack_machine_load_store/instructions.s.tcl b/tests/stack_machine_old_load_store/instructions.s.tcl index 13cabcb..13cabcb 100755 --- a/tests/stack_machine_load_store/instructions.s.tcl +++ b/tests/stack_machine_old_load_store/instructions.s.tcl diff --git a/tests/stack_machine_old_load_store/test.v b/tests/stack_machine_old_load_store/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_load_store/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_load_store/words_to_verify.mem b/tests/stack_machine_old_load_store/words_to_verify.mem index 349b213..349b213 100644 --- a/tests/stack_machine_load_store/words_to_verify.mem +++ b/tests/stack_machine_old_load_store/words_to_verify.mem diff --git a/tests/stack_machine_mul/instructions.s.tcl b/tests/stack_machine_old_mul/instructions.s.tcl index 8473aef..8473aef 100755 --- a/tests/stack_machine_mul/instructions.s.tcl +++ b/tests/stack_machine_old_mul/instructions.s.tcl diff --git a/tests/stack_machine_old_mul/test.v b/tests/stack_machine_old_mul/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_mul/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_mul/words_to_verify.mem b/tests/stack_machine_old_mul/words_to_verify.mem index 3095d6e..3095d6e 100644 --- a/tests/stack_machine_mul/words_to_verify.mem +++ b/tests/stack_machine_old_mul/words_to_verify.mem diff --git a/tests/stack_machine_multiinstructions_load_store/instructions.s.tcl b/tests/stack_machine_old_multiinstructions_load_store/instructions.s.tcl index 58792d3..58792d3 100755 --- a/tests/stack_machine_multiinstructions_load_store/instructions.s.tcl +++ b/tests/stack_machine_old_multiinstructions_load_store/instructions.s.tcl diff --git a/tests/stack_machine_old_multiinstructions_load_store/test.v b/tests/stack_machine_old_multiinstructions_load_store/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_multiinstructions_load_store/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_old_multiinstructions_load_store/words_to_verify.mem b/tests/stack_machine_old_multiinstructions_load_store/words_to_verify.mem new file mode 120000 index 0000000..e82687e --- /dev/null +++ b/tests/stack_machine_old_multiinstructions_load_store/words_to_verify.mem @@ -0,0 +1 @@ +../stack_machine_old_load_store/words_to_verify.mem
\ No newline at end of file diff --git a/tests/stack_machine_store/instructions.s.tcl b/tests/stack_machine_old_store/instructions.s.tcl index ddc3a8e..ddc3a8e 100755 --- a/tests/stack_machine_store/instructions.s.tcl +++ b/tests/stack_machine_old_store/instructions.s.tcl diff --git a/tests/stack_machine_store/test.v b/tests/stack_machine_old_store/test.v index 7e7429f..7e7429f 100644 --- a/tests/stack_machine_store/test.v +++ b/tests/stack_machine_old_store/test.v diff --git a/tests/stack_machine_store/words_to_verify.mem b/tests/stack_machine_old_store/words_to_verify.mem index 9056a1b..9056a1b 100644 --- a/tests/stack_machine_store/words_to_verify.mem +++ b/tests/stack_machine_old_store/words_to_verify.mem diff --git a/tests/stack_machine_sub/instructions.s.tcl b/tests/stack_machine_old_sub/instructions.s.tcl index 3f8fb48..3f8fb48 100755 --- a/tests/stack_machine_sub/instructions.s.tcl +++ b/tests/stack_machine_old_sub/instructions.s.tcl diff --git a/tests/stack_machine_old_sub/test.v b/tests/stack_machine_old_sub/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_sub/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_sub/words_to_verify.mem b/tests/stack_machine_old_sub/words_to_verify.mem index cc666fa..cc666fa 100644 --- a/tests/stack_machine_sub/words_to_verify.mem +++ b/tests/stack_machine_old_sub/words_to_verify.mem diff --git a/tests/stack_machine_swap/instructions.s.tcl b/tests/stack_machine_old_swap/instructions.s.tcl index c17314e..c17314e 100755 --- a/tests/stack_machine_swap/instructions.s.tcl +++ b/tests/stack_machine_old_swap/instructions.s.tcl diff --git a/tests/stack_machine_old_swap/test.v b/tests/stack_machine_old_swap/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_swap/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_swap/words_to_verify.mem b/tests/stack_machine_old_swap/words_to_verify.mem index 669219d..669219d 100644 --- a/tests/stack_machine_swap/words_to_verify.mem +++ b/tests/stack_machine_old_swap/words_to_verify.mem diff --git a/tests/stack_machine_tee/instructions.s.tcl b/tests/stack_machine_old_tee/instructions.s.tcl index e75b564..e75b564 100755 --- a/tests/stack_machine_tee/instructions.s.tcl +++ b/tests/stack_machine_old_tee/instructions.s.tcl diff --git a/tests/stack_machine_old_tee/test.v b/tests/stack_machine_old_tee/test.v new file mode 120000 index 0000000..f0c3cf9 --- /dev/null +++ b/tests/stack_machine_old_tee/test.v @@ -0,0 +1 @@ +../stack_machine_old_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_tee/words_to_verify.mem b/tests/stack_machine_old_tee/words_to_verify.mem index 961f9dc..961f9dc 100644 --- a/tests/stack_machine_tee/words_to_verify.mem +++ b/tests/stack_machine_old_tee/words_to_verify.mem diff --git a/tests/stack_machine_sub/test.v b/tests/stack_machine_sub/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_sub/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_swap/test.v b/tests/stack_machine_swap/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_swap/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file diff --git a/tests/stack_machine_tee/test.v b/tests/stack_machine_tee/test.v deleted file mode 120000 index f5b6a59..0000000 --- a/tests/stack_machine_tee/test.v +++ /dev/null @@ -1 +0,0 @@ -../stack_machine_store/test.v
\ No newline at end of file |