actually make TAS work :)

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index c29ff744648c55cb54c1a7a1fb0296c0eb4d3e06..6acf8c94fdf74657d53eebc40dcebfef43218a2d 100644 (file)
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -280,7 +280,6 @@ static const struct {
         { "SED",  0x0000001, 0xf8, 0, PutAll },
         { "SEI",  0x0000001, 0x78, 0, PutAll },
         { "SHA",  0x0002200, 0x93, 1, PutAll },         /* X */
-        { "TAS",  0x0000200, 0x9b, 0, PutAll },         /* X */
         { "SHX",  0x0000200, 0x9e, 1, PutAll },         /* X */
         { "SHY",  0x0000040, 0x9c, 1, PutAll },         /* X */
         { "SLO",  0x000A26C, 0x03, 0, PutAll },         /* X */
@@ -288,6 +287,7 @@ static const struct {
         { "STA",  0x000A26C, 0x80, 0, PutAll },
         { "STX",  0x000010c, 0x82, 1, PutAll },
         { "STY",  0x000002c, 0x80, 1, PutAll },
+        { "TAS",  0x0000200, 0x9b, 0, PutAll },         /* X */
         { "TAX",  0x0000001, 0xaa, 0, PutAll },
         { "TAY",  0x0000001, 0xa8, 0, PutAll },
         { "TSX",  0x0000001, 0xba, 0, PutAll },

diff --git a/testcode/assembler/all.s b/testcode/assembler/all.s
index b1795f99b381e7513bcb9bb3c0fa3034c3e24db3..2e8f55ec7b3517b427c9b9803999687fedd09846 100644 (file)
--- a/testcode/assembler/all.s
+++ b/testcode/assembler/all.s
@@ -158,7 +158,7 @@
             tya                 ; 98
             sta $1234,y         ; 99 34 12
             txs                 ; 9a
-            shs $1234,y         ; 9b 34 12
+            tas $1234,y         ; 9b 34 12
             shy $1234,x         ; 9c 34 12
             sta $1234,x         ; 9d 34 12
             shx $1234,y         ; 9e 34 12

diff --git a/testcode/assembler/illegal.s b/testcode/assembler/illegal.s
index c73e2eba394c431a50a93113159331937a7b6875..b49b8876181cbc8931589429d7096c55ff39d94f 100644 (file)
--- a/testcode/assembler/illegal.s
+++ b/testcode/assembler/illegal.s
@@ -125,7 +125,7 @@
         shx $1234,y         ; 9e 34 12
         shy $1234,x         ; 9c 34 12
 
-        shs $1234,y         ; 9b 34 12
+        tas $1234,y         ; 9b 34 12
         las $1234,y         ; bb 34 12
 
 ; the two so-called "highly unstable" ones: