[pypy-svn] r54440 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test

[cami at codespeak.net]

Author: cami
Date: Mon May  5 15:40:43 2008
New Revision: 54440

Modified:
   pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py
   pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_register.py
Log:
changed register constructor


Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py	(original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py	Mon May  5 15:40:43 2008
@@ -28,7 +28,8 @@
 # ------------------------------------------------------------------------------
 
 class DoubleRegister(Register):
-    def __init__(self, cpu, hi=None, lo=None, resetValue=None):
+    
+    def __init__(self, cpu, hi=None, lo=None, resetValue=0):
         self.cpu = cpu
         if isinstance(hi, (Register)) :
             self.hi = hi
@@ -38,10 +39,7 @@
             self.lo = Register(self.cpu)
         else:
             self.lo = lo
-        if (resetValue != None):
-            self.resetValue = resetValue
-        elif (hi!=None and lo==None and resetValue==None):
-            self.resetValue = hi
+        self.resetValue = resetValue
         
     def set(self, hi=0, lo=None, useCycles=True):
         if (lo is None):
@@ -205,8 +203,8 @@
         self.hl = DoubleRegister(self, self.h, self.l, constants.RESET_HL)
         
         self.hli = ImmediatePseudoRegister(self, self.hl)
-        self.pc = DoubleRegister(self, constants.RESET_PC)
-        self.sp = DoubleRegister(self, constants.RESET_SP)
+        self.pc = DoubleRegister(self, resetValue=constants.RESET_PC)
+        self.sp = DoubleRegister(self, resetValue=constants.RESET_SP)
         
         self.a = Register(self, constants.RESET_A)
         self.f = FlagRegister(self)

Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_register.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_register.py	(original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_register.py	Mon May  5 15:40:43 2008
@@ -152,8 +152,9 @@
 def test_double_register_reset():
     value = 0x1234;
     
-    register = DoubleRegister(get_cpu(), value)
+    register = DoubleRegister(get_cpu(), resetValue=value)
     register.set(value+1)
     assert register.get() == value+1;
     register.reset()
-    assert register.get() == value
\ No newline at end of file
+    assert register.get() == value
+    
\ No newline at end of file