Fixed tests

This commit is contained in:
transistor 2024-03-20 20:54:09 -07:00
parent 3a6e3379f4
commit b5ca0db736
5 changed files with 6 additions and 6 deletions

View File

@ -13,7 +13,7 @@ mod decode_unit_tests {
fn run_decode_test<F>(cputype: M68kType, mut test_func: F)
where
F: FnMut(&mut InstructionDecoding<'_, MemoryBlock<u32, Instant>>),
F: FnMut(&mut InstructionDecoding<'_, MemoryBlock<u32, Instant>, Instant>),
{
let mut memory = MemoryBlock::from(vec![0; 0x0000100]);
let mut decoder = M68kDecoder::new(cputype, true, 0);
@ -330,7 +330,7 @@ mod execute_unit_tests {
#[allow(clippy::uninit_vec)]
fn run_execute_test<F>(cputype: M68kType, mut test_func: F)
where
F: FnMut(M68kCycleExecutor<&mut MemoryBlock<u32, Instant>>),
F: FnMut(M68kCycleExecutor<&mut MemoryBlock<u32, Instant>, Instant>),
{
// Insert basic initialization
let len = 0x10_0000;

View File

@ -64,7 +64,7 @@ const DECODE_TESTS: &'static [TestCase] = &[
];
fn init_decode_test(cputype: M68kType) -> (M68k, M68kCycle, MemoryBlock<u32, Instant>) {
fn init_decode_test(cputype: M68kType) -> (M68k<Instant>, M68kCycle<Instant>, MemoryBlock<u32, Instant>) {
// Insert basic initialization
let len = 0x2000;
let mut data = Vec::with_capacity(len);

View File

@ -38,7 +38,7 @@ struct TestCase {
#[allow(clippy::uninit_vec)]
fn run_execute_test<F>(cputype: M68kType, mut test_func: F)
where
F: FnMut(M68kCycleExecutor<&mut MemoryBlock<u32, Instant>>),
F: FnMut(M68kCycleExecutor<&mut MemoryBlock<u32, Instant>, Instant>),
{
// Insert basic initialization
let len = 0x10_0000;

View File

@ -12,7 +12,7 @@ const INIT_STACK: M68kAddress = 0x00002000;
const INIT_ADDR: M68kAddress = 0x00000010;
#[allow(clippy::uninit_vec)]
fn init_decode_test(cputype: M68kType) -> (M68k, M68kCycle, MemoryBlock<u32, Instant>) {
fn init_decode_test(cputype: M68kType) -> (M68k<Instant>, M68kCycle<Instant>, MemoryBlock<u32, Instant>) {
// Insert basic initialization
let len = 0x10_0000;
let mut data = Vec::with_capacity(len);

View File

@ -26,7 +26,7 @@ const TIMING_TESTS: &'static [TimingCase] = &[TimingCase {
}];
fn init_decode_test(cputype: M68kType) -> (M68k, M68kCycle, MemoryBlock<u32, Instant>) {
fn init_decode_test(cputype: M68kType) -> (M68k<Instant>, M68kCycle<Instant>, MemoryBlock<u32, Instant>) {
// Insert basic initialization
let len = 0x10_0000;
let mut data = Vec::with_capacity(len);