From a7994f9e8543fd8955ce8dfd5817df27ba70d6d9 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Sun, 23 Mar 2014 16:51:01 +1030
Subject: [PATCH 1/2] 4502 instructions INW and DEW are Zero Page, not Absolute

---
 src/Ophis/Opcodes.py |   4 ++--
 tests/test4502.bin   | Bin 0 -> 199 bytes
 tests/test4502.oph   |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 tests/test4502.bin

diff --git a/src/Ophis/Opcodes.py b/src/Ophis/Opcodes.py
index 6e01c0d..0b820c5 100644
--- a/src/Ophis/Opcodes.py
+++ b/src/Ophis/Opcodes.py
@@ -427,7 +427,7 @@ csg4502extensions = {
                              None, None, None, None, None, None, None, None, None, None, None, None, None],
                      'dec': [0x3A, None, None, 0xC6, 0xD6, None, 0xCE, 0xDE,
                              None, None, None, None, None, None, None, None, None, None, None, None, None],
-                     'dew': [None, None, None, None, None, None, 0xC3, None,
+                     'dew': [None, None, None, 0xC3, None, None, None, None,
                              None, None, None, None, None, None, None, None, None, None, None, None, None],
                      'dez': [0x3B, None, None, None, None, None, None, None,
                              None, None, None, None, None, None, None, None, None, None, None, None, None],
@@ -437,7 +437,7 @@ csg4502extensions = {
                              0x59, None, None, None, None, None, 0x41, 0x51, None, 0x52, None, None, None],
                      'inc': [0x1A, None, None, 0xE6, 0xF6, None, 0xEE, 0xFE,
                              None, None, None, None, None, None, None, None, None, None, None, None, None],
-                     'inw': [None, None, None, None, None, None, 0xE3, None,
+                     'inw': [None, None, None, 0xE3, None, None, None, None,
                              None, None, None, None, None, None, None, None, None, None, None, None, None],
                      'inz': [0x1B, None, None, None, None, None, None, None,
                              None, None, None, None, None, None, None, None, None, None, None, None, None],
diff --git a/tests/test4502.bin b/tests/test4502.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ad317e79da03aa63f96cecbdfc503bc1425d52e5
GIT binary patch
literal 199
zcmV;&066~w0|W#I2MY`g3=a<v5)u>?7Z(~E92^`UA0HwjA|oRsCnqZ}FE27OG&DCi
zIyyT%JUl-?KSD!CM@vsnPf}7>S6W+KUteEhVq|1zXKQS1Y;SLGa&mNZcXxVwe0+R=
ze}900hlh!Yi;IhokB^d)mzSHHo1C1So}QkcpP!?nr>Co{tFN!Gva+|gySux*yu81^
zzrw=9!^g+V%gfKt&(hM@*V^0P-{0cm<Ky(?<mcz=>+9?9@9*;R_xJky{QUg?|NkLt
BWJmx2

literal 0
HcmV?d00001

diff --git a/tests/test4502.oph b/tests/test4502.oph
index 780f83f..27f233c 100644
--- a/tests/test4502.oph
+++ b/tests/test4502.oph
@@ -82,7 +82,7 @@
 	LDY	$BCBC,X		;  BC: LDY - Absolute, X
 	BBS3	$BF, ^-$3E	;  BF: BBS3 - Zero Page, Relative
 	CPZ	#$C2 		;  C2: CPZ - Immediate
-	DEW	$C3C3		;  C3: DEW - Absolute
+	DEW	$C3		;  C3: DEW - Zero Page
 	SMB4	$C7		;  C7: SMB4 - Zero Page
 	ASW	$CBCB		;  CB: ASW - Absolute
 	BBS4	$CF, ^-$2E	;  CF: BBS4 - Zero Page, Relative
@@ -92,7 +92,7 @@
 	PHZ			;  DB: PHZ - Implied
 	BBS5	$DF, ^-$1E	;  DF: BBS5 - Zero Page, Relative
 	LDA 	($E2,SP),Y	;  E2: LDA - (Zero Page, SP), Y
-	INW	$E3E3		;  E3: INW - Absolute
+	INW	$E3		;  E3: INW - Zero Page
 	PHW	#$E4E4		;  E4: PHW - ImmediateLong
 	SMB6	$E7		;  E7: SMB6 - Zero Page
 	EOM			;  EA: EOM - Implied

From 97ea228fb709dadbd86966ed8d5f032b90943ec6 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Sun, 23 Mar 2014 16:55:04 +1030
Subject: [PATCH 2/2] remove LF added during conflict resolution.

---
 tests/test4502.bin | Bin 200 -> 199 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/test4502.bin b/tests/test4502.bin
index 617b1f722fa9a8c2af7a3983684c9ab455a2476f..ad317e79da03aa63f96cecbdfc503bc1425d52e5 100644
GIT binary patch
delta 6
NcmX@Xc${&<aR3Ry0_gw%

delta 8
PcmX@kc!F`laYilx51j(^