6502/py65
1
0
Fork 0
mirror of https://github.com/mnaberez/py65.git synced 2024-09-06 10:54:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix bugs in cycle counting and CPY ().

Browse Source
This commit is contained in:
Mike Naberezny 2008-09-08 03:43:11 +00:00
parent 2f178e3fb7
commit e7ee1d0b6e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mpu.py
View File

@ -1,4 +1,4 @@
from bcd_conversion import convert_to_bin, convert_to_bcd from util import convert_to_bin, convert_to_bcd
class MPU: class MPU:
# vectors # vectors
@ -86,7 +86,7 @@ class MPU:
a1 = self.WordAt(self.ByteAt(self.pc)) a1 = self.WordAt(self.ByteAt(self.pc))
a2 = (a1+self.y) & 0xffff a2 = (a1+self.y) & 0xffff
if (a1 & 0xff00) != (a2 & 0xff00): if (a1 & 0xff00) != (a2 & 0xff00):
self.extracycles += 1 self.excycles += 1
return a2 return a2
else: else:
return (self.WordAt(self.ByteAt(self.pc))+self.y)&0xffff return (self.WordAt(self.ByteAt(self.pc))+self.y)&0xffff
@ -99,7 +99,7 @@ class MPU:
a1 = self.WordAt(self.pc) a1 = self.WordAt(self.pc)
a2 = (a1 + self.x) & 0xffff a2 = (a1 + self.x) & 0xffff
if (a1 & 0xff00) != (a2 & 0xff00): if (a1 & 0xff00) != (a2 & 0xff00):
self.extracycles += 1 self.excycles += 1
return a2 return a2
else: else:
return (self.WordAt(self.pc)+self.x)&0xffff return (self.WordAt(self.pc)+self.x)&0xffff
@ -109,7 +109,7 @@ class MPU:
a1 = self.WordAt(self.pc) a1 = self.WordAt(self.pc)
a2 = (a1 + self.y) & 0xffff a2 = (a1 + self.y) & 0xffff
if (a1 & 0xff00) != (a2 & 0xff00): if (a1 & 0xff00) != (a2 & 0xff00):
self.extracycles += 1 self.excycles += 1
return a2 return a2
else: else:
return (self.WordAt(self.pc)+self.y)&0xffff return (self.WordAt(self.pc)+self.y)&0xffff
@ -916,9 +916,9 @@ class MPU:
def ic0(self): def ic0(self):
tbyte = self.ImmediateByte() tbyte = self.ImmediateByte()
self.flags &= ~(self.CARRY+self.ZERO+self.NEGATIVE) self.flags &= ~(self.CARRY+self.ZERO+self.NEGATIVE)
if y == tbyte: if self.y == tbyte:
self.flags |= self.CARRY+self.ZERO self.flags |= self.CARRY+self.ZERO
elif y > tbyte: elif self.y > tbyte:
self.flags |= self.CARRY self.flags |= self.CARRY
else: else:
self.flags |= self.NEGATIVE self.flags |= self.NEGATIVE