Apple-2-Tools/applepy
1
0
Fork 0
mirror of https://github.com/jtauber/applepy.git synced 2024-12-29 15:29:16 +00:00
Code Issues Projects Releases Wiki Activity

refactored memory so RAM just subclasses ROM, adding write_byte

Browse Source
This commit is contained in:
James Tauber 2011-08-13 09:47:18 -04:00
parent 6b163f1c2d
commit f3e0cef441
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
applepy.py
View File

@ -238,28 +238,31 @@ class Display:
del pixels del pixels
class RAM: class ROM:
def __init__(self, start, size): def __init__(self, start, size):
self.start = start self.start = start
self.end = start + size - 1 self.end = start + size - 1
self.__mem = [0x00] * size self._mem = [0x00] * size
def load(self, address, data): def load(self, address, data):
for offset, datum in enumerate(data): for offset, datum in enumerate(data):
self.__mem[address - self.start + offset] = datum self._mem[address - self.start + offset] = datum
def load_file(self, address, filename): def load_file(self, address, filename):
with open(filename) as f: with open(filename) as f:
for offset, datum in enumerate(f.read()): for offset, datum in enumerate(f.read()):
self.__mem[address - self.start + offset] = ord(datum) self._mem[address - self.start + offset] = ord(datum)
def read_byte(self, address): def read_byte(self, address):
assert self.start <= address <= self.end assert self.start <= address <= self.end
return self.__mem[address - self.start] return self._mem[address - self.start]
class RAM(ROM):
def write_byte(self, address, value): def write_byte(self, address, value):
self.__mem[address] = value self._mem[address] = value
class SoftSwitches: class SoftSwitches:
@ -297,27 +300,6 @@ class SoftSwitches:
return 0x00 return 0x00
class ROM:
def __init__(self, start, size):
self.start = start
self.end = start + size - 1
self.__mem = [0x00] * size
def load(self, address, data):
for offset, datum in enumerate(data):
self.__mem[address - self.start + offset] = datum
def load_file(self, address, filename):
with open(filename) as f:
for offset, datum in enumerate(f.read()):
self.__mem[address - self.start + offset] = ord(datum)
def read_byte(self, address):
assert self.start <= address <= self.end
return self.__mem[address - self.start]
class Memory: class Memory:
def __init__(self, display=None): def __init__(self, display=None):
@ -757,7 +739,7 @@ class CPU:
self.ops[0xF9] = lambda: self.SBC(self.absolute_y_mode()) self.ops[0xF9] = lambda: self.SBC(self.absolute_y_mode())
self.ops[0xFD] = lambda: self.SBC(self.absolute_x_mode()) self.ops[0xFD] = lambda: self.SBC(self.absolute_x_mode())
self.ops[0xFE] = lambda: self.INC(self.absolute_x_mode()) self.ops[0xFE] = lambda: self.INC(self.absolute_x_mode())
def reset(self): def reset(self):
self.program_counter = self.memory.read_word(self.RESET_VECTOR) self.program_counter = self.memory.read_word(self.RESET_VECTOR)