scasm 0.1.0 → 0.1.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.bin

data/examples/data.scasm

@@ -0,0 +1 @@
+data 1, 16, 64, 65535

data/examples/loop.scasm

@@ -0,0 +1,3 @@
+   label "loop"
+   add A, 1
+   set pc, "loop"

data/examples/macro.scasm

@@ -0,0 +1,6 @@
+def jmpx label
+  set pc, label
+end
+
+label "foo"
+jmpx "foo"

data/examples/readme1.scasm

@@ -0,0 +1,7 @@
+
+    foo = A
+    bar = B
+    offset = 42
+    label "loop"
+    add [foo, offset], bar
+    set pc, "loop"

data/lib/scasm/assembler.rb

@@ -5,7 +5,7 @@ require 'scasm/value'
 
 module SCASM
 
-class Assembler < BasicObject
+class Assembler < Object
   def initialize
     @stmts = []
     @relocations = []
@@ -17,11 +17,13 @@ class Assembler < BasicObject
 
   def assemble
     resolve_labels
-    io = ::StringIO.new
+    io = StringIO.new
     @stmts.each { |stmt| stmt.assemble io }
     io.string
   end
 
+  ## Statements
+
   def inst opsym, a, b
     a = parse_value a
     b = parse_value b
@@ -29,22 +31,25 @@ class Assembler < BasicObject
   end
 
   def label name
-    ::Kernel.raise "label names must be strings" unless name.is_a? ::String
+    raise "label names must be strings" unless name.is_a? String
     @stmts << Label.new(name)
   end
 
-  def reg regsym
-    Register.new regsym
+  def data *words
+    @stmts << Data.new(words)
   end
 
-  def regmem regsym
-    RegisterMemory.new regsym
+  # Add a method for each instruction
+  BASIC_OPCODES.each do |opsym,opcode|
+    define_method(opsym) { |a,b| inst opsym, a, b }
   end
 
-  def iregmem regsym, imm
-    OffsetRegisterMemory.new regsym, imm
+  EXTENDED_OPCODES.each do |opsym,opcode|
+    define_method(opsym) { |a| inst opsym, a, nil }
   end
 
+  ## Values
+
   def pop
     Pop.new
   end
@@ -69,32 +74,6 @@ class Assembler < BasicObject
     O.new
   end
 
-  def imem imm
-    ImmediateMemory.new imm
-  end
-
-  def imm imm
-    Immediate.new imm
-  end
-
-  def l name
-    ::Kernel.raise "label names must be strings" unless name.is_a? ::String
-    ImmediateLabel.new(name).tap { |x| @relocations << x }
-  end
-
-  def data *words
-    @stmts << Data.new(words)
-  end
-
-  # Add a method for each instruction
-  BASIC_OPCODES.each do |opsym,opcode|
-    define_method(opsym) { |a,b| inst opsym, a, b }
-  end
-
-  EXTENDED_OPCODES.each do |opsym,opcode|
-    define_method(opsym) { |a| inst opsym, a, nil }
-  end
-
   # Add a constant for each register
   REGISTERS.each do |regsym,regnum|
     const_set regsym, regsym
@@ -124,41 +103,41 @@ private
     end
 
     @relocations.each do |x|
-      addr = label_addrs[x.name] or ::Kernel.raise "undefined label #{x.name.inspect}"
+      addr = label_addrs[x.name] or raise "undefined label #{x.name.inspect}"
       x.resolve addr
     end
   end
 
-  # Shorter notation for values
+  # Create explicit Values from the shorthand syntax
   def parse_value x
     case x
-    when Value, ::NilClass
+    when Value, NilClass
       x
-    when ::Array
+    when Array
       x1, x2, = x
-      if x1.is_a? ::Symbol and x2 == nil
+      if x1.is_a? Symbol and x2 == nil
         # [reg]
-        regmem x1
-      elsif x1.is_a? ::Symbol and x2.is_a? ::Integer
+        RegisterMemory.new x1
+      elsif x1.is_a? Symbol and x2.is_a? Integer
         # [reg, imm]
-        iregmem x1, x2
-      elsif x1.is_a? ::Integer
+        OffsetRegisterMemory.new x1, x2
+      elsif x1.is_a? Integer
         # [imm]
-        imem x1
+        ImmediateMemory.new x1
       else
-        ::Kernel.fail "invalid memory access syntax"
+        fail "invalid memory access syntax"
       end
-    when ::Symbol
+    when Symbol
       # register
-      reg x
-    when ::String
+      Register.new x
+    when String
       # label
-      l x
-    when ::Integer
+      ImmediateLabel.new(x).tap { |v| @relocations << v }
+    when Integer
       # immediate
-      imm x
+      Immediate.new x
     else
-      ::Kernel.raise "unexpected value class #{x.class}"
+      raise "unexpected value class #{x.class}"
     end
   end
 end

data/lib/scasm/version.rb

@@ -1,3 +1,3 @@
 module Scasm
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/test_assembler.rb

@@ -34,13 +34,6 @@ class AssemblerTest < Test::Unit::TestCase
       0x1c61,
     ]
 
-    check <<-EOS
-      set reg(A), reg(B)
-      set reg(C), reg(X)
-      set reg(Y), reg(Z)
-      set reg(I), reg(J)
-    EOS
-
     check <<-EOS
       set A, B
       set C, X
@@ -51,13 +44,11 @@ class AssemblerTest < Test::Unit::TestCase
 
   def test_regmem
     expect [0x0cb1]
-    check "set regmem(X), reg(X)"
     check "set [X], X"
   end
 
   def test_iregmem
     expect [0x0d31, 0x002a]
-    check 'set iregmem(X, 42), reg(X)'
     check 'set [X,42], X'
   end
 
@@ -83,21 +74,17 @@ class AssemblerTest < Test::Unit::TestCase
 
   def test_imem
     expect [0x7801, 0x1000]
-    check 'set reg(A), imem(0x1000)'
     check 'set A, [0x1000]'
   end
 
   def test_imm
     expect [0xfc01]
-    check "set reg(A), imm(31)"
     check "set A, 31"
 
     expect [0x7c01, 0x0020]
-    check "set reg(A), imm(32)"
     check "set A, 32"
 
     expect [0x7df1, 0xffff, 0x0020]
-    check "set imm(65535), imm(32)"
     check "set 65535, 32"
   end
 
@@ -108,13 +95,6 @@ class AssemblerTest < Test::Unit::TestCase
       0x7dc1, 0x0001,
     ]
 
-    check <<-EOS
-      set reg(A), imm(13)
-      label 'loop'
-      add reg(A), imm(1)
-      set pc, l('loop')
-    EOS
-
     check <<-EOS
       set A, 13
       label 'loop'

metadata

@@ -1,36 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scasm
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Rich Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: trollop
-  requirement: &8467060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *8467060
-description: ''
-email:
+  version_requirements: *id001
+description: ""
+email: 
 - rlane@club.cc.cmu.edu
-executables:
+executables: 
 - scasm
 - scasm-disassemble
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -38,6 +49,10 @@ files:
 - Rakefile
 - bin/scasm
 - bin/scasm-disassemble
+- examples/data.scasm
+- examples/loop.scasm
+- examples/macro.scasm
+- examples/readme1.scasm
 - examples/spec.scasm
 - lib/scasm/assembler.rb
 - lib/scasm/isa.rb
@@ -49,28 +64,37 @@ files:
 - test/test_assembler.rb
 homepage: https://github.com/rlane/scasm
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A Ruby DSL for DCPU-16 assembly code
-test_files:
+test_files: 
 - test/foo.scasm
 - test/test_assembler.rb