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

add --pc switch for starting run at specific program counter

Browse Source
This commit is contained in:
Greg Hewgill 2011-10-01 08:18:16 +13:00
parent 4ee9b846f9
commit 9ff2dbb70e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
applepy.py
View File

@ -377,6 +377,10 @@ class Apple2:
args.extend([ args.extend([
"--ram", options.ram, "--ram", options.ram,
]) ])
if options.pc is not None:
args.extend([
"--pc", str(options.pc),
])
self.core = subprocess.Popen(args) self.core = subprocess.Popen(args)
rs, _, _ = select.select([listener], [], [], 2) rs, _, _ = select.select([listener], [], [], 2)
@ -433,6 +437,7 @@ def usage():
print >>sys.stderr, " -c, --cassette Cassette wav file to load" print >>sys.stderr, " -c, --cassette Cassette wav file to load"
print >>sys.stderr, " -R, --rom ROM file to use (default A2ROM.BIN)" print >>sys.stderr, " -R, --rom ROM file to use (default A2ROM.BIN)"
print >>sys.stderr, " -r, --ram RAM file to load (default none)" print >>sys.stderr, " -r, --ram RAM file to load (default none)"
print >>sys.stderr, " -p, --pc Initial PC value"
print >>sys.stderr, " -q, --quiet Quiet mode, no sounds (default sounds)" print >>sys.stderr, " -q, --quiet Quiet mode, no sounds (default sounds)"
sys.exit(1) sys.exit(1)
@ -443,6 +448,7 @@ def get_options():
self.cassette = None self.cassette = None
self.rom = "A2ROM.BIN" self.rom = "A2ROM.BIN"
self.ram = None self.ram = None
self.pc = None
self.quiet = False self.quiet = False
options = Options() options = Options()
@ -458,6 +464,9 @@ def get_options():
elif sys.argv[a] in ("-r", "--ram"): elif sys.argv[a] in ("-r", "--ram"):
a += 1 a += 1
options.ram = sys.argv[a] options.ram = sys.argv[a]
elif sys.argv[a] in ("-p", "--pc"):
a += 1
options.pc = int(sys.argv[a])
elif sys.argv[a] in ("-q", "--quiet"): elif sys.argv[a] in ("-q", "--quiet"):
options.quiet = True options.quiet = True
else: else:

11
cpu6502.py
View File

@ -505,7 +505,7 @@ class CPU:
STACK_PAGE = 0x100 STACK_PAGE = 0x100
RESET_VECTOR = 0xFFFC RESET_VECTOR = 0xFFFC
def __init__(self, memory): def __init__(self, options, memory):
self.memory = memory self.memory = memory
self.control_server = BaseHTTPServer.HTTPServer(("127.0.0.1", 6502), ControlHandlerFactory(self)) self.control_server = BaseHTTPServer.HTTPServer(("127.0.0.1", 6502), ControlHandlerFactory(self))
@ -528,6 +528,8 @@ class CPU:
self.setup_ops() self.setup_ops()
self.reset() self.reset()
if options.pc is not None:
self.program_counter = options.pc
self.running = True self.running = True
self.quit = False self.quit = False
@ -1176,6 +1178,7 @@ def usage():
print >>sys.stderr, "Usage: cpu6502.py [options]" print >>sys.stderr, "Usage: cpu6502.py [options]"
print >>sys.stderr print >>sys.stderr
print >>sys.stderr, " -b, --bus Bus port number" print >>sys.stderr, " -b, --bus Bus port number"
print >>sys.stderr, " -p, --pc Initial PC value"
print >>sys.stderr, " -R, --rom ROM file to use (default A2ROM.BIN)" print >>sys.stderr, " -R, --rom ROM file to use (default A2ROM.BIN)"
print >>sys.stderr, " -r, --ram RAM file to load (default none)" print >>sys.stderr, " -r, --ram RAM file to load (default none)"
sys.exit(1) sys.exit(1)
@ -1187,6 +1190,7 @@ def get_options():
self.rom = "A2ROM.BIN" self.rom = "A2ROM.BIN"
self.ram = None self.ram = None
self.bus = None self.bus = None
self.pc = None
options = Options() options = Options()
a = 1 a = 1
@ -1195,6 +1199,9 @@ def get_options():
if sys.argv[a] in ("-b", "--bus"): if sys.argv[a] in ("-b", "--bus"):
a += 1 a += 1
options.bus = int(sys.argv[a]) options.bus = int(sys.argv[a])
elif sys.argv[a] in ("-p", "--pc"):
a += 1
options.pc = int(sys.argv[a])
elif sys.argv[a] in ("-R", "--rom"): elif sys.argv[a] in ("-R", "--rom"):
a += 1 a += 1
options.rom = sys.argv[a] options.rom = sys.argv[a]
@ -1219,5 +1226,5 @@ if __name__ == "__main__":
mem = Memory(options) mem = Memory(options)
cpu = CPU(mem) cpu = CPU(options, mem)
cpu.run(options.bus) cpu.run(options.bus)