mos6510 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc91397c661fd7527b56cbb2ff74e164aeae1bc24bcfe3ccc346a612a1cd3e6
-  data.tar.gz: 430f09a9f00e20e0097eebd836f578abd421096208e4d30cbfc22a0b7744c63b
+  metadata.gz: ba8bdd4a50128bae8029b543930ac001d3d458667d42cca6fdfa98dd3e6428ee
+  data.tar.gz: fe874fe7083bff2b5478f3bbef3055fb7bb011615372c702db062b34ecaf9519
 SHA512:
-  metadata.gz: 4275d34503ca804d4ea3d4f3d7c767c2b3ccb79870328ad9a2ae14f0f4532b1d9710ac6ddbef82b14c6358e4bbf2cb5cad4c436136d3178e69687b69d2becbf6
-  data.tar.gz: d05c8f6bdcb23af228133a0b1343afc008f90c776bea8f525b1810eff1585e4e0f81897c5f6fe1de6646febd3c97fb9a79e5f7ccdc85fc9dee39064fd9edb719
+  metadata.gz: 8baadc0f4cf8e047a3de48c943554dead32df7cf866dc52814bb38fb0ec88a07513557b1ed19e577d71bc950de01b3a653fd9a190bc034ca6b5367d29c87807b
+  data.tar.gz: 18e83005a3aa7ae75dbf630331edfae281ac0cd6d187b890922e30fb9fb276cefbce926caee9e3833ac54a41f219d6decf5643f6a79be9cf2cff8b70fcc1f9b5

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    mos6510 (0.1.2)
-      mini_racer (~> 0.6.2)
+    mos6510 (0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.5.0)
-    libv8-node (16.10.0.0-x86_64-darwin)
-    mini_racer (0.6.2)
-      libv8-node (~> 16.10.0.0)
+    method_source (1.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (10.5.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -32,6 +33,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   mos6510!
+  pry (~> 0.14)
   rake (~> 10.0)
   rspec (~> 3.11)
 

data/README.md

@@ -7,9 +7,10 @@ Additionally, the gem allows you to supply an object which simulates the SID pro
 (Sound Interface Device - the sound chip from the Commodore 64). This object will receive
 `poke` calls whenever the simulated program writes to the addresses mapped to the SID.
 
-Be warned: This gem is a HUGE hack! Basically it is just wrapping a MOS 6510 simulator
-stolen (*) from the [jsSID](https://github.com/jhohertz/jsSID) project. I'd love to do a
-pure-Ruby implementation one day, but just needed a MOS 6510 emulator for another project.
+Be warned: This is just a very raw conversion of a JavaScript implementation stolen (*)
+from the [jsSID](https://github.com/jhohertz/jsSID) project. It has bugs, probably
+because of my conversion. I'd love fix this one day, but just needed a MOS 6510 emulator
+for another project.
 
 (*) This explains the GPL v2 license of this project.
 

data/lib/mos6510/cpu.rb

@@ -1,51 +1,38 @@
-require 'mini_racer'
-
 module Mos6510
   class Cpu
     def initialize(sid: nil)
-      @context = MiniRacer::Context.new
-
-      # Just define the name space used by the main mos6510 emulator
-      @context.eval 'function jsSID() {}'
-
-      @context.load(File.join(__dir__, 'jssid.mos6510.js'))
-
-      @context.eval <<~EOS
-        var memory = new Array(65536);
-		    for(var i=0; i<65536; i++) {
-			    memory[i]=0;
-		    }
-        var sid = null;
-      EOS
-
-      if sid
-        @context.attach("sidPoke", proc{ |address, value| sid.poke(address, value) })
-        @context.eval <<~EOS
-          sid = {
-            poke: function(address, value) { sidPoke(address, value); }
-          };
-        EOS
-      end
+      @memory = [0] * 65536
+      @sid = sid
     end
 
     def load(bytes, from: 0)
       bytes.each_with_index do |byte, index|
-        @context.eval "memory[#{from + index}] = #{byte};"
+        @memory[from + index] = byte
       end
     end
 
     def start
-      @context.eval <<~EOS
-        var cpu = new jsSID.MOS6510(memory, sid);
-      EOS
+      @cpu = Mos6510.new(@memory, sid: @sid)
     end
 
     def jsr(address, accumulator_value=0)
-      @context.eval "cpu.cpuJSR(#{address}, #{accumulator_value});"
+      @cpu.jsr(address, accumulator_value)
+    end
+
+    def step
+      @cpu.step
+    end
+
+    def pc
+      @cpu.pc
+    end
+
+    def pc=(new_pc)
+      @cpu.pc = new_pc
     end
 
     def peek(address)
-      @context.eval "cpu.mem[#{address}]"
+      @cpu.getmem(address)
     end
   end
 end