z80_disassembler 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42aae94b0a155376a9908a01021170bc5c0ef1c585edf3e0fe29709800bd09b
-  data.tar.gz: dc317870df745ae9e22e0f63529d87a55c576471d255e5b6c247d56315447684
+  metadata.gz: 6d345233ff0d5429ba5c05cdb82c304de2ef46b6ebe7761bda8b805c986c85e2
+  data.tar.gz: e43f8bf8fd592ec156d5bb6c942e6847691e853701a65e2b0afdaffd827c626e
 SHA512:
-  metadata.gz: 870c6f6d8a9022a91b73c5b389c4ef14355287faac6e13addc3b9105a54b4a14759b7c3525146387d3eb41af0aa149b4e851cca425543de2ba50e8a3d2663d99
-  data.tar.gz: f1dae199fb41fef2a94504e206ddc6e1a0909aa092d2d36662f097c10ee4b6b575f220fa1aac73b79f58de9a0afbb97a1c729afbb6ccb9d35aeac5e916ce8c22
+  metadata.gz: 991885755e9d4fbe5128b6b81fdb5e4804d6921850acbf9e07bc8c0c66fb290d293ea32be1fc56c1a9da06d55a64d4100b2558f488999812ba832d9a8ab2434c
+  data.tar.gz: db4bdd7cb73f1ba8bdf430c54578f02f1a74ca5de3373bf2b1e4dda855b400652fa0604ca6e1e7cd1b3b0a228f0f4aa79ffb22e9d1d4116c6a0663d625c73bc7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    z80_disassembler (0.1.1)
+    z80_disassembler (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -27,9 +27,10 @@ Or install it yourself as:
 
 - example: parse.C >> parse.C.txt and compare with parse.txt
 ```ruby
-Z80Disassembler::Disassembler.new(params[:file], params[:org]).start
+z = Z80Disassembler::Disassembler.new(params[:file], 32768)
+z.start # return [25114, "#621A", "LD IX,#6300", "DD 21 00 63", " ! c"
+z.text # return asm text "            LD IX,link_1    ; #621A / 25114 ; DD 21 00 63    ;  ! c ;"
 ```
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/z80_disassembler.rb

@@ -15,50 +15,84 @@ module Z80Disassembler
     T_RP  = [   'BC',   'DE',   'HL',   'SP'].freeze
     T_RP2 = [   'BC',   'DE',   'HL',   'AF'].freeze
 
+    ASCII = [
+      ' ', '!', '"', '#', '$', '%', '&', "'", '(', ')', '*', '+', ',', '-', '.', '/',
+      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
+      '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+      'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\',']', '^', '_',
+      '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+      'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~'
+    ].freeze
+
     def initialize(file_name, addr = 32_768)
       @file_name = file_name; @addr = addr.to_i
       @x = 0; @y = 0; @z = 0; @p = 0; @q = 0; @xx = nil
-      @lambda = nil; @prefix = nil; @prev = nil, @bytes = []
+      @lambda = nil; @prefix = nil; @prev = nil
+      @bytes = []; @ascii = []; @result = []
     end
 
     def start
-      result = {}
       File.open(@file_name).each_byte do |byte|
         load_vars(byte)
-        str = case @prefix
-              when 'cb' then @prefix = nil; cb_prefix
-              when 'ed' then @prefix = nil; ed_prefix
-              when 'dd' then @xx = 'IX'; xx_prefix(byte)
-              when 'fd' then @xx = 'IY'; xx_prefix(byte)
-              when 'xx' then temp = @temp; @temp = nil; displacement(byte, temp)
-              when 2    then @prefix -= 1; @temp = byte.to_s(16).rjust(2, '0').upcase; nil
-              when 1
-                resp = @lambda.call(@arg, byte.to_s(16).rjust(2, '0').upcase)
-                @prefix = nil; temp = @temp; @temp = nil
-                if temp && resp.include?(')')
-                  resp = @xx ? displacement(temp.hex, resp) : resp.sub(')', "#{temp})").sub('(', '(#')
-                elsif temp
-                  resp += temp
-                end
-                resp = hl_to_xx(resp, @xx) unless @xx.nil?
-                @xx = nil
-                resp
-              else command
-              end
+        str = command_from_byte(byte)
         @prev = byte.to_s(16)
-        @bytes << @prev.rjust(2, '0')
+        @ascii << ((32..126).include?(byte) ? ASCII[byte - 32] : ' ')
+        @bytes << @prev.rjust(2, '0').upcase
         next unless str
 
