6809: enable most unit tests

src/test/scala/millfork/test/ComparisonSuite.scala

@@ -391,7 +391,7 @@ class ComparisonSuite extends FunSuite with Matchers with AppendedClues {
         |  if c >  335444 { output += 1 }
         | }
       """.stripMargin
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(src){m =>
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(src){m =>
       m.readByte(0xc000) should equal(src.count(_ == '+'))
     }
   }

src/test/scala/millfork/test/InterruptSuite.scala

@@ -9,7 +9,7 @@ import org.scalatest.{FunSuite, Matchers}
 class InterruptSuite extends FunSuite with Matchers {
 
     test("Interrupts should compile") {
-      EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp)(
+      EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Motorola6809)(
         """
           | interrupt void f() {
           |   asm { nop }

src/test/scala/millfork/test/Issue11Test.scala

@@ -100,7 +100,7 @@ class Issue11Test extends FunSuite with Matchers {
         |}
         |""".stripMargin
 
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos)(src) { m =>
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Motorola6809)(src) { m =>
       m.readByte(0xc000) should equal(15)
     }
   }

src/test/scala/millfork/test/MemBulkSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{AppendedClues, FunSuite, Matchers}
 class MemBulkSuite extends FunSuite with Matchers with AppendedClues {
 
   test("Memcpy should work fine") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Motorola6809)(
       """
         |
         |array input @$c000 = [5,89,6,1,8,6,87,52,6,45,8,52,8,6,14,89]
@@ -31,7 +31,7 @@ class MemBulkSuite extends FunSuite with Matchers with AppendedClues {
   }
 
   test("Correctly increment array elements") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Motorola6809)(
       """
         |array output [$100] @$c000
         |void main() {

src/test/scala/millfork/test/NonetSuite.scala

@@ -30,7 +30,7 @@ class NonetSuite extends FunSuite with Matchers {
   }
 
   test("Nonet operations on bytes") {
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | byte output @$c000
         |

src/test/scala/millfork/test/SecondAssemblyOptimizationSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class SecondAssemblyOptimizationSuite extends FunSuite with Matchers {
 
   test("Add-shift-add") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | byte output @$c000
         | void main () {
@@ -23,7 +23,7 @@ class SecondAssemblyOptimizationSuite extends FunSuite with Matchers {
   }
 
   test("And-shift-and") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | byte output @$c000
         | void main () {
@@ -36,7 +36,7 @@ class SecondAssemblyOptimizationSuite extends FunSuite with Matchers {
   }
 
   test("Add with limit") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | byte output @$c000
         | const byte start = 5
@@ -105,7 +105,7 @@ class SecondAssemblyOptimizationSuite extends FunSuite with Matchers {
   }
 
   test("Conditional variable initialization") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8086)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | array output [16] @$c000
         | void main () {

src/test/scala/millfork/test/SegmentSuite.scala

@@ -28,7 +28,7 @@ class SegmentSuite extends FunSuite with Matchers {
         |   if a5.addr.hi & $e0 == $00 { output += 1 }
         | }
       """.stripMargin
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80)(source) { m =>
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Motorola6809)(source) { m =>
       m.readByte(0xc000) should equal(source.count(_ == '+'))
     }
   }

