From 3b9032a7c4ef908ce2cd43467925bb0e45b62092 Mon Sep 17 00:00:00 2001
From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sun, 6 Feb 2011 16:04:46 +0000
Subject: [PATCH] Added disassembler support for the NMOS 6502 with illegal
 opcodes.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4966 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 doc/da65.sgml            |  10 +-
 src/da65/handler.c       |  14 +-
 src/da65/handler.h       |  18 +--
 src/da65/make/gcc.mak    |   1 +
 src/da65/make/watcom.mak |   1 +
 src/da65/opc6502.c       |  32 ++--
 src/da65/opc6502x.c      | 312 +++++++++++++++++++++++++++++++++++++++
 src/da65/opc6502x.h      |  61 ++++++++
 src/da65/opc65816.c      |  38 ++---
 src/da65/opc65c02.c      |  34 ++---
 src/da65/opc65sc02.c     |  34 ++---
 src/da65/opchuc6280.c    |  52 +++----
 src/da65/opctable.c      |  18 ++-
 13 files changed, 502 insertions(+), 123 deletions(-)
 create mode 100644 src/da65/opc6502x.c
 create mode 100644 src/da65/opc6502x.h

diff --git a/doc/da65.sgml b/doc/da65.sgml
index d1a860189..58d031eff 100644
--- a/doc/da65.sgml
+++ b/doc/da65.sgml
@@ -107,9 +107,10 @@ Here is a description of all the command line options:
 
   Set the CPU type. The option takes a parameter, which may be one of
 
-       	6502, 65SC02, 65C02
+       	6502, 6502x, 65sc02, 65c02, huc6280
 
-  Support for the 65816 is currently not available.
+  6502x is the NMOS 6502 with illegal opcodes. huc6280 is the CPU of the PC
+  engine. Support for the 65816 is currently not available.
 
 
   <label id="option--formfeeds">
@@ -320,7 +321,8 @@ following attributes are recognized:
 
   <tag><tt/CPU/</tag>
   This attribute may be used instead of the <tt><ref id="option--cpu"
-  name="--cpu"></tt> option on the command line. It takes a string parameter.
+  name="--cpu"></tt> option on the command line. For possible values see
+  there. The value is a string and must be enclosed in quotes.
 
 
   <tag><tt/HEXOFFS/</tag>
@@ -372,7 +374,7 @@ following attributes are recognized:
 
   <tag><tt/NEWLINEAFTERRTS/</tag>
   This attribute is followed by a boolean value. When true, a newline is
-  inserted after each <tt/RTS/ instruction. The default is false.       
+  inserted after each <tt/RTS/ instruction. The default is false.
 
 
   <label id="OUTPUTNAME">
diff --git a/src/da65/handler.c b/src/da65/handler.c
index b5c2005ea..8d94f35f8 100644
--- a/src/da65/handler.c
+++ b/src/da65/handler.c
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/* (C) 2000-2011, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -219,7 +219,7 @@ void OH_Implicit (const OpcDesc* D)
 
 
 
-void OH_Immidiate (const OpcDesc* D)
+void OH_Immediate (const OpcDesc* D)
 {
     OneLine (D, "#$%02X", GetCodeByte (PC+1));
 }
@@ -427,7 +427,7 @@ void OH_BitBranch (const OpcDesc* D)
 
 
 
-void OH_ImmidiateDirect (const OpcDesc* D)
+void OH_ImmediateDirect (const OpcDesc* D)
 {
     /* Get the operand */
     unsigned Addr = GetCodeByte (PC+2);
@@ -441,7 +441,7 @@ void OH_ImmidiateDirect (const OpcDesc* D)
 
 
 
