From 2afb280472fbece5e78b6175b562ecd6dd2202bd Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Sun, 18 Oct 2020 09:16:50 -0700
Subject: [PATCH] Rename test 10042

The 10042-data-recognition test has no 65816-specific content, so it
should be named 10040-data-recognition.

Also, remove header comment from 20102-label-dp.
---
 ...ata-recognition => 10040-data-recognition} | Bin
 SourceGen/SGTestData/20102-label-dp.dis65     |  66 +++++++++++++++---
 ...tass.S => 10040-data-recognition_64tass.S} |   4 +-
 ...32.S => 10040-data-recognition_Merlin32.S} |   0
 ...n_acme.S => 10040-data-recognition_acme.S} |   4 +-
 ...n_cc65.S => 10040-data-recognition_cc65.S} |   4 +-
 ...65.cfg => 10040-data-recognition_cc65.cfg} |   2 +-
 .../Expected/20102-label-dp_64tass.S          |   1 -
 .../Expected/20102-label-dp_Merlin32.S        |   1 -
 .../SGTestData/Expected/20102-label-dp_acme.S |   1 -
 .../SGTestData/Expected/20102-label-dp_cc65.S |   1 -
 ...recognition.S => 10040-data-recognition.S} |   0
 12 files changed, 60 insertions(+), 24 deletions(-)
 rename SourceGen/SGTestData/{10042-data-recognition => 10040-data-recognition} (100%)
 rename SourceGen/SGTestData/Expected/{10042-data-recognition_64tass.S => 10040-data-recognition_64tass.S} (94%)
 rename SourceGen/SGTestData/Expected/{10042-data-recognition_Merlin32.S => 10040-data-recognition_Merlin32.S} (100%)
 rename SourceGen/SGTestData/Expected/{10042-data-recognition_acme.S => 10040-data-recognition_acme.S} (93%)
 rename SourceGen/SGTestData/Expected/{10042-data-recognition_cc65.S => 10040-data-recognition_cc65.S} (93%)
 rename SourceGen/SGTestData/Expected/{10042-data-recognition_cc65.cfg => 10040-data-recognition_cc65.cfg} (76%)
 rename SourceGen/SGTestData/Source/{10042-data-recognition.S => 10040-data-recognition.S} (100%)

diff --git a/SourceGen/SGTestData/10042-data-recognition b/SourceGen/SGTestData/10040-data-recognition
similarity index 100%
rename from SourceGen/SGTestData/10042-data-recognition
rename to SourceGen/SGTestData/10040-data-recognition
diff --git a/SourceGen/SGTestData/20102-label-dp.dis65 b/SourceGen/SGTestData/20102-label-dp.dis65
index 39ffcc4..ce31ed1 100644
--- a/SourceGen/SGTestData/20102-label-dp.dis65
+++ b/SourceGen/SGTestData/20102-label-dp.dis65
@@ -1,26 +1,72 @@
 ### 6502bench SourceGen dis65 v1.0 ###
 {
-"_ContentVersion":1,"FileDataLength":601,"FileDataCrc32":63527368,"ProjectProps":{
-"CpuName":"65816","IncludeUndocumentedInstr":false,"EntryFlags":32702671,"AnalysisParams":{
-"AnalyzeUncategorizedData":true,"MinCharsForString":4,"SeekNearbyTargets":true},
-"PlatformSymbolFileIdentifiers":[],"ExtensionScriptFileIdentifiers":[],"ProjectSyms":{
+"_ContentVersion":4,
+"FileDataLength":601,
+"FileDataCrc32":63527368,
+"ProjectProps":{
+"CpuName":"65816",
+"IncludeUndocumentedInstr":false,
+"TwoByteBrk":false,
+"EntryFlags":32702671,
+"AutoLabelStyle":"Simple",
+"AnalysisParams":{
+"AnalyzeUncategorizedData":true,
+"DefaultTextScanMode":"LowHighAscii",
+"MinCharsForString":4,
+"SeekNearbyTargets":true,
+"UseRelocData":false,
+"SmartPlpHandling":true,
+"SmartPlbHandling":true},
+
+"PlatformSymbolFileIdentifiers":[],
+"ExtensionScriptFileIdentifiers":[],
+"ProjectSyms":{
 }},
+
 "AddressMap":[{
-"Offset":0,"Addr":4096},
+"Offset":0,
+"Addr":4096},
+
 {
-"Offset":588,"Addr":128}],"TypeHints":[{
-"Low":0,"High":0,"Hint":"Code"},
+"Offset":588,
+"Addr":128}],
+"TypeHints":[{
+"Low":0,
+"High":0,
+"Hint":"Code"},
+
 {
-"Low":588,"High":588,"Hint":"Code"}],"StatusFlagOverrides":{
+"Low":588,
+"High":588,
+"Hint":"Code"}],
+"StatusFlagOverrides":{
 },
+
 "Comments":{
 },
+
 "LongComments":{
-"-2147483647":{
-"Text":"6502bench SourceGen v1.1.0-dev1","BoxMode":false,"MaxWidth":80,"BackgroundColor":0}},
+},
+
 "Notes":{
 },
+
 "UserLabels":{
 },
+
 "OperandFormats":{
+},
+
+"LvTables":{
+},
+
+"Visualizations":[],
+"VisualizationAnimations":[],
+"VisualizationSets":{
+},
+
+"RelocList":{
+},
+
+"DbrValues":{
 }}
