From 08880c5d77e57717edd0b6fe9c8510c5c0402586 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Tue, 18 Feb 2020 00:38:01 +0100
Subject: [PATCH] added the 'bbc beeb' bcd tests

---
 src/test/kotlin/Test6502CpuBasics.kt |  84 +++++++++++++++++++++++++--
 src/test/resources/BCDTEST_beeb.bin  | Bin 0 -> 1296 bytes
 2 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 src/test/resources/BCDTEST_beeb.bin

diff --git a/src/test/kotlin/Test6502CpuBasics.kt b/src/test/kotlin/Test6502CpuBasics.kt
index d705cef..f18aa90 100644
--- a/src/test/kotlin/Test6502CpuBasics.kt
+++ b/src/test/kotlin/Test6502CpuBasics.kt
@@ -1,8 +1,5 @@
-import razorvine.ksim65.Bus
-import razorvine.ksim65.Cpu6502
-import razorvine.ksim65.Cpu65C02
+import razorvine.ksim65.*
 import razorvine.ksim65.components.Ram
-import razorvine.ksim65.hexB
 import kotlin.test.*
 import kotlin.system.measureNanoTime
 import kotlin.test.assertEquals
@@ -151,6 +148,52 @@ class Test6502CpuBasics {
         }
     }
 
+    fun runBCDbeebTest(cpu: Cpu6502, testChoice: Char) {
+        // bcd test code from https://github.com/hoglet67/AtomSoftwareArchive/tree/master/tests/clark
+        val bus = Bus()
+        bus.add(cpu)
+        cpu.breakpointForBRK = { _, pc -> fail("brk instruction at \$${hexW(pc)}") }
+        cpu.addBreakpoint(0xffee) { cpu, pc ->
+            // OSWRCH write character
+            print("${cpu.regA.toChar()}")
+            Cpu6502.BreakpointResultAction()
+        }
+        cpu.addBreakpoint(0xffe0) { cpu, pc ->
+            // OSRDCH read character
+            cpu.regA = testChoice.toInt()
+            Cpu6502.BreakpointResultAction()
+        }
+        val ram = Ram(0, 0xffff)
+        val bytes = javaClass.getResource("BCDTEST_beeb.bin").readBytes()
+        ram.load(bytes, 0x2900)
+        ram[0x0200] = 0x20  // jsr $2900
+        ram[0x0201] = 0x00
+        ram[0x0202] = 0x29
+        ram[0x0203] = 0x00  // brk
+        ram[0xffe0] = 0x60  // rts
+        ram[0xffee] = 0x60  // rts
+        bus.add(ram)
+        bus.reset()
+        cpu.regPC = 0x0200
+
+        while (cpu.regPC!=0x203 && cpu.totalCycles < 200000000L) {
+            bus.clock()
+        }
+
+        assertEquals(0x0203, cpu.regPC, "test hangs: "+cpu.snapshot())
+        assertEquals(0, ram[0x84], "test failed- check the console output for diag message")
+    }
+
+    @Test
+    fun testBCDbeeb6502() {
+        runBCDbeebTest(Cpu6502(), 'D')
+    }
+
+    @Test
+    fun testBCDbeeb65c02() {
+        runBCDbeebTest(Cpu65C02(), 'H')
+    }
+
     @Test
     fun testBRKbreakpoint() {
         val cpu = Cpu6502()
@@ -178,4 +221,37 @@ class Test6502CpuBasics {
         assertEquals(0x3334, cpu.regPC)
     }
 
+    @Test
+    @Ignore("not finished yet")  // TODO finish NES TEST
+    fun testNesTest() {
+        class NesCpu: Cpu6502() {
+            fun resetTotalCycles(cycles: Long) {
+                totalCycles = cycles
+                instrCycles = 0
+            }
+        }
+
+        val cpu = NesCpu()
+        val ram = Ram(0, 0xffff)
+
+        val bytes = javaClass.getResource("nestest.nes").readBytes().drop(0x10).take(0x4000).toByteArray()
+        ram.load(bytes, 0x8000)
+        ram.load(bytes, 0xc000)
+        val bus = Bus()
+        bus.add(cpu)
+        bus.add(ram)
+        bus.reset()
+        cpu.resetTotalCycles(7)     // that is what the nes rom starts with
+        cpu.regPC = 0xc000
+
+        val neslog = javaClass.getResource("nestest.log").readText().lineSequence()
+        for(logline in neslog) {
+            println(logline)
+            val s = cpu.snapshot()
+            println("${hexW(s.PC)}  ?? ?? ??  NOP                             A:00 X:00 Y:00 P:00 SP:00 PPU:  0,  0 CYC:${s.cycles}")
+            cpu.step()
+        }
+
+        fail("todo: test success condition")
+    }
 }
diff --git a/src/test/resources/BCDTEST_beeb.bin b/src/test/resources/BCDTEST_beeb.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ad23e959817809a595c7461dcb985a2bf2af8c4d
GIT binary patch
literal 1296
zcmb`Gzi$#@7{?FVl6uL7CJvgoyh8_1dJURrD5lZl<@jMwO8C)em)_FkFdbZ6l@{JY
zDHLd}G;twKF7Xya{R@nV0~?Epi?K@yFf=SAH4gQ;<DfL$=nZ%Gd_V8|dGc^CsK+7g
z!r{0Zp$H%H3vT2Sd4JSRGk19wp+^s$4`6}Q$t^7COA!X*87HBYRgK_l#OJ%(;~gi)
z9)X26*sPCloEUrj*T`s}z&Ppe>7digI$!!z57v4CSDSwY7pchT{8FX08w0o5%FInw
zB?l@;-m728Av`~bu6ydf5q<1OsK>>GXe=1=Bi@VW=jUmrQ?;biDn&9Rr{q}sY~}T2
zovuA0yHIuYs#?2GiZ|?}q-2Kt4%vZfz!{Q7ZyhMlp<8o}cg;-WM>E$r$<BNp=@<3<
z-+td5sHpd|kMx5%(n`9)K;JMQjS60d?np-gD1)JJJf@uv{loGYqeawFGUzu45Ypwa
z0LRFyr@29j`AFm?3Wl^)9)um~;;Ti;tmnwqv`kVzje<b24evYayLI}QD%o0zDc0_q
z%DyR1*Cy-L(nMm-MUt>;QznJJ<80Ich3=3v$=U8PRkO9)ptwDi?G<a*_8LiEp~=<=
zIHkJQwhi!6K-v19>@LAbFk$?8T;yZR5rhK*UP3-TC<<Ph5nhA^922~5m_OMc>M`PR
zEY6Esv^AVl{-jzYrNW}dgy`Xvl#pkW-9>PROkF_7ZK**B2Tfd`14)5>s!LW(B|yz2
zMmUu0u~uEOYAOM0CNaXHWRtb%5^O2~Y9=wlz65?DO4>M}HV!GJK=R5q*^|&O2R!qn
zK=#O{q-Y;Juf-RR!8_o>H3U11Wd;g7gA27dnYGvHk~LvVIK}fznUrO+U!|JmhPAnW
PQg+(lk1zh^Hp<jL8HUrf

literal 0
HcmV?d00001