fixed cpu timing spec

This commit is contained in:
Colby Swandale 2016-09-26 21:28:53 +10:00
parent 4313b2dd63
commit 1f78c4b27b

View file

@ -4,9 +4,9 @@ describe Waterfoul::CPU do
describe 'CPU instruction timings' do
before { $mmu = Waterfoul::MMU.new }
ZERO_JUMP_INSTR = [:call_nz_a16, :call_nc_a16, :jp_nc_a16, :jp_nz_nn,
:ret_nc, :ret_nz, :jr_nc_r8, :jr_nz_r8, :jp_nz_a16].freeze
subject { Waterfoul::CPU.new }
before { subject.set_register :pc, 0x100 }
before { subject.set_register :sp, 0x200 }
OPCODE_TIMINGS = [
1, 3, 2, 2, 1, 1, 2, 1, 5, 2, 2, 2, 1, 1, 2, 1,
@ -46,41 +46,30 @@ describe Waterfoul::CPU do
3, 3, 2, 1, 0, 4, 2, 4, 3, 2, 4, 1, 0, 0, 2, 4,
].freeze
ZERO_JUMP_INSTR = [:call_nz_a16, :call_nc_a16, :jp_nc_a16, :jp_nz_nn,
:ret_nc, :ret_nz, :jr_nc_r8, :jr_nz_r8, :jp_nz_a16].freeze
describe 'instruction timings' do
Waterfoul::CPU::OPCODE.each_with_index do |instruction, index|
next if instruction == :prefix_cb
describe "\##{instruction}" do
context "when flags reset" do
if ZERO_JUMP_INSTR.include? instruction
cpu = Waterfoul::CPU.new pc: 0xABAC, sp: 0xFFF0, f: 0xF0
else
cpu = Waterfoul::CPU.new pc: 0xABAC, sp: 0xFFF0, f: 0x00
end
next if instruction == :prefix_cb || instruction == :xx
# skip the test if the instruction is not implemnted
next if instruction == :xx || instruction == :prefix_cb
before { allow(cpu).to receive(:fetch_instruction).and_return(index) }
it "sets clock cycle" do
describe instruction do
context 'with all status flag bits reset' do
before { subject.set_register :f, 0xF0 } if ZERO_JUMP_INSTR.include?(instruction)
it 'sets the correct instruction timing' do
instruction_cycles = OPCODE_TIMINGS[index]
cpu.perform_instruction index
expect(cpu.m).to eq instruction_cycles
subject.perform_instruction index
expect(subject.m).to eq (instruction_cycles * 4)
end
end
context 'with all flags set' do
if ZERO_JUMP_INSTR.include? instruction
cpu = Waterfoul::CPU.new pc: 0xABAC, sp: 0xFFF0, f: 0x00
else
cpu = Waterfoul::CPU.new pc: 0xABAC, sp: 0xFFF0, f: 0xF0
end
next if instruction == :xx || instruction == :prefix_cb
before { allow(cpu).to receive(:fetch_instruction).and_return(index) }
it 'sets clock cycle' do
context 'with all status flag bits set' do
before { subject.set_register :f, 0xF0 } unless ZERO_JUMP_INSTR.include?(instruction)
it 'sets the correct instruction timing' do
instruction_cycles = OPCODE_CONDITIONAL_TIMINGS[index]
cpu.perform_instruction index
expect(cpu.m).to eq instruction_cycles
subject.perform_instruction index
expect(subject.m).to eq (instruction_cycles * 4)
end
end
end
end