j/Chirp
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Move submodules to project root

Browse Source
This commit is contained in:
John 2023-04-02 14:45:32 -05:00
parent 89f66c3d5b
commit 83cc35c968
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,5 +1,5 @@
[submodule "tests/chip8-test-suite"] [submodule "chip8-test-suite"]
path = tests/chip8-test-suite path = chip8-test-suite
url = https://github.com/Timendus/chip8-test-suite.git url = https://github.com/Timendus/chip8-test-suite.git
[submodule "chip8Archive"] [submodule "chip8Archive"]
path = chip8Archive path = chip8Archive

0
tests/chip8-test-suite → chip8-test-suite
View File

2
src/cpu/tests.rs
View File

@ -37,7 +37,7 @@ fn setup_environment() -> (CPU, Bus) {
// Load the ROM file into RAM (dummy binary which contains nothing but `jmp pc+2`) // Load the ROM file into RAM (dummy binary which contains nothing but `jmp pc+2`)
Program [0x0200..0x1000] = include_bytes!("tests/roms/jumptest.ch8"), Program [0x0200..0x1000] = include_bytes!("tests/roms/jumptest.ch8"),
// Create a screen // Create a screen
Screen [0x0F00..0x1000] = include_bytes!("../../tests/chip8Archive/roms/1dcell.ch8"), Screen [0x0F00..0x1000] = include_bytes!("../../chip8Archive/roms/1dcell.ch8"),
}, },
) )
} }

12
tests/chip8_test_suite.rs
View File

@ -16,9 +16,9 @@ fn setup_environment() -> (CPU, Bus) {
// Load the charset into ROM // Load the charset into ROM
Charset [0x0050..0x00A0] = include_bytes!("../src/mem/charset.bin"), Charset [0x0050..0x00A0] = include_bytes!("../src/mem/charset.bin"),
// Load the ROM file into RAM // Load the ROM file into RAM
Program [0x0200..0x1000] = include_bytes!("../chip-8/BC_test.ch8"), Program [0x0200..0x1000] = include_bytes!("../chip8-test-suite/bin/chip8-test-suite.ch8"),
// Create a screen // Create a screen, and fill it with garbage data
Screen [0x0F00..0x1000] = include_bytes!("../chip-8/IBM Logo.ch8"), Screen [0x0F00..0x1000] = include_bytes!("chip8_test_suite.rs"),
}, },
) )
} }
@ -45,14 +45,14 @@ fn run_screentest(test: SuiteTest, mut cpu: CPU, mut bus: Bus) {
#[test] #[test]
fn splash_screen() { fn splash_screen() {
let (c, b) = setup_environment(); let (cpu, bus) = setup_environment();
run_screentest( run_screentest(
SuiteTest { SuiteTest {
program: include_bytes!("chip8-test-suite/bin/chip8-test-suite.ch8"), program: include_bytes!("chip8-test-suite/bin/chip8-test-suite.ch8"),
screen: include_bytes!("screens/chip8-test-suite/splash.bin"), screen: include_bytes!("screens/chip8-test-suite/splash.bin"),
}, },
c, cpu,
b, bus,
) )
} }