mos6510 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1927df1cea683c92fa0ae002561b2f45038c73ba643df8b1a754f29d17baac0
-  data.tar.gz: 22aadae8ca292253552029f949c7149849a1856b4ace763deaf08962c271603c
+  metadata.gz: ba8bdd4a50128bae8029b543930ac001d3d458667d42cca6fdfa98dd3e6428ee
+  data.tar.gz: fe874fe7083bff2b5478f3bbef3055fb7bb011615372c702db062b34ecaf9519
 SHA512:
-  metadata.gz: ef97362b9a142a5a1f054075f41e98f7347865771e316f7113b58f2174fb6b01e0fb05c0b6bb845ff413629a27fe648dc574e7f4729ffabf731e4bb0f1231ea9
-  data.tar.gz: ba8db5d0b2b31e91fe5811cfa32b867b63a59ee18a59d229f8fb10f41761335cd5f6ece1a0750fa8016f2d94137c6746c5db1df35bb3a542c0354e42574489d2
+  metadata.gz: 8baadc0f4cf8e047a3de48c943554dead32df7cf866dc52814bb38fb0ec88a07513557b1ed19e577d71bc950de01b3a653fd9a190bc034ca6b5367d29c87807b
+  data.tar.gz: 18e83005a3aa7ae75dbf630331edfae281ac0cd6d187b890922e30fb9fb276cefbce926caee9e3833ac54a41f219d6decf5643f6a79be9cf2cff8b70fcc1f9b5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.2
+Bumped versions of mini_racer so we can run on Ruby 3.1. Also bumped rspec.
+
 ## 0.1.1
 Bumped version of mini_racer, as 0.2.6 doesn't want to compile and install on my Mac.
 

data/Gemfile.lock

@@ -1,30 +1,31 @@
 PATH
   remote: .
   specs:
-    mos6510 (0.1.1)
-      mini_racer (~> 0.3.1)
+    mos6510 (0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    libv8 (8.4.255.0-x86_64-darwin-19)
-    mini_racer (0.3.1)
-      libv8 (~> 8.4.255)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    method_source (1.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
 
 PLATFORMS
   ruby
@@ -32,8 +33,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   mos6510!
+  pry (~> 0.14)
   rake (~> 10.0)
-  rspec (~> 3.0)
+  rspec (~> 3.11)
 
 BUNDLED WITH
    2.1.4

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