gasm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd06be7e5047c313deeb459a869c00cbf56ff8efd4d3d4190cd825ba09353eb3
-  data.tar.gz: da6ddd558a76a47819abe388c3cd57564c89530ec762f6493c793d6a81225a2b
+  metadata.gz: ccae527d5bcdb0a59180066a9afc933419b48651c30db1d91f7e76f0ba94a2c0
+  data.tar.gz: 19b1662105f3125c1d53f98039191eb68664ad035033c354659c8283d5e5f8eb
 SHA512:
-  metadata.gz: 68e594afb0d28eb6b22bf9e8fb126881157f2e447edbeac877cf86e0320665534b451ce96bb239cfa976389acebe669d0d05b1c3c440cb3c348e246749e9b26d
-  data.tar.gz: 57f58715abe134ed443389ab2d432b454f4239b6dcf6ebd3703f80fed67da13533d9ad2fcad05930d8055a11be814b1d241c6ffa0e6659eb3b1f129954f44dd3
+  metadata.gz: c58736d7157d72eef6ae7566d41cc001f0be3bf177063647119f17c98133ef839ef3720ae38143d9629bf08e4bb1a724593958d3da22253cf6af390361c3665a
+  data.tar.gz: a649646e47bd77f3dce4ceafc0659825055ca0911ae4eca5bfacb658bdf2057a170615fb736f4b61709999933b0eac25ac07054c8eaf28c40f26bc3ed896adbf

data/data/gasm/cpus/6502.gasm.rb

@@ -10,7 +10,7 @@ asm do
       opcodes.each_with_index do |opcode, oi|
         addrmodes.each_with_index do |(pattern, zeropage, operands), ai|
           next if pattern.nil?
-          next if pattern == '___'
+          next if opcode.start_with? '__'
 
           a = oi.to_s(2).rjust(3, '0')
           b = ai.to_s(2).rjust(3, '0')

data/data/gasm/cpus/chip8.gasm.rb

@@ -3,7 +3,7 @@ asm do
     # Generate matchers for hex values for register
     def vp(pattern, bits)
       if pattern.include?('V<x>')
-        hex_letters = %w[a b c d e f A B C D E F]
+        hex_letters = %w[0 1 2 3 4 5 6 7 8 9 a b c d e f A B C D E F]
         hex_letters.each do |register_x|
             pattern_a = pattern.gsub('V<x>', "V#{register_x}")
             bits_a = bits.gsub('xxxx', "#{register_x.to_i(16).to_s(2)}")

data/exe/gasm

@@ -4,6 +4,13 @@ require 'gasm'
 
 include Gasm
 
+disasm = false
+
+if ARGV[0] == '-d'
+  disasm = true
+  ARGV.shift
+end
+
 asm_desc = ARGV[0]
 asm_file = ARGV[1]
 
@@ -61,17 +68,28 @@ rescue => e
   exit(1)
 end
 
+reader = Asm
+
+# disassembly mode
+if disasm
+  STDERR.puts 'Disassembling...'
+  reader = Disasm
+else
+  STDERR.puts 'Assembling...'
+end
 
 asm = if asm_file == '-'
-  Asm.new(STDIN.read, matcher)
+  reader.new(STDIN.read, matcher)
   
 else
   if !File.exist?(asm_file)
-    STDERR.puts "'#{asm_file}' asm does not exist"
+    STDERR.puts "File '#{asm_file}' does not exist"
     exit(1)
   end
-  
-  Asm.new(File.read(asm_file), matcher)
+
+  file = File.open(asm_file, "rb")
+  contents = file.read
+  reader.new(contents, matcher)
 end
 
-puts asm.compiled
+puts asm.output

data/lib/gasm/asm.rb

@@ -5,7 +5,7 @@ module Gasm
       @contents = contents
     end
 
-    def compiled
+    def output
       lines = @contents.split("\n")
       offset = 0
 

data/lib/gasm/disasm.rb

