Rdcpu16 0.0.2 → 0.0.3

data/lib/dcpu16/assembler.rb

@@ -0,0 +1,33 @@
+# WIP
+module DCPU16
+  class Assembler
+    attr_reader :input
+    def initialize(text)
+      @input = text
+    end
+
+    def dump
+      raise "TODO #{caller.first}"
+      lines = []
+      @input.each_line do |line|
+        empty   = (line =~ /^\s*$/)
+        comment = (line =~ /^\s*;+.*$/)
+
+        next if empty || comment
+
+        line.gsub!(/^\s*([^;]*).*$/) { $1 } # Strip some spaces
+
+        regex = /^(:\w*)?\s*(\w*)\s*([^,\s]*),?\s?([^\s]*).*$/
+        match = line.match(regex)
+
+        line = { :label => match[1],
+                 :op    => match[2],
+                 :a => match[3],
+                 :b => match[4] }
+        puts line
+        lines << line
+      end
+    end
+  end
+end
+

data/lib/dcpu16/memory.rb

@@ -1,12 +1,15 @@
 require 'dcpu16/word'
+require "observer"
 
 module DCPU16
-  class Memory < Array
+  class Memory# < Array
+    include Observable
+
     SIZE = 0x10000
     DEFAULT_VALUE = 0x0
 
     def initialize(default = [])
-      super(SIZE, DEFAULT_VALUE)
+      @memory = Array.new(SIZE, DEFAULT_VALUE)
       default.each_with_index { |word, offset| write(offset, word) }
     end
 
@@ -14,19 +17,25 @@ module DCPU16
       # HACK: so we can just pass a Fixnum or a Register
       offset = offset.value if offset.respond_to? :value
 
-      DCPU16::Word.new(self[offset], self, offset)
+      DCPU16::Word.new(@memory[offset], self, offset)
     end
 
     def write(offset, value)
       # HACK: so we can just pass a Fixnum or a Register
       offset = offset.value if offset.respond_to? :value
 
-      self[offset] = value
+      @memory[offset] = value
+      changed
+      notify_observers(offset, value)
     end
 
     def reset
     end
 
+    def length
+      @memory.length
+    end
+
     private
     def [](key)
       super(key)

data/lib/dcpu16/version.rb

@@ -1,4 +1,4 @@
 module DCPU16
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 

data/lib/dcpu16/version.rb~

@@ -1,4 +1,4 @@
 module DCPU16
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 

data/lib/dcpu16.rb

@@ -1,3 +1,4 @@
+require 'dcpu16/assembler'
 require 'dcpu16/cpu'
 require 'dcpu16/version'
 

data/spec/fixtures/example.asm

@@ -0,0 +1,29 @@
+; Try some basic stuff
+                      SET A, 0x30              ; 7c01 0030
+                      SET [0x1000], 0x20       ; 7de1 1000 0020
+                      SUB A, [0x1000]          ; 7803 1000
+                      IFN A, 0x10              ; c00d
+                         SET PC, crash         ; 7dc1 001a [*]
+
+        ; Do a loopy thing
+                      SET I, 10                ; a861
+                      SET A, 0x2000            ; 7c01 2000
+        :loop         SET [0x2000+I], [A]      ; 2161 2000
+                      SUB I, 1                 ; 8463
+                      IFN I, 0                 ; 806d
+                         SET PC, loop          ; 7dc1 000d [*]
+
+        ; Call a subroutine
+                      SET X, 0x4               ; 9031
+                      JSR testsub              ; 7c10 0018 [*]
+                      SET PC, crash            ; 7dc1 001a [*]
+
+        :testsub      SHL X, 4                 ; 9037
+                      SET PC, POP              ; 61c1
+
+        ; Hang forever. X should now be 0x40 if everything went right.
+        :crash        SET PC, crash            ; 7dc1 001a [*]
+
+        ; [*]: Note that these can be one word shorter and one cycle faster by using the short form (0x00-0x1f) of literals,
+        ;      but my assembler doesn't support short form labels yet.
+

data/spec/unit/dcpu16_assembler_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper.rb'
+
+describe DCPU16::Assembler do
+  let(:asm) { File.open(File.join('spec', 'fixtures', 'example.asm')).read }
+  subject { DCPU16::Assembler.new(asm) }
+
+  its(:input) { should == asm }
+#  its(:dump) { should be_a_kind_of(Array) }
+end
+

data/spec/unit/dcpu16_memory_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper.rb'
+require 'unit/support/memory_observer'
 
 describe DCPU16::Memory do
   its(:length) { should == 0x10000 }
@@ -12,5 +13,14 @@ describe DCPU16::Memory do
     subject.write(0x1000, 42)
     subject.read(0x1000).value.should == 42
   end
+
+  describe "Observable" do
+    let(:observer) { DCPU16::MemoryObserver.new }
+    specify do
+      subject.add_observer(observer)
+      expect { subject.write(0x9000, 42) }.to change{observer.offset}.to(0x9000)
+      expect { subject.write(0x9000, 41) }.to change{observer.value}.to(41)
+    end
+  end
 end
 

data/spec/unit/support/memory_observer.rb

@@ -0,0 +1,14 @@
+module DCPU16
+  class MemoryObserver
+    attr_reader :offset, :value
+
+    def initialize
+    end
+
+    def update(offset, value)
+      @offset = offset
+      @value  = value
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Rdcpu16
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85253420 !ruby/object:Gem::Requirement
+  requirement: &76639670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *85253420
+  version_requirements: *76639670
 description: This is a simple Ruby port of the fictive 16-bit-cpu DCPU16.
 email:
 - deradon87@gmail.com
@@ -30,6 +30,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/dcpu16/cpu.rb
+- lib/dcpu16/assembler.rb
 - lib/dcpu16/operand.rb
 - lib/dcpu16/memory.rb
 - lib/dcpu16/word.rb
@@ -44,9 +45,12 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
+- spec/fixtures/example.asm
 - spec/integration/example1_spec.rb
+- spec/unit/dcpu16_assembler_spec.rb
 - spec/unit/dcpu16_word_spec.rb
 - spec/unit/support/sample_observer.rb
+- spec/unit/support/memory_observer.rb
 - spec/unit/dcpu16_register_spec.rb
 - spec/unit/dcpu16_cpu_spec.rb
 - spec/unit/dcpu16_memory_spec.rb
@@ -79,9 +83,12 @@ signing_key:
 specification_version: 3
 summary: Ruby port of DCPU16
 test_files:
+- spec/fixtures/example.asm
 - spec/integration/example1_spec.rb
+- spec/unit/dcpu16_assembler_spec.rb
 - spec/unit/dcpu16_word_spec.rb
 - spec/unit/support/sample_observer.rb
+- spec/unit/support/memory_observer.rb
 - spec/unit/dcpu16_register_spec.rb
 - spec/unit/dcpu16_cpu_spec.rb
 - spec/unit/dcpu16_memory_spec.rb