@@ -60,22 +60,26 @@ describe Z80E do @cpu.state.should == state.merge(:pc => 1, :b => 0x13, :c => 0x00) end - it "should execute INC B" do - 256.times do |i| - @cpu.f = rand(256) - @cpu.b = i - @cpu[i] = 0x04 - state = @cpu.state - @cpu.step.should == 4 - new_state = @cpu.state - state[:pc] += 1 - state[:f] &= 0x01 # reset 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 (new_state[:b] & 0x10 == (state[:b] ^ 0xff) & 0x10) - state[:f] |= 0x04 if (state[:b] == 0x7f) - state[:b] = (state[:b] + 1) % 256 - @cpu.state.should == state + it "should execute INC r" do + [0x04, 0x0c, 0x14, 0x1c, 0x24, 0x2c, 0x3c].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] &= 0x01 # reset 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 (new_state[r] & 0x10 == (state[r] ^ 0xff) & 0x10) + state[:f] |= 0x04 if (state[r] == 0x7f) + state[r] = (state[r] + 1) % 256 + @cpu.state.should == state + end end end @@ -141,7 +145,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 INC C" # 0C it "should execute DEC C" # 0D it "should execute RRCA" # 0F it "should execute DJNZ (PC+e)" # 10 e @@ -149,7 +152,6 @@ describe Z80E do it "should execute LD (DE),A" # 12 it "should execute INC DE" # 13 it "should execute INC D" # 14 - it "should execute DEC D" # 15 it "should execute RLA" # 17 it "should execute JR (PC+e)" # 18 e it "should execute ADD HL,DE" # 19 @@ -157,7 +159,6 @@ describe Z80E do it "should execute DEC DE" # 1B it "should execute INC E" # 1C it "should execute DEC E" # 1D - it "should execute RRA" # 1F 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 @@ -165,7 +166,6 @@ describe Z80E do it "should execute INC H" # 24 it "should execute DEC H" # 25 it "should execute DAA" # 27 - it "should execute JR Z,(PC+e)" # 28 e it "should execute ADD HL,HL" # 29 it "should execute LD HL,(nn)" # 2A n n it "should execute DEC HL" # 2B @@ -173,7 +173,6 @@ describe Z80E do it "should execute DEC L" # 2D it "should execute CPL" # 2F it "should execute JR NC,(PC+e)" # 30 e - it "should execute LD SP,nn" # 31 n n it "should execute LD (nn),A" # 32 n n it "should execute INC SP" # 33 it "should execute INC (HL)" # 34 @@ -189,7 +188,6 @@ describe Z80E do it "should execute CCF" # 3F it "should execute LD B,B" # 40 it "should execute LD B,C" # 41 - it "should execute LD B,D" # 42 it "should execute LD B,E" # 43 it "should execute LD B,H" # 44 it "should execute LD B,L" # 45 test/test.rb 2d290a3bb1b01310484663bc5eed336ba8039a36 Dana Contreras dana@danadanger.org http://github.com/DanaDanger/z80e/commit/f691d9743b50962b7176e4e1153f2547644c456f f691d9743b50962b7176e4e1153f2547644c456f 2009-07-05T04:09:35-07:00 2009-07-05T04:09:35-07:00 generalized INC B test for INC r 5bd28b0a243e7087a2612fd5b7457597b6b409fd Dana Contreras dana@danadanger.org