Add 6502X cpu

git-svn-id: svn://svn.cc65.org/cc65/trunk@3017 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index b6fc51f01df4459c333ff050b76743ad159e1336..0ed9a0f7be1ee4fbc38cf7560d9f7c72a57c615d 100644 (file)
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -146,6 +146,74 @@ static const struct {
     }
 };
 
+/* Instruction table for the 6502 with illegal instructions */
+#define INS_COUNT_6502X                57
+static const struct {
+    unsigned Count;
+    InsDesc  Ins[INS_COUNT_6502X];
+} InsTab6502X = {
+    INS_COUNT_6502X,
+    {
+               { "ADC",  0x080A26C, 0x60, 0, PutAll },
+               { "AND",  0x080A26C, 0x20, 0, PutAll },
+               { "ASL",  0x000006e, 0x02, 1, PutAll },
+               { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
+               { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
+               { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
+               { "BIT",  0x000000C, 0x00, 2, PutAll },
+               { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
+               { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
+               { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
+               { "BRK",  0x0000001, 0x00, 0, PutAll },
+               { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
+               { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
+               { "CLC",  0x0000001, 0x18, 0, PutAll },
+               { "CLD",  0x0000001, 0xd8, 0, PutAll },
+               { "CLI",  0x0000001, 0x58, 0, PutAll },
+               { "CLV",  0x0000001, 0xb8, 0, PutAll },
+               { "CMP",  0x080A26C, 0xc0, 0, PutAll },
+               { "CPX",  0x080000C, 0xe0, 1, PutAll },
+               { "CPY",  0x080000C, 0xc0, 1, PutAll },
+               { "DEC",  0x000006C, 0x00, 3, PutAll },
+               { "DEX",  0x0000001, 0xca, 0, PutAll },
+               { "DEY",  0x0000001, 0x88, 0, PutAll },
+               { "EOR",  0x080A26C, 0x40, 0, PutAll },
+               { "INC",  0x000006c, 0x00, 4, PutAll },
+               { "INX",  0x0000001, 0xe8, 0, PutAll },
+               { "INY",  0x0000001, 0xc8, 0, PutAll },
+        { "JAM",  0x0000001, 0x02, 0, PutAll },         /* X */
+               { "JMP",  0x0000808, 0x4c, 6, PutJMP },
+               { "JSR",  0x0000008, 0x20, 7, PutAll },
+               { "LDA",  0x080A26C, 0xa0, 0, PutAll },
+               { "LDX",  0x080030C, 0xa2, 1, PutAll },
+               { "LDY",  0x080006C, 0xa0, 1, PutAll },
+               { "LSR",  0x000006F, 0x42, 1, PutAll },
+               { "NOP",  0x0000001, 0xea, 0, PutAll },
+               { "ORA",  0x080A26C, 0x00, 0, PutAll },
+               { "PHA",  0x0000001, 0x48, 0, PutAll },
+               { "PHP",  0x0000001, 0x08, 0, PutAll },
+               { "PLA",  0x0000001, 0x68, 0, PutAll },
+               { "PLP",  0x0000001, 0x28, 0, PutAll },
+               { "ROL",  0x000006F, 0x22, 1, PutAll },
+               { "ROR",  0x000006F, 0x62, 1, PutAll },
+               { "RTI",  0x0000001, 0x40, 0, PutAll },
+               { "RTS",  0x0000001, 0x60, 0, PutAll },
+               { "SBC",  0x080A26C, 0xe0, 0, PutAll },
+               { "SEC",  0x0000001, 0x38, 0, PutAll },
+               { "SED",  0x0000001, 0xf8, 0, PutAll },
+               { "SEI",  0x0000001, 0x78, 0, PutAll },
+               { "STA",  0x000A26C, 0x80, 0, PutAll },
+               { "STX",  0x000010c, 0x82, 1, PutAll },
+               { "STY",  0x000002c, 0x80, 1, PutAll },
+               { "TAX",  0x0000001, 0xaa, 0, PutAll },
+               { "TAY",  0x0000001, 0xa8, 0, PutAll },
+               { "TSX",  0x0000001, 0xba, 0, PutAll },
+               { "TXA",  0x0000001, 0x8a, 0, PutAll },
+               { "TXS",  0x0000001, 0x9a, 0, PutAll },
+               { "TYA",  0x0000001, 0x98, 0, PutAll }
+    }
+};
+
 /* Instruction table for the 65SC02 */
 #define INS_COUNT_65SC02       66
 static const struct {
@@ -454,6 +522,7 @@ static const struct {
 /* An array with instruction tables */
 static const InsTable* InsTabs[CPU_COUNT] = {
     (const InsTable*) &InsTab6502,
+    (const InsTable*) &InsTab6502X,
     (const InsTable*) &InsTab65SC02,
     (const InsTable*) &InsTab65C02,
     (const InsTable*) &InsTab65816,
@@ -483,7 +552,7 @@ unsigned char EATab [9][AMI_COUNT] = {
        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                        
     },
     {   /* Table 3 */
        0x3A, 0x3A, 0xC6, 0xCE, 0x00, 0xD6, 0xDE, 0x00,

diff --git a/src/ca65/macpack.c b/src/ca65/macpack.c
index bb657b26800257ffb67c729bc0a681afbd6b27bb..cc2119901f74f6ba2ea718448422e1c9b861b4ad 100644 (file)
--- a/src/ca65/macpack.c
+++ b/src/ca65/macpack.c
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/* (C) 1998-2004 Ullrich von Bassewitz                                       */
 /*               Römerstrasse 52                                             */
 /*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
@@ -186,15 +186,17 @@ static char MacCBM[] =
 /* CPU defines */
 static char MacCPU[] =
     "CPU_ISET_6502      = $01\n"
-    "CPU_ISET_65SC02    = $02\n"
-    "CPU_ISET_65C02     = $04\n"
-    "CPU_ISET_65816     = $08\n"
-    "CPU_ISET_SUNPLUS   = $10\n"
-    "CPU_6502           = $01\n"
-    "CPU_65SC02         = $03\n"
-    "CPU_65C02          = $07\n"
-    "CPU_65816          = $0F\n"
-    "CPU_SUNPLUS        = $10\n";
+    "CPU_ISET_6502X     = $02\n"
+    "CPU_ISET_65SC02    = $04\n"
+    "CPU_ISET_65C02     = $08\n"
+    "CPU_ISET_65816     = $10\n"
+    "CPU_ISET_SUNPLUS   = $20\n"
+    "CPU_6502           = CPU_ISET_6502\n"
+    "CPU_6502X          = CPU_ISET_6502|CPU_ISET_6502X\n"
+    "CPU_65SC02         = CPU_ISET_6502|CPU_ISET_65SC02\n"
+    "CPU_65C02          = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02\n"
+    "CPU_65816          = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65816\n"
+    "CPU_SUNPLUS        = CPU_ISET_SUNPLUS\n";
 
 
 

diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c
index 060d3a9d4cbc4c1fae6bffad29bb2146442916b3..cc041f7aed5c64c2b888cb8f77299e5177c8b307 100644 (file)
--- a/src/cc65/codegen.c
+++ b/src/cc65/codegen.c
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/* (C) 1998-2004 Ullrich von Bassewitz                                       */
 /*               Römerstraße 52                                              */
 /*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
@@ -167,6 +167,7 @@ void g_preamble (void)
     /* If we're producing code for some other CPU, switch the command set */
     switch (CPU) {
         case CPU_6502:      AddTextLine ("\t.setcpu\t\t\"6502\"");      break;
+        case CPU_6502X:     AddTextLine ("\t.setcpu\t\t\"6502X\"");     break;
         case CPU_65SC02:    AddTextLine ("\t.setcpu\t\t\"65SC02\"");    break;
         case CPU_65C02:     AddTextLine ("\t.setcpu\t\t\"65C02\"");     break;
         case CPU_65816:     AddTextLine ("\t.setcpu\t\t\"65816\"");     break;

diff --git a/src/cc65/main.c b/src/cc65/main.c
index ff6a52570ac032b037c9bf65541951a1e12081c8..980a086d7f93460bbaebead30a18b231c11cbe3e 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -397,7 +397,7 @@ static void OptCPU (const char* Opt, const char* Arg)
 {
     /* Find the CPU from the given name */
     CPU = FindCPU (Arg);
-    if (CPU != CPU_6502 && CPU != CPU_65SC02 &&
+    if (CPU != CPU_6502 && CPU != CPU_6502X && CPU != CPU_65SC02 &&
         CPU != CPU_65C02 && CPU != CPU_65816) {
                AbEnd ("Invalid argument for %s: `%s'", Opt, Arg);
     }