From aa8ef0ebca645be736916e97baae889564307040 Mon Sep 17 00:00:00 2001
From: Oscar Lindberg <oscar.lindberg@gmail.com>
Date: Wed, 8 Apr 2009 05:42:56 +0800
Subject: [PATCH] Implemented all STZ for 65C02. Trying out new idea for
 instruction definitions.

Signed-off-by: Mike Naberezny <mike@naberezny.com>
---
 src/py65/mpu65c02.py | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/py65/mpu65c02.py b/src/py65/mpu65c02.py
index 7baee7a..1641f93 100644
--- a/src/py65/mpu65c02.py
+++ b/src/py65/mpu65c02.py
@@ -1,26 +1,49 @@
 #from py65.utils.conversions import convert_to_bin, convert_to_bcd
 import mpu6502 
 
+def make_instruction_decorator(instruct, cycletime, extracycles):
+    def instruction(opcode, opcycles, opextracycles=0):
+        def decorate(f):
+            instruct[opcode] = f
+            cycletime[opcode] = opcycles
+            extracycles[opcode] = opextracycles
+            return f # Return the original function
+        return decorate
+    return instruction
+
+
 class MPU(mpu6502.MPU):
   def __init__(self, memory=None, pc=0x0000, debug=False):
     mpu6502.MPU.__init__(self, memory=memory, pc=pc, debug=debug)
     self.name = '65C02'
 
+  instruct = mpu6502.MPU.instruct[:]
+  cycletime = mpu6502.MPU.cycletime[:]
+  extracycles = mpu6502.MPU.extracycles[:]
+
+  instruction = \
+      make_instruction_decorator(instruct, cycletime, extracycles)
+
   def opSTZ(self, x):
       self.memory[x()] = 0x00
 
+  @instruction(0x64, 3)
   def i64(self):
       self.opSTZ(self.ZeroPageAddr)
       self.pc += 1
 
-  # code pages
+  @instruction(0x74, 4)
+  def i74(self):
+      self.opSTZ(self.ZeroPageXAddr)
+      self.pc += 1
 
-  instruct = mpu6502.MPU.instruct[:]
-  instruct[0x64] = i64
+  @instruction(0x9c, 4)
+  def i9c(self):
+      self.opSTZ(self.AbsoluteAddr)
+      self.pc += 2
 
-  cycletime = mpu6502.MPU.cycletime[:]
-  cycletime[0x64] = 3
-
-  extracycles = mpu6502.MPU.extracycles[:]
-  extracycles[0x64] = 0
+  @instruction(0x9e, 5)
+  def i9e(self):
+      self.opSTZ(self.AbsoluteXAddr)
+      self.pc+=2