Merge remote-tracking branch 'upstream/master' into pcenginetarget

[cc65] / src / da65 / opctable.c

diff --git a/src/da65/opctable.c b/src/da65/opctable.c
index 3c9ab82438acddb6d2b29aaafde7fa768b5d104e..c85805faf8c96fb88e4048cc39a32c8c52893bed 100644 (file)
--- a/src/da65/opctable.c
+++ b/src/da65/opctable.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                               opctable.c                                 */
+/*                                opctable.c                                 */
 /*                                                                           */
-/*                  Disassembler opcode description table                   */
+/*                   Disassembler opcode description table                   */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2009 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -36,16 +36,18 @@
 /* da65 */
 #include "error.h"
 #include "opc6502.h"
+#include "opc6502x.h"
 #include "opc65816.h"
 #include "opc65c02.h"
 #include "opc65sc02.h"
 #include "opchuc6280.h"
+#include "opcm740.h"
 #include "opctable.h"
 
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
@@ -56,7 +58,7 @@ const OpcDesc* OpcTable = OpcTable_6502;
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -66,13 +68,11 @@ void SetOpcTable (cpu_t CPU)
 {
     switch (CPU) {
         case CPU_6502:    OpcTable = OpcTable_6502;     break;
+        case CPU_6502X:   OpcTable = OpcTable_6502X;    break;
         case CPU_65SC02:  OpcTable = OpcTable_65SC02;   break;
         case CPU_65C02:   OpcTable = OpcTable_65C02;    break;
         case CPU_HUC6280: OpcTable = OpcTable_HuC6280;  break;
+        case CPU_M740:    OpcTable = OpcTable_M740;     break;
         default:          Error ("Unsupported CPU");
     }
 }
-
-
-
-