Merge pull request #80 from AntiheroSoftware/ca65-65816

Fixing ca65 for 65816 jml and jmp opcodes

diff --git a/src/ca65/ea65.c b/src/ca65/ea65.c
index 48c4a2c0704289060ad39907480c388708f41831..21e9073aca44f3b14d63d073af68d563b0a74191 100644 (file)
--- a/src/ca65/ea65.c
+++ b/src/ca65/ea65.c
@@ -110,7 +110,7 @@ void GetEA (EffAddr* A)
             A->AddrModeSet = AM65_DIR_IND_LONG_Y;
         } else {
             /* [dir] */
-            A->AddrModeSet = AM65_DIR_IND_LONG;
+            A->AddrModeSet = AM65_DIR_IND_LONG | AM65_ABS_IND_LONG;
         }
 
     } else if (CurTok.Tok == TOK_LPAREN) {

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 777affdee177fead002a19b7eba440d76f6ca3a5..54e09b5016614b6322c99baaa08b3c4536551d89 100644 (file)
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -516,8 +516,8 @@ static const struct {
         { "INC",  0x000006F, 0x00, 4, PutAll },
         { "INX",  0x0000001, 0xe8, 0, PutAll },
         { "INY",  0x0000001, 0xc8, 0, PutAll },
-        { "JML",  0x0000810, 0x5c, 1, PutAll },
-        { "JMP",  0x0010818, 0x4c, 6, PutAll },
+        { "JML",  0x4000010, 0x5c, 1, PutAll },
+        { "JMP",  0x4010818, 0x4c, 6, PutAll },
         { "JSL",  0x0000010, 0x20, 7, PutAll },
         { "JSR",  0x0010018, 0x20, 7, PutAll },
         { "LDA",  0x0b8f6fc, 0xa0, 0, PutAll },
@@ -790,61 +790,61 @@ static unsigned char EATab[10][AM65I_COUNT] = {
         0x00, 0x00, 0x05, 0x0D, 0x0F, 0x15, 0x1D, 0x1F,
         0x00, 0x19, 0x12, 0x00, 0x07, 0x11, 0x17, 0x01,
         0x00, 0x00, 0x00, 0x03, 0x13, 0x09, 0x00, 0x09,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
     {   /* Table 1 */
         0x08, 0x08, 0x04, 0x0C, 0x00, 0x14, 0x1C, 0x00,
         0x14, 0x1C, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x70
     },
     {   /* Table 2 */
         0x00, 0x00, 0x24, 0x2C, 0x0F, 0x34, 0x3C, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
     {   /* Table 3 */
         0x3A, 0x3A, 0xC6, 0xCE, 0x00, 0xD6, 0xDE, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
     {   /* Table 4 */
         0x1A, 0x1A, 0xE6, 0xEE, 0x00, 0xF6, 0xFE, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
     {   /* Table 5 */
         0x00, 0x00, 0x60, 0x98, 0x00, 0x70, 0x9E, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
     {   /* Table 6 */
         0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
-        0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x30, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x90
     },
     {   /* Table 7 */
         0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
     {   /* Table 8 */
         0x00, 0x40, 0x01, 0x41, 0x00, 0x09, 0x49, 0x00,
         0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
     {   /* Table 9 */
         0x00, 0x00, 0x00, 0x10, 0x00, 0x20, 0x30, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
+        0x00, 0x00, 0x00
     },
 };
 
@@ -888,6 +888,7 @@ unsigned char ExtBytes[AM65I_COUNT] = {
     1,          /* Immidiate byte */
     2,          /* Blockmove (65816) */
     7,          /* Block transfer (HuC6280) */
+    2,          /* Absolute Indirect long */
 };
 
 /* Table that encodes the additional bytes for each SWEET16 instruction */

diff --git a/src/ca65/instr.h b/src/ca65/instr.h
index 9a219b42402ebaed7dbe0fbdbce345585896cc78..ead36a0c2dc3715347c76e59ef44153830086502 100644 (file)
--- a/src/ca65/instr.h
+++ b/src/ca65/instr.h
@@ -84,6 +84,7 @@
 #define AM65_IMM_IMPLICIT       0x00800000UL
 #define AM65_BLOCKMOVE          0x01000000UL
 #define AM65_BLOCKXFER          0x02000000UL
+#define AM65_ABS_IND_LONG       0x04000000UL
 
 /* Bitmask for all ZP operations that have correspondent ABS ops */
 #define AM65_SET_ZP     (AM65_DIR | AM65_DIR_X | AM65_DIR_Y | AM65_DIR_IND | AM65_DIR_X_IND)
@@ -107,7 +108,7 @@
 #define AM65I_IMM_ACCU          21
 #define AM65I_IMM_INDEX         22
 #define AM65I_IMM_IMPLICIT      23
-#define AM65I_COUNT             26
+#define AM65I_COUNT             27