diff --git a/SourceGen/SGTestData/Expected/10042-data-recognition_64tass.S b/SourceGen/SGTestData/Expected/10040-data-recognition_64tass.S
similarity index 94%
rename from SourceGen/SGTestData/Expected/10042-data-recognition_64tass.S
rename to SourceGen/SGTestData/Expected/10040-data-recognition_64tass.S
index 03a172b..6fab0aa 100644
--- a/SourceGen/SGTestData/Expected/10042-data-recognition_64tass.S
+++ b/SourceGen/SGTestData/Expected/10040-data-recognition_64tass.S
@@ -1,9 +1,7 @@
-        .cpu    "65816"
+        .cpu    "6502i"
         .enc    "sg_ascii"
         .cdef   $20,$7e,$20
 *       =       $1000
-        .as
-        .xs
         lda     L10AC
         ora     L10BC
         rts
diff --git a/SourceGen/SGTestData/Expected/10042-data-recognition_Merlin32.S b/SourceGen/SGTestData/Expected/10040-data-recognition_Merlin32.S
similarity index 100%
rename from SourceGen/SGTestData/Expected/10042-data-recognition_Merlin32.S
rename to SourceGen/SGTestData/Expected/10040-data-recognition_Merlin32.S
diff --git a/SourceGen/SGTestData/Expected/10042-data-recognition_acme.S b/SourceGen/SGTestData/Expected/10040-data-recognition_acme.S
similarity index 93%
rename from SourceGen/SGTestData/Expected/10042-data-recognition_acme.S
rename to SourceGen/SGTestData/Expected/10040-data-recognition_acme.S
index a3dcab9..48eca38 100644
--- a/SourceGen/SGTestData/Expected/10042-data-recognition_acme.S
+++ b/SourceGen/SGTestData/Expected/10040-data-recognition_acme.S
@@ -1,7 +1,5 @@
-        !cpu    65816
+        !cpu    6510
 *       =       $1000
-        !as
-        !rs
         lda     L10AC
         ora     L10BC
         rts
diff --git a/SourceGen/SGTestData/Expected/10042-data-recognition_cc65.S b/SourceGen/SGTestData/Expected/10040-data-recognition_cc65.S
similarity index 93%
rename from SourceGen/SGTestData/Expected/10042-data-recognition_cc65.S
rename to SourceGen/SGTestData/Expected/10040-data-recognition_cc65.S
index b5c00b7..e862851 100644
--- a/SourceGen/SGTestData/Expected/10042-data-recognition_cc65.S
+++ b/SourceGen/SGTestData/Expected/10040-data-recognition_cc65.S
@@ -1,8 +1,6 @@
-         .setcpu "65816"
+         .setcpu "6502X"
 ;         .segment "SEG000"
          .org    $1000
-         .a8
-         .i8
          lda     L10AC
          ora     L10BC
          rts
diff --git a/SourceGen/SGTestData/Expected/10042-data-recognition_cc65.cfg b/SourceGen/SGTestData/Expected/10040-data-recognition_cc65.cfg
similarity index 76%
rename from SourceGen/SGTestData/Expected/10042-data-recognition_cc65.cfg
rename to SourceGen/SGTestData/Expected/10040-data-recognition_cc65.cfg
index bbe32f4..5553474 100644
--- a/SourceGen/SGTestData/Expected/10042-data-recognition_cc65.cfg
+++ b/SourceGen/SGTestData/Expected/10040-data-recognition_cc65.cfg
@@ -1,4 +1,4 @@
-# 6502bench SourceGen generated linker script for 10042-data-recognition
+# 6502bench SourceGen generated linker script for 10040-data-recognition
 MEMORY {
     MAIN: file=%O, start=%S, size=65536;
 #    MEM000: file=%O, start=$1000, size=196;
diff --git a/SourceGen/SGTestData/Expected/20102-label-dp_64tass.S b/SourceGen/SGTestData/Expected/20102-label-dp_64tass.S
index 4946317..efa3879 100644
--- a/SourceGen/SGTestData/Expected/20102-label-dp_64tass.S
+++ b/SourceGen/SGTestData/Expected/20102-label-dp_64tass.S
@@ -1,4 +1,3 @@
-;6502bench SourceGen v1.1.0-dev1
         .cpu    "65816"
 *       =       $1000
         .as
diff --git a/SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S b/SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S
index 4b6db83..5831bb3 100644
--- a/SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S
+++ b/SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S
@@ -1,4 +1,3 @@
-;6502bench SourceGen v1.1.0-dev1
          org   $1000
          sec
          xce
diff --git a/SourceGen/SGTestData/Expected/20102-label-dp_acme.S b/SourceGen/SGTestData/Expected/20102-label-dp_acme.S
index a42e645..64cb178 100644
--- a/SourceGen/SGTestData/Expected/20102-label-dp_acme.S
+++ b/SourceGen/SGTestData/Expected/20102-label-dp_acme.S
@@ -1,4 +1,3 @@
-;6502bench SourceGen v1.1.0-dev1
         !cpu    65816
 *       =       $0000
         !pseudopc $1000 {
diff --git a/SourceGen/SGTestData/Expected/20102-label-dp_cc65.S b/SourceGen/SGTestData/Expected/20102-label-dp_cc65.S
index 22da178..167e0c3 100644
--- a/SourceGen/SGTestData/Expected/20102-label-dp_cc65.S
+++ b/SourceGen/SGTestData/Expected/20102-label-dp_cc65.S
@@ -1,4 +1,3 @@
-;6502bench SourceGen v1.1.0-dev1
          .setcpu "65816"
 ;         .segment "SEG000"
          .org    $1000
diff --git a/SourceGen/SGTestData/Source/10042-data-recognition.S b/SourceGen/SGTestData/Source/10040-data-recognition.S
similarity index 100%
rename from SourceGen/SGTestData/Source/10042-data-recognition.S
rename to SourceGen/SGTestData/Source/10040-data-recognition.S