-void OH_ImmidiateDirectX (const OpcDesc* D)
+void OH_ImmediateDirectX (const OpcDesc* D)
 {
     /* Get the operand */
     unsigned Addr = GetCodeByte (PC+2);
@@ -455,7 +455,7 @@ void OH_ImmidiateDirectX (const OpcDesc* D)
 
 
 
-void OH_ImmidiateAbsolute (const OpcDesc* D)
+void OH_ImmediateAbsolute (const OpcDesc* D)
 {
     /* Get the operand */
     unsigned Addr = GetCodeWord (PC+2);
@@ -469,7 +469,7 @@ void OH_ImmidiateAbsolute (const OpcDesc* D)
 
 
 
-void OH_ImmidiateAbsoluteX (const OpcDesc* D)
+void OH_ImmediateAbsoluteX (const OpcDesc* D)
 {
     /* Get the operand */
     unsigned Addr = GetCodeWord (PC+2);
@@ -580,7 +580,7 @@ void OH_JmpAbsoluteIndirect (const OpcDesc* D)
     if (NewlineAfterJMP) {
         LineFeed ();
     }
-    SeparatorLine ();  
+    SeparatorLine ();
 }
 
 
diff --git a/src/da65/handler.h b/src/da65/handler.h
index 98804743c..e39a08f21 100644
--- a/src/da65/handler.h
+++ b/src/da65/handler.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (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       */
@@ -56,7 +56,7 @@
 void OH_Illegal (const OpcDesc* D attribute ((unused)));
 void OH_Accumulator (const OpcDesc*);
 void OH_Implicit (const OpcDesc*);
-void OH_Immidiate (const OpcDesc*);
+void OH_Immediate (const OpcDesc*);
 void OH_Direct (const OpcDesc*);
 void OH_DirectX (const OpcDesc*);
 void OH_DirectY (const OpcDesc*);
@@ -74,10 +74,10 @@ void OH_AbsoluteIndirect (const OpcDesc*);
 
 void OH_BitBranch (const OpcDesc*);
 
-void OH_ImmidiateDirect (const OpcDesc*);
-void OH_ImmidiateDirectX (const OpcDesc*);
-void OH_ImmidiateAbsolute (const OpcDesc*);
-void OH_ImmidiateAbsoluteX (const OpcDesc*);
+void OH_ImmediateDirect (const OpcDesc*);
+void OH_ImmediateDirectX (const OpcDesc*);
+void OH_ImmediateAbsolute (const OpcDesc*);
+void OH_ImmediateAbsoluteX (const OpcDesc*);
 
 void OH_StackRelative (const OpcDesc*);
 void OH_DirectIndirectLongX (const OpcDesc*);
diff --git a/src/da65/make/gcc.mak b/src/da65/make/gcc.mak
index 06b5adad1..4346c8260 100644
--- a/src/da65/make/gcc.mak
+++ b/src/da65/make/gcc.mak
@@ -33,6 +33,7 @@ OBJS = 	asminc.o        \
 	labels.o        \
 	main.o	 	\
 	opc6502.o       \
+        opc6502x.o      \
 	opc65816.o      \
 	opc65c02.o      \
 	opc65sc02.o     \
diff --git a/src/da65/make/watcom.mak b/src/da65/make/watcom.mak
index ef1615ba4..bab4f8541 100644
--- a/src/da65/make/watcom.mak
+++ b/src/da65/make/watcom.mak
@@ -72,6 +72,7 @@ OBJS = 	asminc.obj      \
         labels.obj      \
 	main.obj   	\
         opc6502.obj     \
+        opc6502x.obj    \
         opc65816.obj    \
         opc65c02.obj    \
         opc65sc02.obj   \
diff --git a/src/da65/opc6502.c b/src/da65/opc6502.c
index a91414ae4..754d8f14e 100644
--- a/src/da65/opc6502.c
+++ b/src/da65/opc6502.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				   opc6502.h				     */
+/*				   opc6502.c				     */
 /*                                                                           */
 /*                       6502 opcode description table                       */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -56,7 +56,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $07 */
     {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
-    {   "ora",  2,  flNone,                   OH_Immidiate             }, /* $09 */
+    {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
     {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $0b */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $0c */
@@ -88,7 +88,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $27 */
     {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
-    {   "and",  2,  flNone,                   OH_Immidiate             }, /* $29 */
+    {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
     {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $2b */
     {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
@@ -120,7 +120,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $47 */
     {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
-    {   "eor",  2,  flNone,                   OH_Immidiate             }, /* $49 */
+    {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
     {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $4b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
@@ -152,7 +152,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $67 */
     {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
-    {   "adc",  2,  flNone,                   OH_Immidiate             }, /* $69 */
+    {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
     {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $6b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
@@ -207,16 +207,16 @@ const OpcDesc OpcTable_6502[256] = {
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $9e */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $9f */
-    {   "ldy",  2,  flNone,                   OH_Immidiate             }, /* $a0 */
+    {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
-    {   "ldx",  2,  flNone,                   OH_Immidiate             }, /* $a2 */
+    {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $a3 */
     {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
     {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
     {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $a7 */
     {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
-    {   "lda",  2,  flNone,                   OH_Immidiate             }, /* $a9 */
+    {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
     {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $ab */
     {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
@@ -239,7 +239,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
     {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $bf */
-    {   "cpy",  2,  flNone,                   OH_Immidiate             }, /* $c0 */
+    {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
     {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c3 */
@@ -248,7 +248,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c7 */
     {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
-    {   "cmp",  2,  flNone,                   OH_Immidiate             }, /* $c9 */
+    {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
     {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $cb */
     {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
@@ -271,7 +271,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $df */
-    {   "cpx",  2,  flNone,                   OH_Immidiate             }, /* $e0 */
+    {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
     {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e3 */
@@ -280,7 +280,7 @@ const OpcDesc OpcTable_6502[256] = {
     {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e7 */
     {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
-    {   "sbc",  2,  flNone,                   OH_Immidiate             }, /* $e9 */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
     {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $eb */
     {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
diff --git a/src/da65/opc6502x.c b/src/da65/opc6502x.c
new file mode 100644
index 000000000..7b5080194
--- /dev/null
+++ b/src/da65/opc6502x.c
@@ -0,0 +1,312 @@
+/*****************************************************************************/
+/*                                                                           */
+/*		  		   opc6502.c				     */
+/*                                                                           */
+/*             6502 opcode description table with NMOS illegals              */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+/* da65 */
+#include "handler.h"
+#include "opc6502x.h"
+
+
+
+/*****************************************************************************/
+/*		  	   	     Data		  		     */
+/*****************************************************************************/
+
+
+
+/* Descriptions for all opcodes. Base table from opc6502.c with illegal
+ * opcodes from http://www.oxyron.de/html/opcodes02.html
+ */
+const OpcDesc OpcTable_6502X[256] = {
+    {   "brk",  1,  flNone,                   OH_Implicit              }, /* $00 */
+    {   "ora",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $01 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $02 */
+    {   "slo",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $03 */
+    {   "nop",  2,  flUseLabel,               OH_Direct                }, /* $04 */
+    {   "ora",  2,  flUseLabel,               OH_Direct                }, /* $05 */
+    {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
+    {   "slo",  2,  flUseLabel,               OH_Direct                }, /* $07 */
+    {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
+    {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
+    {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
+    {   "anc",  2,  flNone,                   OH_Immediate             }, /* $0b */
+    {   "nop",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0e */
+    {   "slo",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0f */
+    {   "bpl",  2,  flLabel,                  OH_Relative              }, /* $10 */
+    {   "ora",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $11 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $12 */
+    {   "slo",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $13 */
+    {   "nop",  2,  flUseLabel,               OH_DirectX               }, /* $14 */
+    {   "ora",  2,  flUseLabel,               OH_DirectX               }, /* $15 */
+    {   "asl",  2,  flUseLabel,               OH_DirectX               }, /* $16 */
+    {   "slo",  2,  flUseLabel,               OH_DirectX               }, /* $17 */
+    {   "clc",  1,  flNone,                   OH_Implicit              }, /* $18 */
+    {   "ora",  3,  flUseLabel,               OH_AbsoluteY             }, /* $19 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $1a */
+    {   "slo",  3,  flUseLabel,               OH_AbsoluteY             }, /* $1b */
+    {   "nop",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1e */
+    {   "slo",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1f */
+    {   "jsr",  3,  flLabel,                  OH_Absolute              }, /* $20 */
+    {   "and",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $21 */
+    {   "kil",  1,  flNone,                   OH_Implicit,             }, /* $22 */
+    {   "rla",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $23 */
+    {   "bit",  2,  flUseLabel,               OH_Direct                }, /* $24 */
+    {   "and",  2,  flUseLabel,               OH_Direct                }, /* $25 */
+    {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
+    {   "rla",  2,  flUseLabel,               OH_Direct                }, /* $27 */
+    {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
+    {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
+    {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
+    {   "anc",  2,  flNone,                   OH_Immediate             }, /* $2b */
+    {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2e */
+    {   "rla",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2f */
+    {   "bmi",  2,  flLabel,                  OH_Relative              }, /* $30 */
+    {   "and",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $31 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $32 */
+    {   "rla",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $33 */
+    {   "nop",  2,  flUseLabel,               OH_DirectX               }, /* $34 */
+    {   "and",  2,  flUseLabel,               OH_DirectX               }, /* $35 */
+    {   "rol",  2,  flUseLabel,               OH_DirectX               }, /* $36 */
+    {   "rla",  2,  flUseLabel,               OH_DirectX               }, /* $37 */
+    {   "sec",  1,  flNone,                   OH_Implicit              }, /* $38 */
+    {   "and",  3,  flUseLabel,               OH_AbsoluteY             }, /* $39 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $3a */
+    {   "rla",  3,  flUseLabel,               OH_AbsoluteY             }, /* $3b */
+    {   "nop",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3e */
+    {   "rla",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3f */
+    {   "rti",  1,  flNone,                   OH_Rts                   }, /* $40 */
+    {   "eor",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $41 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $42 */
+    {   "sre",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $43 */
+    {   "nop",  2,  flUseLabel,               OH_Direct                }, /* $44 */
+    {   "eor",  2,  flUseLabel,               OH_Direct                }, /* $45 */
+    {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
+    {   "sre",  2,  flUseLabel,               OH_Direct                }, /* $47 */
+    {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
+    {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
+    {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
+    {   "alr",  2,  flNone,                   OH_Immediate             }, /* $4b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $4d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $4e */
+    {   "sre",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $4f */
+    {   "bvc",  2,  flLabel,                  OH_Relative              }, /* $50 */
+    {   "eor",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $51 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $52 */
+    {   "sre",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $53 */
+    {   "nop",  2,  flUseLabel,               OH_DirectX               }, /* $54 */
+    {   "eor",  2,  flUseLabel,               OH_DirectX               }, /* $55 */
+    {   "lsr",  2,  flUseLabel,               OH_DirectX               }, /* $56 */
+    {   "sre",  2,  flUseLabel,               OH_DirectX               }, /* $57 */
+    {   "cli",  1,  flNone,                   OH_Implicit              }, /* $58 */
+    {   "eor",  3,  flUseLabel,               OH_AbsoluteY             }, /* $59 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $5a */
+    {   "sre",  3,  flUseLabel,               OH_AbsoluteY             }, /* $5b */
+    {   "nop",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5e */
+    {   "sre",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5f */
+    {   "rts",  1,  flNone,                   OH_Rts                   }, /* $60 */
+    {   "adc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $61 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $62 */
+    {   "rra",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $63 */
+    {   "nop",  2,  flUseLabel,               OH_Direct                }, /* $64 */
+    {   "adc",  2,  flUseLabel,               OH_Direct                }, /* $65 */
+    {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
+    {   "rra",  2,  flUseLabel,               OH_Direct                }, /* $67 */
+    {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
+    {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
+    {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
+    {   "arr",  2,  flNone,                   OH_Immediate             }, /* $6b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $6d */
+    {   "ror",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $6e */
+    {   "rra",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $6f */
+    {   "bvs",  2,  flLabel,                  OH_Relative              }, /* $70 */
+    {   "adc",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $71 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $72 */
+    {   "rra",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $73 */
+    {   "nop",  2,  flUseLabel,               OH_DirectX               }, /* $74 */
+    {   "adc",  2,  flUseLabel,               OH_DirectX               }, /* $75 */
+    {   "ror",  2,  flUseLabel,               OH_DirectX               }, /* $76 */
+    {   "rra",  2,  flUseLabel,               OH_DirectX               }, /* $77 */
+    {   "sei",  1,  flNone,                   OH_Implicit              }, /* $78 */
+    {   "adc",  3,  flUseLabel,               OH_AbsoluteY             }, /* $79 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $7a */
+    {   "rra",  3,  flUseLabel,               OH_AbsoluteY             }, /* $7b */
+    {   "nop",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7d */
+    {   "ror",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7e */
+    {   "rra",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7f */
+    {   "nop",  2,  flNone,                   OH_Immediate             }, /* $80 */
+    {   "sta",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $81 */
+    {   "nop",  2,  flNone,                   OH_Immediate             }, /* $82 */
+    {   "sax",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $83 */
+    {   "sty",  2,  flUseLabel,               OH_Direct                }, /* $84 */
+    {   "sta",  2,  flUseLabel,               OH_Direct                }, /* $85 */
+    {   "stx",  2,  flUseLabel,               OH_Direct                }, /* $86 */
+    {   "sax",  2,  flUseLabel,               OH_Direct                }, /* $87 */
+    {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
+    {   "nop",  2,  flNone,                   OH_Immediate             }, /* $89 */
+    {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
+    {   "xaa",  2,  flNone,                   OH_Immediate             }, /* $8b */
+    {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8d */
+    {   "stx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8e */
+    {   "sax",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8f */
+    {   "bcc",  2,  flLabel,                  OH_Relative              }, /* $90 */
+    {   "sta",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $91 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $92 */
+    {   "ahx",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $93 */
+    {   "sty",  2,  flUseLabel,               OH_DirectX               }, /* $94 */
+    {   "sta",  2,  flUseLabel,               OH_DirectX               }, /* $95 */
+    {   "stx",  2,  flUseLabel,               OH_DirectY               }, /* $96 */
+    {   "sax",  2,  flUseLabel,               OH_DirectY               }, /* $97 */
+    {   "tya",  1,  flNone,                   OH_Implicit              }, /* $98 */
+    {   "sta",  3,  flUseLabel,               OH_AbsoluteY             }, /* $99 */
+    {   "txs",  1,  flNone,                   OH_Implicit              }, /* $9a */
+    {   "tas",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9b */
+    {   "shy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
+    {   "shx",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9e */
+    {   "ahx",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9f */
+    {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
+    {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
+    {   "lax",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a3 */
+    {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
+    {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
+    {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
+    {   "lax",  2,  flUseLabel,               OH_Direct                }, /* $a7 */
+    {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
+    {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
+    {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
+    {   "lax",  2,  flNone,                   OH_Immediate             }, /* $ab */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ad */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ae */
+    {   "lax",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $af */
+    {   "bcs",  2,  flLabel,                  OH_Relative              }, /* $b0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $b1 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $b2 */
+    {   "lax",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $b3 */
+    {   "ldy",  2,  flUseLabel,               OH_DirectX               }, /* $b4 */
+    {   "lda",  2,  flUseLabel,               OH_DirectX               }, /* $b5 */
+    {   "ldx",  2,  flUseLabel,               OH_DirectY               }, /* $b6 */
+    {   "lax",  2,  flUseLabel,               OH_DirectY               }, /* $b7 */
+    {   "clv",  1,  flNone,                   OH_Implicit              }, /* $b8 */
+    {   "lda",  3,  flUseLabel,               OH_AbsoluteY             }, /* $b9 */
+    {   "tsx",  1,  flNone,                   OH_Implicit              }, /* $ba */
+    {   "las",  3,  flUseLabel,               OH_AbsoluteY             }, /* $bb */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bc */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
+    {   "lax",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $bf */
+    {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
+    {   "nop",  2,  flNone,                   OH_Immediate             }, /* $c2 */
+    {   "dcp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c3 */
+    {   "cpy",  2,  flUseLabel,               OH_Direct                }, /* $c4 */
+    {   "cmp",  2,  flUseLabel,               OH_Direct                }, /* $c5 */
+    {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
+    {   "dcp",  2,  flUseLabel,               OH_Direct                }, /* $c7 */
+    {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
+    {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
+    {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
+    {   "axs",  2,  flNone,                   OH_Immediate             }, /* $cb */
+    {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ce */
+    {   "dcp",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cf */
+    {   "bne",  2,  flLabel,                  OH_Relative              }, /* $d0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $d1 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $d2 */
+    {   "dcp",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $d3 */
+    {   "nop",  2,  flUseLabel,               OH_DirectX               }, /* $d4 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectX               }, /* $d5 */
+    {   "dec",  2,  flUseLabel,               OH_DirectX               }, /* $d6 */
+    {   "dcp",  2,  flUseLabel,               OH_DirectX               }, /* $d7 */
+    {   "cld",  1,  flNone,                   OH_Implicit              }, /* $d8 */
+    {   "cmp",  3,  flUseLabel,               OH_AbsoluteY             }, /* $d9 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $da */
+    {   "dcp",  3,  flUseLabel,               OH_AbsoluteY             }, /* $db */
+    {   "nop",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
+    {   "dcp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $df */
+    {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
+    {   "nop",  2,  flNone,                   OH_Immediate             }, /* $e2 */
+    {   "isc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e3 */
+    {   "cpx",  2,  flUseLabel,               OH_Direct                }, /* $e4 */
+    {   "sbc",  2,  flUseLabel,               OH_Direct                }, /* $e5 */
+    {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
+    {   "isc",  2,  flUseLabel,               OH_Direct                }, /* $e7 */
+    {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $eb */
+    {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ed */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ee */
+    {   "isc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ef */
+    {   "beq",  2,  flLabel,                  OH_Relative              }, /* $f0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $f1 */
+    {   "kil",  1,  flNone,                   OH_Implicit              }, /* $f2 */
+    {   "isc",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $f3 */
+    {   "nop",  2,  flUseLabel,               OH_DirectX               }, /* $f4 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectX               }, /* $f5 */
+    {   "inc",  2,  flUseLabel,               OH_DirectX               }, /* $f6 */
+    {   "isc",  2,  flUseLabel,               OH_DirectX               }, /* $f7 */
+    {   "sed",  1,  flNone,                   OH_Implicit              }, /* $f8 */
+    {   "sbc",  3,  flUseLabel,               OH_AbsoluteY             }, /* $f9 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $fa */
+    {   "isc",  3,  flUseLabel,               OH_AbsoluteY             }, /* $fb */
+    {   "nop",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $fc */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $fd */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $fe */
+    {   "isc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $ff */
+};
+
+
+
+
diff --git a/src/da65/opc6502x.h b/src/da65/opc6502x.h
new file mode 100644
index 000000000..85a420fd0
--- /dev/null
+++ b/src/da65/opc6502x.h
@@ -0,0 +1,61 @@
+/*****************************************************************************/
+/*                                                                           */
+/*				   opc6502.h				     */
+/*                                                                           */
+/*             6502 opcode description table with NMOS illegals              */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef OPC6502X_H
+#define OPC6502X_H
+
+
+
+#include "opcdesc.h"
+
+
+
+/*****************************************************************************/
+/*				     Data				     */
+/*****************************************************************************/
+
+
+
+/* Descriptions for all opcodes */
+extern const OpcDesc OpcTable_6502X[256];
+
+
+
+/* End of opc6502x.h */
+#endif
+
+
+
+                  
diff --git a/src/da65/opc65816.c b/src/da65/opc65816.c
index f081be223..b5afbcacf 100644
--- a/src/da65/opc65816.c
+++ b/src/da65/opc65816.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				   opc65816.h				     */
+/*				   opc65816.c				     */
 /*                                                                           */
 /*                       65816 opcode description table                      */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -56,7 +56,7 @@ const OpcDesc OpcTable_65816[256] = {
     {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
     {   "ora",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $07 */
     {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
-    {   "ora",  2,  flNone,                   OH_Immidiate             }, /* $09 */
+    {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
     {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
     {   "phd",  1,  flNone,                   OH_Implicit              }, /* $0b */
     {   "tsb",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0c */
@@ -88,7 +88,7 @@ const OpcDesc OpcTable_65816[256] = {
     {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
     {   "and",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $27 */
     {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
-    {   "and",  2,  flNone,                   OH_Immidiate             }, /* $29 */
+    {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
     {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
     {   "pld",  1,  flNone,                   OH_Implicit              }, /* $2b */
     {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
@@ -120,7 +120,7 @@ const OpcDesc OpcTable_65816[256] = {
     {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
     {   "eor",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $47 */
     {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
-    {   "eor",  2,  flNone,                   OH_Immidiate             }, /* $49 */
+    {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
     {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
     {   "phk",  1,  flNone,                   OH_Implicit              }, /* $4b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
@@ -152,7 +152,7 @@ const OpcDesc OpcTable_65816[256] = {
     {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
     {   "adc",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $67 */
     {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
-    {   "adc",  2,  flNone,                   OH_Immidiate             }, /* $69 */
+    {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
     {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
     {   "rtl",  1,  flNone,                   OH_Implicit              }, /* $6b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
@@ -184,7 +184,7 @@ const OpcDesc OpcTable_65816[256] = {
     {   "stx",  2,  flUseLabel,               OH_Direct                }, /* $86 */
     {   "sta",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $87 */
     {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
-    {   "bit",  2,  flNone,                   OH_Immidiate             }, /* $89 */
+    {   "bit",  2,  flNone,                   OH_Immediate             }, /* $89 */
     {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
     {   "phb",  1,  flNone,                   OH_Implicit              }, /* $8b */
     {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
@@ -207,16 +207,16 @@ const OpcDesc OpcTable_65816[256] = {
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "stz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9e */
     {   "sta",  4,  flUseLabel,               OH_AbsoluteLongX         }, /* $9f */
-    {   "ldy",  2,  flNone,                   OH_Immidiate             }, /* $a0 */
+    {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
-    {   "ldx",  2,  flNone,                   OH_Immidiate             }, /* $a2 */
+    {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
     {   "lda",  2,  flNone,                   OH_StackRelative         }, /* $a3 */
     {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
     {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
     {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
     {   "lda",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $a7 */
     {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
-    {   "lda",  2,  flNone,                   OH_Immidiate             }, /* $a9 */
+    {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
     {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
     {   "plb",  1,  flNone,                   OH_Implicit              }, /* $ab */
     {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
@@ -239,16 +239,16 @@ const OpcDesc OpcTable_65816[256] = {
     {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
     {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
     {   "lda",  4,  flUseLabel,               OH_AbsoluteLongX         }, /* $bf */
-    {   "cpy",  2,  flNone,                   OH_Immidiate             }, /* $c0 */
+    {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
     {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
-    {   "rep",  2,  flNone,                   OH_Immidiate             }, /* $c2 */
+    {   "rep",  2,  flNone,                   OH_Immediate             }, /* $c2 */
     {   "cmp",  2,  flNone,                   OH_StackRelative         }, /* $c3 */
     {   "cpy",  2,  flUseLabel,               OH_Direct                }, /* $c4 */
     {   "cmp",  2,  flUseLabel,               OH_Direct                }, /* $c5 */
     {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
     {   "cmp",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $c7 */
     {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
-    {   "cmp",  2,  flNone,                   OH_Immidiate             }, /* $c9 */
+    {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
     {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
     {   "wai",  1,  flNone,                   OH_Implicit              }, /* $cb */
     {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
@@ -271,16 +271,16 @@ const OpcDesc OpcTable_65816[256] = {
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
     {   "cmp",  4,  flUseLabel,               OH_AbsoluteLongX         }, /* $df */
-    {   "cpx",  2,  flNone,                   OH_Immidiate             }, /* $e0 */
+    {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
     {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
-    {   "sep",  2,  flNone,                   OH_Immidiate             }, /* $e2 */
+    {   "sep",  2,  flNone,                   OH_Immediate             }, /* $e2 */
     {   "sbc",  2,  flNone,                   OH_StackRelative         }, /* $e3 */
     {   "cpx",  2,  flUseLabel,               OH_Direct                }, /* $e4 */
     {   "sbc",  2,  flUseLabel,               OH_Direct                }, /* $e5 */
     {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
     {   "sbc",  2,  flUseLabel,               OH_DirectIndirectLong    }, /* $e7 */
     {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
-    {   "sbc",  2,  flNone,                   OH_Immidiate             }, /* $e9 */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
     {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
     {   "xba",  1,  flNone,                   OH_Implicit              }, /* $eb */
     {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
diff --git a/src/da65/opc65c02.c b/src/da65/opc65c02.c
index 62a15d82b..a451e5272 100644
--- a/src/da65/opc65c02.c
+++ b/src/da65/opc65c02.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				   opc65c02.h				     */
+/*				   opc65c02.c				     */
 /*                                                                           */
 /*                       65C02 opcode description table                      */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -56,7 +56,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
     {   "rmb0", 2,  flUseLabel,               OH_Direct,               }, /* $07 */
     {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
-    {   "ora",  2,  flNone,                   OH_Immidiate             }, /* $09 */
+    {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
     {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $0b */
     {   "tsb",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0c */
@@ -88,7 +88,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
     {   "rmb2", 2,  flUseLabel,               OH_Direct,               }, /* $27 */
     {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
-    {   "and",  2,  flNone,                   OH_Immidiate             }, /* $29 */
+    {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
     {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $2b */
     {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
@@ -120,7 +120,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
     {   "rmb4", 2,  flUseLabel,               OH_Direct,               }, /* $47 */
     {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
-    {   "eor",  2,  flNone,                   OH_Immidiate             }, /* $49 */
+    {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
     {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $4b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
@@ -152,7 +152,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
     {   "rmb6", 2,  flUseLabel,               OH_Direct,               }, /* $67 */
     {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
-    {   "adc",  2,  flNone,                   OH_Immidiate             }, /* $69 */
+    {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
     {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $6b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
@@ -184,7 +184,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "stx",  2,  flUseLabel,               OH_Direct                }, /* $86 */
     {   "smb0", 2,  flUseLabel,               OH_Direct,               }, /* $87 */
     {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
-    {   "bit",  2,  flNone,                   OH_Immidiate             }, /* $89 */
+    {   "bit",  2,  flNone,                   OH_Immediate             }, /* $89 */
     {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $8b */
     {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
@@ -207,16 +207,16 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "stz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9e */
     {   "bbs1", 3,  flUseLabel,               OH_BitBranch             }, /* $9f */
-    {   "ldy",  2,  flNone,                   OH_Immidiate             }, /* $a0 */
+    {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
-    {   "ldx",  2,  flNone,                   OH_Immidiate             }, /* $a2 */
+    {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $a3 */
     {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
     {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
     {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
     {   "smb2", 2,  flUseLabel,               OH_Direct,               }, /* $a7 */
     {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
-    {   "lda",  2,  flNone,                   OH_Immidiate             }, /* $a9 */
+    {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
     {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $ab */
     {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
@@ -239,7 +239,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
     {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
     {   "bbs3", 3,  flUseLabel,               OH_BitBranch             }, /* $bf */
-    {   "cpy",  2,  flNone,                   OH_Immidiate             }, /* $c0 */
+    {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
     {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c3 */
@@ -248,7 +248,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
     {   "smb4", 2,  flUseLabel,               OH_Direct,               }, /* $c7 */
     {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
-    {   "cmp",  2,  flNone,                   OH_Immidiate             }, /* $c9 */
+    {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
     {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $cb */
     {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
@@ -271,7 +271,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
     {   "bbs5", 3,  flUseLabel,               OH_BitBranch             }, /* $df */
-    {   "cpx",  2,  flNone,                   OH_Immidiate             }, /* $e0 */
+    {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
     {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e3 */
@@ -280,7 +280,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
     {   "smb6", 2,  flUseLabel,               OH_Direct,               }, /* $e7 */
     {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
-    {   "sbc",  2,  flNone,                   OH_Immidiate             }, /* $e9 */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
     {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $eb */
     {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
diff --git a/src/da65/opc65sc02.c b/src/da65/opc65sc02.c
index d5f71f664..5f447dd3e 100644
--- a/src/da65/opc65sc02.c
+++ b/src/da65/opc65sc02.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				  opc65sc02.h				     */
+/*				  opc65sc02.c				     */
 /*                                                                           */
 /*                      65SC02 opcode description table                      */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -56,7 +56,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $07 */
     {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
-    {   "ora",  2,  flNone,                   OH_Immidiate             }, /* $09 */
+    {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
     {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $0b */
     {   "tsb",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0c */
@@ -88,7 +88,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $27 */
     {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
-    {   "and",  2,  flNone,                   OH_Immidiate             }, /* $29 */
+    {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
     {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $2b */
     {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
@@ -120,7 +120,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $47 */
     {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
-    {   "eor",  2,  flNone,                   OH_Immidiate             }, /* $49 */
+    {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
     {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $4b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
@@ -152,7 +152,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $67 */
     {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
-    {   "adc",  2,  flNone,                   OH_Immidiate             }, /* $69 */
+    {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
     {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $6b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
@@ -184,7 +184,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "stx",  2,  flUseLabel,               OH_Direct                }, /* $86 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $87 */
     {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
-    {   "bit",  2,  flNone,                   OH_Immidiate             }, /* $89 */
+    {   "bit",  2,  flNone,                   OH_Immediate             }, /* $89 */
     {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $8b */
     {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
@@ -207,16 +207,16 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "stz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9e */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $9f */
-    {   "ldy",  2,  flNone,                   OH_Immidiate             }, /* $a0 */
+    {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
-    {   "ldx",  2,  flNone,                   OH_Immidiate             }, /* $a2 */
+    {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $a3 */
     {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
     {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
     {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $a7 */
     {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
-    {   "lda",  2,  flNone,                   OH_Immidiate             }, /* $a9 */
+    {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
     {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $ab */
     {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
@@ -239,7 +239,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
     {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $bf */
-    {   "cpy",  2,  flNone,                   OH_Immidiate             }, /* $c0 */
+    {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
     {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c3 */
@@ -248,7 +248,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c7 */
     {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
-    {   "cmp",  2,  flNone,                   OH_Immidiate             }, /* $c9 */
+    {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
     {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $cb */
     {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
@@ -271,7 +271,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $df */
-    {   "cpx",  2,  flNone,                   OH_Immidiate             }, /* $e0 */
+    {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
     {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e2 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e3 */
@@ -280,7 +280,7 @@ const OpcDesc OpcTable_65SC02[256] = {
     {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e7 */
     {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
-    {   "sbc",  2,  flNone,                   OH_Immidiate             }, /* $e9 */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
     {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $eb */
     {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
diff --git a/src/da65/opchuc6280.c b/src/da65/opchuc6280.c
index 1c0fc8383..de37c41d2 100644
--- a/src/da65/opchuc6280.c
+++ b/src/da65/opchuc6280.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				  opchuc6280.h 	       	       	       	     */
+/*				  opchuc6280.c 	       	       	       	     */
 /*                                                                           */
 /*                     HuC6280 opcode description table                      */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               R?merstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -50,13 +50,13 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "brk",  1,  flNone,                   OH_Implicit              }, /* $00 */
     {   "ora",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $01 */
     {   "sxy",  1,  flNone,                   OH_Implicit,             }, /* $02 */
-    {   "st0",  2,  flNone,                   OH_Immidiate,            }, /* $03 */
+    {   "st0",  2,  flNone,                   OH_Immediate,            }, /* $03 */
     {   "tsb",  2,  flUseLabel,               OH_Direct                }, /* $04 */
     {   "ora",  2,  flUseLabel,               OH_Direct                }, /* $05 */
     {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
     {   "rmb0", 1,  flUseLabel,               OH_Direct,               }, /* $07 */
     {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
-    {   "ora",  2,  flNone,                   OH_Immidiate             }, /* $09 */
+    {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
     {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $0b */
     {   "tsb",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0c */
@@ -66,7 +66,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "bpl",  2,  flLabel,                  OH_Relative              }, /* $10 */
     {   "ora",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $11 */
     {   "ora",  2,  flUseLabel,               OH_DirectIndirect        }, /* $12 */
-    {   "st1",  2,  flNone,                   OH_Immidiate,            }, /* $13 */
+    {   "st1",  2,  flNone,                   OH_Immediate,            }, /* $13 */
     {   "trb",  2,  flUseLabel,               OH_Direct                }, /* $14 */
     {   "ora",  2,  flUseLabel,               OH_DirectX               }, /* $15 */
     {   "asl",  2,  flUseLabel,               OH_DirectX               }, /* $16 */
@@ -82,13 +82,13 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "jsr",  3,  flLabel,                  OH_Absolute              }, /* $20 */
     {   "and",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $21 */
     {   "sax",  1,  flNone,                   OH_Implicit,             }, /* $22 */
-    {   "st2",  2,  flNone,                   OH_Immidiate,            }, /* $23 */
+    {   "st2",  2,  flNone,                   OH_Immediate,            }, /* $23 */
     {   "bit",  2,  flUseLabel,               OH_Direct                }, /* $24 */
     {   "and",  2,  flUseLabel,               OH_Direct                }, /* $25 */
     {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
     {   "rmb2", 1,  flUseLabel,               OH_Direct,               }, /* $27 */
     {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
-    {   "and",  2,  flNone,                   OH_Immidiate             }, /* $29 */
+    {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
     {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $2b */
     {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
@@ -114,13 +114,13 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "rti",  1,  flNone,                   OH_Rts                   }, /* $40 */
     {   "eor",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $41 */
     {   "say",  1,  flNone,                   OH_Implicit,             }, /* $42 */
-    {   "tmai", 2,  flNone,                   OH_Immidiate,            }, /* $43 */
+    {   "tmai", 2,  flNone,                   OH_Immediate,            }, /* $43 */
     {   "bsr",  2,  flLabel,                  OH_Relative,             }, /* $44 */
     {   "eor",  2,  flUseLabel,               OH_Direct                }, /* $45 */
     {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
     {   "rmb4", 1,  flUseLabel,               OH_Direct,               }, /* $47 */
     {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
-    {   "eor",  2,  flNone,                   OH_Immidiate             }, /* $49 */
+    {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
     {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $4b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
@@ -130,7 +130,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "bvc",  2,  flLabel,                  OH_Relative              }, /* $50 */
     {   "eor",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $51 */
     {   "eor",  2,  flUseLabel,               OH_DirectIndirect        }, /* $52 */
-    {   "tami", 2,  flNone,                   OH_Immidiate,            }, /* $53 */
+    {   "tami", 2,  flNone,                   OH_Immediate,            }, /* $53 */
     {   "csl",  1,  flNone,                   OH_Implicit,             }, /* $54 */
     {   "eor",  2,  flUseLabel,               OH_DirectX               }, /* $55 */
     {   "lsr",  2,  flUseLabel,               OH_DirectX               }, /* $56 */
@@ -152,7 +152,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
     {   "rmb6", 1,  flUseLabel,               OH_Direct,               }, /* $67 */
     {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
-    {   "adc",  2,  flNone,                   OH_Immidiate             }, /* $69 */
+    {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
     {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $6b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
@@ -178,13 +178,13 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "bra",  2,  flLabel,                  OH_Relative              }, /* $80 */
     {   "sta",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $81 */
     {   "clx",  1,  flNone,                   OH_Implicit,             }, /* $82 */
-    {   "tst",  3,  flNone,                   OH_ImmidiateDirect,      }, /* $83 */
+    {   "tst",  3,  flNone,                   OH_ImmediateDirect,      }, /* $83 */
     {   "sty",  2,  flUseLabel,               OH_Direct                }, /* $84 */
     {   "sta",  2,  flUseLabel,               OH_Direct                }, /* $85 */
     {   "stx",  2,  flUseLabel,               OH_Direct                }, /* $86 */
     {   "smb0", 1,  flUseLabel,               OH_Direct,               }, /* $87 */
     {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
-    {   "bit",  2,  flNone,                   OH_Immidiate             }, /* $89 */
+    {   "bit",  2,  flNone,                   OH_Immediate             }, /* $89 */
     {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $8b */
     {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
@@ -194,7 +194,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "bcc",  2,  flLabel,                  OH_Relative              }, /* $90 */
     {   "sta",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $91 */
     {   "sta",  2,  flUseLabel,               OH_DirectIndirect        }, /* $92 */
-    {   "tst",  4,  flNone,                   OH_ImmidiateAbsolute,    }, /* $93 */
+    {   "tst",  4,  flNone,                   OH_ImmediateAbsolute,    }, /* $93 */
     {   "sty",  2,  flUseLabel,               OH_DirectX               }, /* $94 */
     {   "sta",  2,  flUseLabel,               OH_DirectX               }, /* $95 */
     {   "stx",  2,  flUseLabel,               OH_DirectY               }, /* $96 */
@@ -207,16 +207,16 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "stz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9e */
     {   "bbs1", 3,  flUseLabel,               OH_BitBranch             }, /* $9f */
-    {   "ldy",  2,  flNone,                   OH_Immidiate             }, /* $a0 */
+    {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
-    {   "ldx",  2,  flNone,                   OH_Immidiate             }, /* $a2 */
-    {   "tst",  3,  flNone,                   OH_ImmidiateDirectX,     }, /* $a3 */
+    {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
+    {   "tst",  3,  flNone,                   OH_ImmediateDirectX,     }, /* $a3 */
     {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
     {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
     {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
     {   "smb2", 1,  flUseLabel,               OH_Direct,               }, /* $a7 */
     {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
-    {   "lda",  2,  flNone,                   OH_Immidiate             }, /* $a9 */
+    {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
     {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $ab */
     {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
@@ -226,7 +226,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "bcs",  2,  flLabel,                  OH_Relative              }, /* $b0 */
     {   "lda",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $b1 */
     {   "lda",  2,  flUseLabel,               OH_DirectIndirect        }, /* $b2 */
-    {   "tst",  4,  flNone,                   OH_ImmidiateAbsoluteX,   }, /* $b3 */
+    {   "tst",  4,  flNone,                   OH_ImmediateAbsoluteX,   }, /* $b3 */
     {   "ldy",  2,  flUseLabel,               OH_DirectX               }, /* $b4 */
     {   "lda",  2,  flUseLabel,               OH_DirectX               }, /* $b5 */
     {   "ldx",  2,  flUseLabel,               OH_DirectY               }, /* $b6 */
@@ -239,7 +239,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
     {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
     {   "bbs3", 3,  flUseLabel,               OH_BitBranch             }, /* $bf */
-    {   "cpy",  2,  flNone,                   OH_Immidiate             }, /* $c0 */
+    {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
     {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
     {   "cly",  1,  flNone,                   OH_Implicit,             }, /* $c2 */
     {   "tdd",  7,  flNone,                   OH_BlockMove,            }, /* $c3 */
@@ -248,7 +248,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
     {   "smb4", 1,  flUseLabel,               OH_Direct,               }, /* $c7 */
     {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
-    {   "cmp",  2,  flNone,                   OH_Immidiate             }, /* $c9 */
+    {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
     {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $cb */
     {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
@@ -271,7 +271,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
     {   "bbs5", 3,  flUseLabel,               OH_BitBranch             }, /* $df */
-    {   "cpx",  2,  flNone,                   OH_Immidiate             }, /* $e0 */
+    {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
     {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e2 */
     {   "tia",  7,  flNone,                   OH_BlockMove,            }, /* $e3 */
@@ -280,7 +280,7 @@ const OpcDesc OpcTable_HuC6280[256] = {
     {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
     {   "smb6", 1,  flUseLabel,               OH_Direct,               }, /* $e7 */
     {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
-    {   "sbc",  2,  flNone,                   OH_Immidiate             }, /* $e9 */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
     {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $eb */
     {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
diff --git a/src/da65/opctable.c b/src/da65/opctable.c
index 3c9ab8243..8b4685a6f 100644
--- a/src/da65/opctable.c
+++ b/src/da65/opctable.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				  opctable.c				     */
+/*		  		  opctable.c				     */
 /*                                                                           */
 /*		     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,6 +36,7 @@
 /* da65 */
 #include "error.h"
 #include "opc6502.h"
+#include "opc6502x.h"
 #include "opc65816.h"
 #include "opc65c02.h"
 #include "opc65sc02.h"
@@ -45,7 +46,7 @@
 
 
 /*****************************************************************************/
-/*			       	     Data				     */
+/*			       	     Data		      		     */
 /*****************************************************************************/
 
 
@@ -56,7 +57,7 @@ const OpcDesc* OpcTable = OpcTable_6502;
 
 
 /*****************************************************************************/
-/*	 	    		     Code				     */
+/*	 	    		     Code		      		     */
 /*****************************************************************************/
 
 
@@ -66,6 +67,7 @@ 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;
@@ -75,4 +77,4 @@ void SetOpcTable (cpu_t CPU)
 
 
 
-                
+
-- 
2.39.5