Tweak 20032 test

The existing workaround for broken Merlin 32 behavior is sufficient
to handle the new test cases.  This updates 20032-labels-and-symbols
to fully exercise all DP addressing modes with non-DP labels.

(issue #170)

SourceGen/SGTestData/20032-labels-and-symbols.dis65

@@ -2,7 +2,7 @@
 {
 "_ContentVersion":6,
 "FileDataLength":729,
-"FileDataCrc32":-707037586,
+"FileDataCrc32":-1745845873,
 "ProjectProps":{
 "CpuName":"65816",
 "IncludeUndocumentedInstr":false,
@@ -1451,7 +1451,7 @@
 "Format":"NumericLE",
 "SubFormat":"Symbol",
 "SymbolRef":{
-"Label":"zip",
+"Label":"before",
 "Part":"Low"},
 
 "Extra":null},
@@ -1511,7 +1511,7 @@
 "Format":"NumericLE",
 "SubFormat":"Symbol",
 "SymbolRef":{
-"Label":"zip",
+"Label":"after",
 "Part":"Low"},
 
 "Extra":null}},

SourceGen/SGTestData/Expected/20032-labels-and-symbols_64tass.S

@@ -218,13 +218,13 @@ before  nop
         lda     [<before+4],y
         lda     [<before+5]
         lda     <before+6,x
-        lda     (zip+7,x)
+        lda     (<before+7,x)
         lda     before-$10f8,y
         lda     <after+6
         lda     (<after+7),y
 after   ldx     <after+8,y
         ldy     <after+9,x
-        pei     (zip+4)
+        pei     (<after+10)
         nop
         rts
 

SourceGen/SGTestData/Expected/20032-labels-and-symbols_acme.S

@@ -23,5 +23,5 @@
         !hex    656172206f6e20746865206669727374206c696e652e20205468652071756963
         !hex    6b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920
         !hex    646f67732ea97aa959a934c230a97b56a95a34a93412eaad9f11a59fa5a0b2a1
-        !hex    b1a2b7a3a7a4b5a5a1d4b9a700a5c0b1c1b6c2b4c3d4d1ea60
+        !hex    b1a2b7a3a7a4b5a5a1a6b9a700a5c0b1c1b6c2b4c3d4c4ea60
         }

SourceGen/SGTestData/Expected/20032-labels-and-symbols_cc65.S

@@ -215,13 +215,13 @@ before:  nop
          lda     [<before+4],y
          lda     [<before+5]
          lda     <before+6,x
-         lda     (zip+7,x)
+         lda     (<before+7,x)
          lda     before-$10f8,y
          lda     z:<after+6
          lda     (<after+7),y
 after:   ldx     <after+8,y
          ldy     <after+9,x
-         pei     (zip+4)
+         pei     (<after+10)
          nop
          rts
 

SourceGen/SGTestData/Expected/20032-labels-and-symbols_merlin32.S

@@ -206,13 +206,13 @@ before   nop
          lda   [<before+4&$ff],y
          dfb   $a7,$a4
          lda   <before+6&$ff,x
-         lda   (zip+7,x)
+         dfb   $a1,$a6
          lda   before-$10f8,y
          lda   <after+6&$ff
          lda   (<after+7&$ff),y
 after    ldx   <after+8&$ff,y
          ldy   <after+9&$ff,x
-         pei   (zip+4)
+         dfb   $d4,$c4
          nop
          rts
 

SourceGen/SGTestData/Source/20032-labels-and-symbols.S

@@ -240,14 +240,14 @@ before  nop
         lda     [<before+4&$ff],y
         lda     [<before+5&$ff]
         lda     <before+6&$ff,x
-        lda     (<zip+7&$ff,x)                  ;all versions of Merlin 32 fail
+        dfb     $a1,$a6             ;lda     (<before+7&$ff,x)
         lda     <before+8&$ff,y
 
         lda     <after&$ff
         lda     (<after+1&$ff),y
         ldx     <after+2&$ff,y
         ldy     <after+3&$ff,x
-        pei     (<zip+4&$ff)
+        dfb     $d4,$c4             ;pei     (<zip+4&$ff)
 
 after   nop