[pypy-svn] r53983 - pypy/branch/gameboy-emulator/pypy/lang/gameboy

[cami at codespeak.net]

Author: cami
Date: Mon Apr 21 21:36:30 2008
New Revision: 53983

Modified:
   pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py
   pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py
   pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py
Log:
the semicolon killer was here ;)


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 Apr 21 21:36:30 2008
@@ -219,13 +219,13 @@
         self.cycles = 0
         
     def resetRegisters(self):
-        self.a.reset();
-        self.f.reset();
-        self.bc.reset();
-        self.de.reset();
-        self.hl.reset();
-        self.sp.reset();
-        self.pc.reset();
+        self.a.reset()
+        self.f.reset()
+        self.bc.reset()
+        self.de.reset()
+        self.hl.reset()
+        self.sp.reset()
+        self.pc.reset()
         
     def getAF(self):
         return self.af
@@ -442,7 +442,7 @@
         self.f.reset(keepZ=True)
         self.f.hFlagCompare((added >> 8), self.hl)
         self.f.cFlagCompare(added, self.hl)
-        self.hl.set(added);
+        self.hl.set(added)
         self.cycles -= 1
         
     # 1 cycle
@@ -759,7 +759,7 @@
      # CCF/SCF
     def complementCarryFlag(self):
         self.f.reset(keepZ=True, keepC=True)
-        self.f.cFlag = not self.f.cFlag;
+        self.f.cFlag = not self.f.cFlag
 
     def setCarryFlag(self):
         self.f.reset(keepZ=True)
@@ -832,7 +832,7 @@
      # DI/EI 1 cycle
     def disableInterrupts(self):
         self.ime = False
-        self.cycles -= 1; 
+        self.cycles -= 1
 
     # 1 cycle
     def enableInterrupts(self):

Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py	(original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py	Mon Apr 21 21:36:30 2008
@@ -102,7 +102,7 @@
         return code
     
     def isRaised(self):
-        raised = self.raised;
+        raised = self.raised
         self.raised = False
         return raised
     

Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py	(original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py	Mon Apr 21 21:36:30 2008
@@ -113,8 +113,8 @@
         self.frames = 0
         self.audio1Index = self.audio2Index = self.audio3Index = self.audio4Index = 0
         self.write(constants.NR10, 0x80)
-        self.write(constants.NR11, 0x3F); #  0xBF
-        self.write(constants.NR12, 0x00); #  0xF3
+        self.write(constants.NR11, 0x3F) #  0xBF
+        self.write(constants.NR12, 0x00) #  0xF3
         self.write(constants.NR13, 0xFF)
         self.write(constants.NR14, 0xBF)
 
@@ -134,9 +134,9 @@
         self.write(constants.NR43, 0x00)
         self.write(constants.NR44, 0xBF)
 
-        self.write(constants.NR50, 0x00); #  0x77
+        self.write(constants.NR50, 0x00) #  0x77
         self.write(constants.NR51, 0xF0)
-        self.write(constants.NR52, 0xFF); #  0xF0
+        self.write(constants.NR52, 0xFF) #  0xF0
 
         for address in range(0xFF30, 0xFF3F):
             write = 0xFF