@@ -0,0 +1,24 @@
+module Gasm
+  class Disasm
+    def initialize(contents, gasm)
+      @gasm = gasm
+      @contents = contents
+    end
+    
+    def output
+      result = []
+
+      index = 0
+      loop do
+        res = @gasm.disparse(@contents, index)
+        index += res[:amountread]
+        result << res[:instruction]
+        break if index >= @contents.length
+      rescue => e
+        result << "// -incomplete- disassembling stopped: #{e.message} at index 0x#{index.to_s(16)} '0x#{@contents[index].unpack('C')[0].to_s(16)}'"
+        break
+      end
+      result.join("\n")
+    end
+  end
+end

data/lib/gasm/gasm_matcher.rb

@@ -11,8 +11,55 @@ module Gasm
     def strip_comment(line)
       line.split('//')[0]
     end
+
+    def disparse(contents, index)
+      match = nil
+
+      @desc['asm']['instructions'].each do |k, info|
+        bitpattern = info[:bits].tr(' ', '')
+        
+        vars = {}
+        match = [k, info, vars, bitpattern.length >> 3]
+        bitpattern.split('').each_with_index do |chr, i|
+          byte_index = (i >> 3) + index
+          bit_index = i % 8
+          
+          if byte_index >= contents.length
+            match = nil
+            next
+          end
+
+          contentbits = contents[byte_index].unpack("C")[0].to_s(2).rjust(8, '0')
+
+          c = contentbits[bit_index]
+          if chr == '0' || chr == '1'
+            if c != chr
+              match = nil
+              break
+            end
+          else
+            vars[chr] ||= ''
+            vars[chr] += c
+          end
+        end
+
+        break if match
+      end
+
+      raise 'unknown pattern' if match.nil?
+      
+      result = match[0]
+      match[2].each do |var, val|
+        result.gsub!("<#{var}>", "$#{val.to_i(2).to_s(16)}")
+      end
+
+      {
+        amountread: match[3],
+        instruction: result
+      }
+    end
     
-    NUMCHARS = %[0 1 2 3 4 5 6 7 8 9 a b c d e f o x b $ %]
+    NUMCHARS = %[0 1 2 3 4 5 6 7 8 9 a b c d e f o x $ %]
     def parse(line)
       line = strip_comment(line)
       line = strip_spaces(line)
@@ -21,6 +68,7 @@ module Gasm
       result = ''
       values = {}
       idx = 0
+      pattern = ''
       
       @desc['asm']['instructions'].each do |k, info|
         result = info[:bits]
@@ -105,6 +153,8 @@ module Gasm
         unless info[:condition].call(values.map{|k,v| [k.to_sym, v.to_i(2)]}.to_h)
           result = nil
         end
+
+        pattern = info[:bits]
         
         break unless result.nil?
       end
@@ -121,7 +171,7 @@ module Gasm
       lastvar = ' '
       output = ''
       
-      evalues = endiannize(values)
+      evalues = endiannize(values, pattern)
       loop do
         
         if result[idx] == lastvar
@@ -170,20 +220,20 @@ module Gasm
       ].join("\n")
     end
     
-    def littleendian(bitstr)
+    def littleendian(bitstr, len)
       # flips a bit string around to blocks of 8 little endian bytes
       # 1. reverse the string
       # 2. cut it into blocks of 8
       # 3. reverse each block of 8
       # 4. et voila
-      bitstr.split('').reverse.each_slice(8).map{|x| x.reverse}.flatten.join('')
+      bitstr.rjust(len, '0').split('').reverse.each_slice(8).map{|x| x.reverse}.flatten.join('')
     end
     
-    def endiannize(values)
+    def endiannize(values, pattern)
       # transforms the values array into big and small endian versions
       result = {}
       values.each do |k,v|
-        result[k] = littleendian(v)
+        result[k] = littleendian(v, pattern.count(k))
         result[k.upcase] = v
       end
       result

data/lib/gasm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gasm
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/gasm.rb

@@ -1,4 +1,5 @@
 require 'gasm/gasm_loader'
 require 'gasm/ruby_desc'
+require 'gasm/disasm'
 require 'gasm/asm'
 require 'gasm/gasm_matcher'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gasm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Siaw
@@ -41,6 +41,7 @@ files:
 - gasm.gemspec
 - lib/gasm.rb
 - lib/gasm/asm.rb
+- lib/gasm/disasm.rb
 - lib/gasm/gasm_loader.rb
 - lib/gasm/gasm_matcher.rb
 - lib/gasm/instruction_section.rb