-        result[@addr] = ["##{@addr.to_s(16)}".upcase, str, @bytes.join(' ')]
+        @result << [@addr, "##{@addr.to_s(16)}".upcase, str, @bytes.join(' '), @ascii.join]
         @addr += @bytes.size
         @bytes = []
+        @ascii = []
       end
+      @result
+    end
 
-      result
+    def text
+      org = @addr - @file_name.size
+      hash_links = {}
+      link_num = 0
+      int_addrs = org..@addr
+      with_links = @result.select { |z| z[2] =~ /#[0-F]{4}/ && int_addrs.include?(z[2].split('#').last[0..3].hex) }
+      with_links.each { |x| hash_links["##{x[2].split('#').last[0..3]}"] = "link_#{link_num += 1}" }
+      [
+        "                 device zxspectrum48",
+        "                 ORG #{org}",
+        "begin_file:\n"
+      ].join("\n") +
+        @result.map do |addr, addr16, str, bytes, ascii|
+          link = (hash_links[addr16] || '').ljust(16, ' ')
+          adr = '#' + str.split('#').last[0..3]
+          string = hash_links.keys.include?(adr) ? str.sub(adr, hash_links[adr]) : str
+          "#{link} #{string.ljust(16, ' ')}; #{addr16.ljust(5, ' ')} / #{addr.to_s.ljust(5, ' ')} ; #{bytes.ljust(14, ' ')} ; #{ascii.ljust(4, ' ')} ;"
+        end.join("\n")
     end
 
     private
 
+    def command_from_byte(byte)
+      case @prefix
+      when 'cb' then @prefix = nil; cb_prefix
+      when 'ed' then @prefix = nil; ed_prefix
+      when 'dd' then @xx = 'IX'; xx_prefix(byte)
+      when 'fd' then @xx = 'IY'; xx_prefix(byte)
+      when 'xx' then temp = @temp; @temp = nil; displacement(byte, temp)
+      when 2    then @prefix -= 1; @temp = byte.to_s(16).rjust(2, '0').upcase; nil
+      when 1
+        resp = @lambda.call(@arg, byte.to_s(16).rjust(2, '0').upcase)
+        @prefix = nil; temp = @temp; @temp = nil
+        if temp && resp.include?(')')
+          resp = @xx ? displacement(temp.hex, resp) : resp.sub(')', "#{temp})").sub('(', '(#')
+        elsif temp
+          resp += temp
+        end
+        resp = hl_to_xx(resp, @xx) unless @xx.nil?
+        @xx = nil
+        resp
+      else command
+      end
+    end
+
     def hl_to_xx(temp, reg)
       if temp.include?('HL')
         temp.sub('HL', reg)
@@ -70,6 +104,8 @@ module Z80Disassembler
         temp.sub(' H', " #{reg}H")
       elsif temp.include?(',H')
         temp.sub(',H', ",#{reg}H")
+      else
+        temp
       end
     end
 
@@ -97,8 +133,8 @@ module Z80Disassembler
           case @y
           when 0 then 'NOP'
           when 1 then 'EX AF, AF\''
-          when 2 then calc_bytes(->(a, b){ "DJNZ ##{b}" },    nil,        1)
-          when 3 then calc_bytes(->(a, b){ "JR ##{b}" },      nil,        1)
+          when 2 then calc_bytes(->(a, b){ "DJNZ ##{b}" },    nil,          1)
+          when 3 then calc_bytes(->(a, b){ "JR ##{b}" },      nil,          1)
           else        calc_bytes(->(a, b){ "JR #{a},##{b}" }, T_CC[@y - 4], 1)
           end
         when 1 then @q ? "ADD HL,#{T_RP[@p]}" : calc_bytes(->(a, b){ "LD #{a},##{b}" }, T_RP[@p], 2)
@@ -163,7 +199,7 @@ module Z80Disassembler
       elsif ['dd', 'fd'].include?(@prev) && @temp
         temp = @temp; @temp = nil; @prefix = nil; xx = @xx; @xx = nil
         hl_to_xx(temp, xx)
-      elsif @lambda && !@arg.include?('HL')
+      elsif @lambda && !@arg&.include?('HL')
         @prefix = 1; @temp
       else
         @prefix = 2; @temp

data/lib/z80_disassembler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z80_disassembler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - dvitvitskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies: []
 description:
 email: