From 88e72d1eb84746334bee9caf4d94427f8aabb8f2 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Sun, 15 Sep 2019 17:02:21 -0700
Subject: [PATCH] Rename regression test 2020 to reflect the CPU configuration

Cycle counting is CPU-specific.  The 2020 test exercises the
65816, but there are things unique to 6502 and 65C02 that should
also be checked if we want to be thorough.

No changes to the test itself.
---
 Asm65/OpDef.cs                                      |   1 +
 .../{2020-cycle-counts => 2020-cycle-counts-65816}  | Bin
 ...e-counts.dis65 => 2020-cycle-counts-65816.dis65} |   0
 ...ts_64tass.S => 2020-cycle-counts-65816_64tass.S} |   0
 ...erlin32.S => 2020-cycle-counts-65816_Merlin32.S} |   0
 ...counts_acme.S => 2020-cycle-counts-65816_acme.S} |   0
 ...counts_cc65.S => 2020-cycle-counts-65816_cc65.S} |   0
 ...ts_cc65.cfg => 2020-cycle-counts-65816_cc65.cfg} |   2 +-
 ...020-cycle-counts.S => 2020-cycle-counts-65816.S} |   0
 9 files changed, 2 insertions(+), 1 deletion(-)
 rename SourceGen/SGTestData/{2020-cycle-counts => 2020-cycle-counts-65816} (100%)
 rename SourceGen/SGTestData/{2020-cycle-counts.dis65 => 2020-cycle-counts-65816.dis65} (100%)
 rename SourceGen/SGTestData/Expected/{2020-cycle-counts_64tass.S => 2020-cycle-counts-65816_64tass.S} (100%)
 rename SourceGen/SGTestData/Expected/{2020-cycle-counts_Merlin32.S => 2020-cycle-counts-65816_Merlin32.S} (100%)
 rename SourceGen/SGTestData/Expected/{2020-cycle-counts_acme.S => 2020-cycle-counts-65816_acme.S} (100%)
 rename SourceGen/SGTestData/Expected/{2020-cycle-counts_cc65.S => 2020-cycle-counts-65816_cc65.S} (100%)
 rename SourceGen/SGTestData/Expected/{2020-cycle-counts_cc65.cfg => 2020-cycle-counts-65816_cc65.cfg} (96%)
 rename SourceGen/SGTestData/Source/{2020-cycle-counts.S => 2020-cycle-counts-65816.S} (100%)

diff --git a/Asm65/OpDef.cs b/Asm65/OpDef.cs
index 67acfe3..b5d05af 100644
--- a/Asm65/OpDef.cs
+++ b/Asm65/OpDef.cs
@@ -2049,6 +2049,7 @@ namespace Asm65 {
             Opcode = 0x6c,
             AddrMode = AddressMode.AbsInd,
             CycDef = 5 | (int)(CycleMod.OneIf65C02)
+            // takes one extra cycle on CMOS 6502 if low byte is 0xff?? (it also has a bug)
         };
         public static readonly OpDef OpADC_Abs = new OpDef(OpADC) {
             Opcode = 0x6d,
diff --git a/SourceGen/SGTestData/2020-cycle-counts b/SourceGen/SGTestData/2020-cycle-counts-65816
similarity index 100%
rename from SourceGen/SGTestData/2020-cycle-counts
rename to SourceGen/SGTestData/2020-cycle-counts-65816
diff --git a/SourceGen/SGTestData/2020-cycle-counts.dis65 b/SourceGen/SGTestData/2020-cycle-counts-65816.dis65
similarity index 100%
rename from SourceGen/SGTestData/2020-cycle-counts.dis65
rename to SourceGen/SGTestData/2020-cycle-counts-65816.dis65
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts_64tass.S b/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_64tass.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts_64tass.S
rename to SourceGen/SGTestData/Expected/2020-cycle-counts-65816_64tass.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts_Merlin32.S b/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts_Merlin32.S
rename to SourceGen/SGTestData/Expected/2020-cycle-counts-65816_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts_acme.S b/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_acme.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts_acme.S
rename to SourceGen/SGTestData/Expected/2020-cycle-counts-65816_acme.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts_cc65.S b/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts_cc65.S
rename to SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.S
diff --git a/SourceGen/SGTestData/Expected/2020-cycle-counts_cc65.cfg b/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.cfg
similarity index 96%
rename from SourceGen/SGTestData/Expected/2020-cycle-counts_cc65.cfg
rename to SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.cfg
index cda17f9..4cc1dc5 100644
--- a/SourceGen/SGTestData/Expected/2020-cycle-counts_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/2020-cycle-counts-65816_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 2020-cycle-counts
+# 6502bench SourceGen generated linker script for 2020-cycle-counts-65816
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$10f0, size=126;
diff --git a/SourceGen/SGTestData/Source/2020-cycle-counts.S b/SourceGen/SGTestData/Source/2020-cycle-counts-65816.S
similarity index 100%
rename from SourceGen/SGTestData/Source/2020-cycle-counts.S
rename to SourceGen/SGTestData/Source/2020-cycle-counts-65816.S