[pypy-svn] r56983 - pypy/dist/pypy/lang/gameboy

[cami at codespeak.net]

Author: cami
Date: Mon Aug  4 22:53:13 2008
New Revision: 56983

Modified:
   pypy/dist/pypy/lang/gameboy/gameboy_implementation.py
   pypy/dist/pypy/lang/gameboy/interrupt.py
Log:
fixed typo in interrupt which had no effect on the execution
changed shutdown order in gameboy_implementation.py


Modified: pypy/dist/pypy/lang/gameboy/gameboy_implementation.py
==============================================================================
--- pypy/dist/pypy/lang/gameboy/gameboy_implementation.py	(original)
+++ pypy/dist/pypy/lang/gameboy/gameboy_implementation.py	Mon Aug  4 22:53:13 2008
@@ -37,9 +37,9 @@
                 self.emulate(constants.GAMEBOY_CLOCK >> 2)
                 #RSDL.Delay(1)
         finally:
+            self.handle_execution_error()
             lltype.free(self.event, flavor='raw')
             RSDL.Quit()
-            self.handle_execution_error()
         return 0
     
     def handle_execution_error(self):

Modified: pypy/dist/pypy/lang/gameboy/interrupt.py
==============================================================================
--- pypy/dist/pypy/lang/gameboy/interrupt.py	(original)
+++ pypy/dist/pypy/lang/gameboy/interrupt.py	Mon Aug  4 22:53:13 2008
@@ -66,7 +66,7 @@
         if  address == constants.IE:
             self.set_enable_mask(data)
         elif address == constants.IF:
-            self.set_fnterrupt_flag(data)
+            self.set_interrupt_flag(data)
 
     def read(self, address):
         if  address == constants.IE:
@@ -105,6 +105,6 @@
                 flag |= interrupt_flag.mask
         return flag | 0xE0
 
-    def set_fnterrupt_flag(self, data):
+    def set_interrupt_flag(self, data):
         for flag in self.interrupt_flags:
             flag.set_pending((data & flag.mask) != 0)