Apple-2-Tools
/
applepy
mirror of https://github.com/jtauber/applepy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 811104ebcc into 934bf1a495

This commit is contained in:
brpollock 2019-12-01 15:17:50 +00:00 committed by GitHub
parent 934bf1a495 811104ebcc
commit 53a8dc7f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cpu6502.py
View File

@ -505,10 +505,10 @@ class CPU:
STACK_PAGE = 0x100
RESET_VECTOR = 0xFFFC
def __init__(self, options, memory):
def __init__(self, memory, pc=None):
self.memory = memory
self.control_server = BaseHTTPServer.HTTPServer(("127.0.0.1", 6502), ControlHandlerFactory(self))
self.control_server = memory.use_bus and BaseHTTPServer.HTTPServer(("127.0.0.1", 6502), ControlHandlerFactory(self))
self.accumulator = 0x00
self.x_index = 0x00
@ -528,8 +528,8 @@ class CPU:
self.setup_ops()
self.reset()
if options.pc is not None:
self.program_counter = options.pc
if pc is not None:
self.program_counter = pc
self.running = True
self.quit = False
@ -704,13 +704,14 @@ class CPU:
# a connection is accepted until the response
# is sent. TODO: use an async HTTP server that
# handles input data asynchronously.
sockets = [self.control_server]
rs, _, _ = select.select(sockets, [], [], timeout)
for s in rs:
if s is self.control_server:
self.control_server._handle_request_noblock()
else:
pass
if self.control_server:
sockets = [self.control_server]
rs, _, _ = select.select(sockets, [], [], timeout)
for s in rs:
if s is self.control_server:
self.control_server._handle_request_noblock()
else:
pass
count = 1000
while count > 0 and self.running:
@ -1225,5 +1226,5 @@ if __name__ == "__main__":
mem = Memory(options)
cpu = CPU(options, mem)
cpu = CPU(mem, options.pc)
cpu.run(options.bus)