@@ -83,23 +83,27 @@ describe Z80E do end end - it "should execute DEC B" do - 256.times do |i| - @cpu.f = rand(256) - @cpu.b = i - @cpu[i] = 0x05 - state = @cpu.state - @cpu.step.should == 4 - new_state = @cpu.state - state[:pc] += 1 - state[:f] = state[:f] & 0x01 | 0x12 # set N, don't change C - state[:f] |= 0x80 if (new_state[:b] & 0x80 != 0) - state[:f] |= 0x40 if (new_state[:b] == 0) - state[:f] |= 0x20 if (state[:b] & 0x0f == 0) - state[:f] |= 0x04 if (state[:b] == 0x80) - state[:b] -= 1 - state[:b] = 255 if (state[:b] == -1) - @cpu.state.should == state + it "should execute DEC r" do + [0x05, 0x0d, 0x15, 0x1d, 0x25, 0x2d, 0x3d].each do |opcode| + @cpu.reset! + r = register_vector(opcode) + 256.times do |i| + @cpu.f = rand(256) + @cpu.send("#{r}=", i) + @cpu[i] = opcode + state = @cpu.state + @cpu.step.should == 4 + new_state = @cpu.state + state[:pc] += 1 + state[:f] = state[:f] & 0x01 | 0x12 # set N, don't change C + state[:f] |= 0x80 if (new_state[r] & 0x80 != 0) + state[:f] |= 0x40 if (new_state[r] == 0) + state[:f] |= 0x20 if (state[r] & 0x0f == 0) + state[:f] |= 0x04 if (state[r] == 0x80) + state[r] -= 1 + state[r] = 255 if (state[r] == -1) + @cpu.state.should == state + end end end @@ -145,7 +149,6 @@ describe Z80E do it "should execute ADD HL,BC" # 09 it "should execute LD A,(BC)" # 0A it "should execute DEC BC" # 0B - it "should execute DEC C" # 0D it "should execute RRCA" # 0F it "should execute DJNZ (PC+e)" # 10 e it "should execute LD DE,nn" # 11 n n @@ -158,19 +161,16 @@ describe Z80E do it "should execute LD A,(DE)" # 1A it "should execute DEC DE" # 1B it "should execute INC E" # 1C - it "should execute DEC E" # 1D it "should execute JR NZ,(PC+e)" # 20 e it "should execute LD HL,nn" # 21 n n it "should execute LD (nn),HL" # 22 n n it "should execute INC HL" # 23 it "should execute INC H" # 24 - it "should execute DEC H" # 25 it "should execute DAA" # 27 it "should execute ADD HL,HL" # 29 it "should execute LD HL,(nn)" # 2A n n it "should execute DEC HL" # 2B it "should execute INC L" # 2C - it "should execute DEC L" # 2D it "should execute CPL" # 2F it "should execute JR NC,(PC+e)" # 30 e it "should execute LD (nn),A" # 32 n n @@ -184,7 +184,6 @@ describe Z80E do it "should execute LD A,(nn)" # 3A n n it "should execute DEC SP" # 3B it "should execute INC A" # 3C - it "should execute DEC A" # 3D it "should execute CCF" # 3F it "should execute LD B,B" # 40 it "should execute LD B,C" # 41 test/test.rb f691d9743b50962b7176e4e1153f2547644c456f Dana Contreras dana@danadanger.org http://github.com/DanaDanger/z80e/commit/d185eca05122c882630a362df77c3289557a5f3b d185eca05122c882630a362df77c3289557a5f3b 2009-07-05T04:11:27-07:00 2009-07-05T04:11:27-07:00 generalized DEC B test for DEC r 8648ff91c42b166eaf87fdec3f1eebbc422fa484 Dana Contreras dana@danadanger.org