src/test/scala/millfork/test/SeparateBytesSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class SeparateBytesSuite extends FunSuite with Matchers {
 
   test("Separate assignment 1") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | word output @$c000
         | void main () {
         |  output = 2:3
@@ -19,7 +19,7 @@ class SeparateBytesSuite extends FunSuite with Matchers {
   }
 
   test("Separate assignment 2") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | byte output @$c000
         | byte ignore @$c001
         | void main () {
@@ -31,7 +31,7 @@ class SeparateBytesSuite extends FunSuite with Matchers {
   }
 
   test("Separate assignment 3") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | byte output @$c000
         | byte ignore @$c001
         | void main () {
@@ -44,7 +44,7 @@ class SeparateBytesSuite extends FunSuite with Matchers {
   }
 
   test("Separate assignment 4") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | array output [5] @$c000
         | byte ignore @$c001
         | void main () {
@@ -59,7 +59,7 @@ class SeparateBytesSuite extends FunSuite with Matchers {
   }
 
   test("Separate assignment 5") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | array output [5] @$c000
         | byte ignore @$c001
         | void main () {
@@ -74,7 +74,7 @@ class SeparateBytesSuite extends FunSuite with Matchers {
   }
 
   test("Magic split array") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | array high [16] @$c000
         | array low [16] @$c010
         | void main () {
@@ -107,7 +107,7 @@ class SeparateBytesSuite extends FunSuite with Matchers {
   }
 
   test("Separate addition") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | word output @$c000
         | void main () {
         |  byte h
@@ -121,7 +121,7 @@ class SeparateBytesSuite extends FunSuite with Matchers {
   }
 
   test("Separate increase") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | word output @$c000
         | void main () {
         |  byte h

src/test/scala/millfork/test/ShiftSuite.scala

@@ -50,7 +50,7 @@ class ShiftSuite extends FunSuite with Matchers {
         |   output <<= 2
         | }
       """.stripMargin)(_.readLong(0xc000) should equal(0x4040C04))
-    EmuCrossPlatformBenchmarkRun(Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | long output @$c000
         | void main () {
         |   output = $1010301
@@ -60,7 +60,7 @@ class ShiftSuite extends FunSuite with Matchers {
   }
 
   test("Long shifting right") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | long output @$c000
         | void main () {
         |   output = $4040C04

src/test/scala/millfork/test/SizeofSuite.scala

@@ -9,7 +9,7 @@ import org.scalatest.{AppendedClues, FunSuite, Matchers}
 class SizeofSuite extends FunSuite with Matchers with AppendedClues {
 
   test("Basic sizeof test") {
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80)(
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Motorola6809)(
       """
         | const word sizeofbyte = sizeof(byte)
         | array output [6] @$c000

src/test/scala/millfork/test/StackVarSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class StackVarSuite extends FunSuite with Matchers {
 
   test("Basic stack assignment") {
-    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8085, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8085, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | byte output @$c000
         | void main () {
         |   stack byte a, b
@@ -23,7 +23,7 @@ class StackVarSuite extends FunSuite with Matchers {
   }
 
   test("Stack byte addition") {
-    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | byte output @$c000
         | void main () {
         |   stack byte a, b
@@ -36,7 +36,7 @@ class StackVarSuite extends FunSuite with Matchers {
         | byte zzz() {
         |   return $22
         | }
-      """.stripMargin)(_.readWord(0xc000) should equal(0x77))
+      """.stripMargin)(_.readByte(0xc000) should equal(0x77))
   }
 
   test("Complex expressions involving stack variables (6502)") {
@@ -68,7 +68,7 @@ class StackVarSuite extends FunSuite with Matchers {
   }
 
   test("Stack byte subtraction") {
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8086)(
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | byte output @$c000
         | void main () {
@@ -88,7 +88,7 @@ class StackVarSuite extends FunSuite with Matchers {
   }
 
   test("Stack word addition") {
-    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8085, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8085, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | word output @$c000
         | void main () {
         |   stack word a, b
@@ -105,7 +105,7 @@ class StackVarSuite extends FunSuite with Matchers {
   }
 
   test("Recursion") {
-    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8085, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8085, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | array output [6] @$c000
         | byte fails @$c010
         | void main () {
@@ -149,7 +149,7 @@ class StackVarSuite extends FunSuite with Matchers {
   }
 
   test("Recursion 2") {
-    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | array output [6] @$c000
         | byte fails @$c010
         | void main () {
@@ -181,7 +181,7 @@ class StackVarSuite extends FunSuite with Matchers {
   }
 
   test("Complex stack-related stuff") {
-    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | byte output @$c000
         | array id = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
         | void main() {
@@ -199,7 +199,7 @@ class StackVarSuite extends FunSuite with Matchers {
 
 
   test("Indexing") {
-    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | array output [200] @$c000
         | void main () {
         |   stack byte a, b
@@ -207,11 +207,11 @@ class StackVarSuite extends FunSuite with Matchers {
         |   b = $44
         |   output[a + b] = $66
         | }
-      """.stripMargin){m => m.readWord(0xc055) should equal(0x66) }
+      """.stripMargin){m => m.readByte(0xc055) should equal(0x66) }
   }
 
     test("Double array with stack variables") {
-      EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+      EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
         """
           | array output[5]@$c001
           | array input = [0,1,4,9,16,25,36,49]
@@ -229,7 +229,7 @@ class StackVarSuite extends FunSuite with Matchers {
     }
 
     test("Complex large stacks") {
-      EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+      EmuCrossPlatformBenchmarkRun(Cpu.StrictMos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
 //      val m = EmuUnoptimizedZ80Run(
         """
           | array output[5]@$c000
@@ -258,7 +258,7 @@ class StackVarSuite extends FunSuite with Matchers {
     }
 
   test("Large stack storage") {
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | int32 output @$c000
         | void main () {
@@ -275,7 +275,7 @@ class StackVarSuite extends FunSuite with Matchers {
   }
 
   test("Large stack-to-stack transfer") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | int32 output @$c000
         | void main () {
@@ -346,7 +346,7 @@ class StackVarSuite extends FunSuite with Matchers {
         | }
       """.stripMargin
 
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp)(code) { m =>
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Cmos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Motorola6809)(code) { m =>
       println("$" + m.readWord(0xc002).toHexString)
 //      (0x1f0 until 0x200).foreach { a =>
 //        printf(f"$$$a%04x = $$${m.readByte(a)}%02x%n");
@@ -386,7 +386,7 @@ class StackVarSuite extends FunSuite with Matchers {
         | }
       """.stripMargin
 
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80)(code) { m =>
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Motorola6809)(code) { m =>
     }
     EmuSoftwareStackBenchmarkRun(code) { m =>
     }

src/test/scala/millfork/test/StatementOptimizationSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class StatementOptimizationSuite extends FunSuite with Matchers {
 
   test("Statement optimization  1") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | array output[10] @$c000
         | void main() {
@@ -58,7 +58,7 @@ class StatementOptimizationSuite extends FunSuite with Matchers {
 
 
   test("Stdlib optimization 1") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)(
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)(
       """
         | import stdio
         | byte output @$c000

src/test/scala/millfork/test/StructSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class StructSuite extends FunSuite with Matchers {
 
   test("Basic struct support") {
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8086)("""
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Intel8086, Cpu.Motorola6809)("""
         | struct point {
         |   byte x
         |   byte y
@@ -171,7 +171,7 @@ class StructSuite extends FunSuite with Matchers {
         |   outputY = p.y
         | }
       """.stripMargin
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8086)(code){ m =>
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8086, Cpu.Motorola6809)(code){ m =>
       m.readWord(0xc000) should equal(code.count(_ == '→') + 6)
       m.readWord(0xc002) should equal(code.count(_ == '↑') + 8)
     }

src/test/scala/millfork/test/TypeSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class TypeSuite extends FunSuite with Matchers {
 
   test("Word to word") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | word output @$c000
         | void main () {
         |  output = word(0x203)

src/test/scala/millfork/test/TypeWideningSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class TypeWideningSuite extends FunSuite with Matchers {
 
   test("Word after simple ops") {
-    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086)("""
+    EmuCrossPlatformBenchmarkRun(Cpu.Mos, Cpu.Z80, Cpu.Intel8080, Cpu.Sharp, Cpu.Intel8086, Cpu.Motorola6809)("""
         | word output @$c000
         | void main () {
         |  output = random()

src/test/scala/millfork/test/WarningSuite.scala

@@ -10,7 +10,7 @@ import org.scalatest.{FunSuite, Matchers}
 class WarningSuite extends FunSuite with Matchers {
 
   test("Various warnings") {
-    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80)(
+    EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Motorola6809)(
       """
         | void putstrz(pointer p) {}
         | byte output@0xc000