Merge pull request #16 from ghewgill/startpc

Startup option to support running binary images

applepy.py

@@ -109,6 +109,10 @@ def __init__(self):
         self.flash_time = time.time()
         self.flash_on = False
         self.flash_chars = [[0] * 0x400] * 2
+
+        self.page = 1
+        self.text = True
+        self.colour = False
 
         self.chargen = []
         for c in self.characters:
@@ -373,6 +377,10 @@ def __init__(self, options, display, speaker, cassette):
             args.extend([
                 "--ram", options.ram,
             ])
+        if options.pc is not None:
+            args.extend([
+                "--pc", str(options.pc),
+            ])
         self.core = subprocess.Popen(args)
 
         rs, _, _ = select.select([listener], [], [], 2)
@@ -429,6 +437,7 @@ def usage():
     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, --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)"
     sys.exit(1)
 
@@ -439,6 +448,7 @@ def __init__(self):
             self.cassette = None
             self.rom = "A2ROM.BIN"
             self.ram = None
+            self.pc = None
             self.quiet = False
 
     options = Options()
@@ -454,6 +464,9 @@ def __init__(self):
             elif sys.argv[a] in ("-r", "--ram"):
                 a += 1
                 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"):
                 options.quiet = True
             else:

cpu6502.py

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