z80_disassembler 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d345233ff0d5429ba5c05cdb82c304de2ef46b6ebe7761bda8b805c986c85e2
-  data.tar.gz: e43f8bf8fd592ec156d5bb6c942e6847691e853701a65e2b0afdaffd827c626e
+  metadata.gz: 1978d7b54f457019351da2f76221d0f10d2670af3daef7584fe0b5ed1b2fbca1
+  data.tar.gz: bdfb0bd39eb724dbffd4958bfe27ccf814e472ebcbab22376cca2c09fedda7af
 SHA512:
-  metadata.gz: 991885755e9d4fbe5128b6b81fdb5e4804d6921850acbf9e07bc8c0c66fb290d293ea32be1fc56c1a9da06d55a64d4100b2558f488999812ba832d9a8ab2434c
-  data.tar.gz: db4bdd7cb73f1ba8bdf430c54578f02f1a74ca5de3373bf2b1e4dda855b400652fa0604ca6e1e7cd1b3b0a228f0f4aa79ffb22e9d1d4116c6a0663d625c73bc7
+  metadata.gz: c843df467fc7bbc7bdc8a58806ea8eebbef00aad80e1ec5901d07c0ea0b2aaf7c7c7353a22b406e1a1fe3c74a057ba75529bf7dda114e4fe96003023d352dbde
+  data.tar.gz: 609ada4bff4bb488015456b9134693c8d5426db2e575e6166bbb7ff9d72b820d086b3eac98ddc642b3dc3479c4c889fadc3de815805207a09efa6c25020e497a

data/README.md

@@ -28,8 +28,8 @@ Or install it yourself as:
 - example: parse.C >> parse.C.txt and compare with parse.txt
 ```ruby
 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 ;"
+z.start # return [ [25114, "#621A", "LD IX,#6300", "DD 21 00 63", " ! c"], [...], ... ]
+z.text # return "            LD IX,link_1    ; #621A / 25114 ; DD 21 00 63    ;  ! c ;\n"
 ```
 ## Development
 

data/lib/z80_disassembler.rb

@@ -6,6 +6,8 @@ module Z80Disassembler
   class Error < StandardError; end
 
   class Disassembler
+    attr_reader :org
+
     #             0       1       2       3       4       5       6       7
     T_R   = [    'B',    'C',    'D',    'E',    'H',    'L', '(HL)',    'A'].freeze
     T_CC  = [   'NZ',    'Z',   'NC',    'C',   'PO',   'PE',    'P',    'M'].freeze
@@ -14,7 +16,6 @@ module Z80Disassembler
     T_IM  = [    '0',  '0/1',    '1',    '2',    '0',  '0/1',    '1',    '2'].freeze
     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', ':', ';', '<', '=', '>', '?',
@@ -24,52 +25,101 @@ module Z80Disassembler
       '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
+    def initialize(file, org = 32_768)
+      @file = file; @org = org.to_i
+      if file.original_filename[-3..-1] == '.$C'
+        File.open(@file) do |f|
+          z = f.read(17)
+          @file_name   = "#{z[0..7]}.#{z[8]}"
+          @org         = bytes_to_int(z[ 9..10])
+          @file_size   = bytes_to_int(z[11..12])
+          @sectors     = bytes_to_int(z[13..14])
+          checksum1    = bytes_to_int(z[15..16])
+          checksum2    = (z[0..14].sum * 257 + 105).to_s(16)[-4..-1].hex
+          @code        = f.read(@file_size).bytes if checksum1 == checksum2
+        end
+      end
+      @code ||= File.open(@file).read.bytes
+      @file_size ||= @file.size
       @x = 0; @y = 0; @z = 0; @p = 0; @q = 0; @xx = nil
-      @lambda = nil; @prefix = nil; @prev = nil
-      @bytes = []; @ascii = []; @result = []
+      @lambda = nil; @prefix = nil; @prev = nil; @result = []
     end
 
     def start
-      File.open(@file_name).each_byte do |byte|
+      addr = @org
+      bytes = []; ascii = []
+      @code.each do |byte|
         load_vars(byte)
         str = command_from_byte(byte)
         @prev = byte.to_s(16)
-        @ascii << ((32..126).include?(byte) ? ASCII[byte - 32] : ' ')
-        @bytes << @prev.rjust(2, '0').upcase
+        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(' '), @ascii.join]
-        @addr += @bytes.size
-        @bytes = []
-        @ascii = []
+        @result << [addr, "##{addr.to_s(16)}".upcase, str, bytes.join(' '), ascii.join]
+        addr += bytes.size
+        bytes = []
+        ascii = []
       end
       @result
     end
 
     def text
-      org = @addr - @file_name.size
       hash_links = {}
+      del_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}" }
+      int_addrs = @org..(@org + @file_size)
+      @result.select { |z| z[2] =~ /#[0-F]{4}/ && int_addrs.include?(z[2].split('#').last[0..3].hex) }.each do |x|
+        z = "##{x[2].split('#').last[0..3]}"
+        hash_links[z] = "link_#{link_num += 1}" unless hash_links[z]
+      end
+      @result.select { |z| z[2] =~ /\$/ }.each do |x|
+        z = "##{ (x[0] + x[2].split('$').last.to_i).to_s(16).upcase }"
+        hash_links[z] = "link_#{link_num += 1}" unless hash_links[z]
+      end
+      code = @result.map do |addr, addr16, str, bytes, ascii|
+        del_links << hash_links[addr16] if hash_links[addr16]
+        link = (hash_links[addr16] ? (hash_links[addr16] + ':') : '').ljust(16, ' ')
+        substr, adr = if str.include?('$')
+                        ["$#{str.split('$').last}", "##{(addr + str.split('$').last.to_i).to_s(16).upcase}"]
+                      else
+                        adr = "##{str.split('#').last[0..3]}"
+                        [adr, adr]
+                      end
+        string = hash_links.keys.include?(adr) ? str.sub(substr, 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")
+
+      header = [
+        ";--- #{Date.today} --- https://rmda.su ",
+        ';    _______  _/| __ ______    ____ ',
+        ';   /  __   //  |/  \\\\   _  \ /    \ ',
+        ';  /   _/ _//        \\\\  \\\\  \\\\  \  \ ',
+        ';  \___\   \\\\___\/___//______//__/\__\ ',
+        ';       \__/ ',
+        ";--- size: #{@file_size} --- filename: #{@file_name} "
+      ]
       [
-        "                 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")
+        *header,
+        '                 device zxspectrum48',
+        '                 ORG #' + @org.to_s(16),
+        hash_links.map { |key, val| "#{val.ljust(16, ' ')} equ #{key}" unless del_links.include?(val) }.compact.join("\n"),
+        'begin:',
+        code,
+        'end:',
+        '        savesna "disasm.sna", begin',
+        '        savebin "disasm.C", begin, end - begin',
+        ''
+      ].join("\n")
     end
 
     private
 
+    def bytes_to_int(array)
+      array.bytes.reverse.map { |x| x.to_s(16).rjust(2, "0") }.join.hex
+    end
+
     def command_from_byte(byte)
       case @prefix
       when 'cb' then @prefix = nil; cb_prefix
@@ -81,19 +131,27 @@ module Z80Disassembler
       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('(', '(#')
+        if temp && resp.include?('(HL)')
+          @xx ? resp = displacement(temp.hex, resp) : resp += temp
+        elsif temp && resp.include?(')')
+          # resp = displacement(temp.hex, resp) if @xx
+          resp = resp.sub(')', "#{temp})").sub('(', '(#')
         elsif temp
           resp += temp
         end
         resp = hl_to_xx(resp, @xx) unless @xx.nil?
-        @xx = nil
+        if resp.include?('JR') || resp.include?('DJNZ')
+          z = resp.split('#')
+          z[1] = z[1].hex < 127 ? "$+#{z[1].hex + 2}" : "$-#{255 - z[1].hex - 1}"
+          resp = z.join
+        end
         resp
       else command
       end
     end
 
     def hl_to_xx(temp, reg)
+      @xx = nil
       if temp.include?('HL')
         temp.sub('HL', reg)
       elsif temp.include?(' L')
@@ -112,7 +170,7 @@ module Z80Disassembler
     def displacement(byte, temp)
       @prefix = nil
       byte -= 256 if byte > 127
-      des = ['', "+#{byte.to_s(16)}", byte.to_s(16)][byte <=> 0]
+      des = ['+0', "+#{byte}", byte.to_s][byte <=> 0]
       temp.sub('HL', @xx + des)
     end
 
@@ -133,8 +191,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)
@@ -158,7 +216,7 @@ module Z80Disassembler
         case @z
         when 0 then "RET #{T_CC[@y]}"
         when 1 then @q ? ['RET','EXX','JP HL','LD SP, HL'][@p] : "POP #{T_RP2[@p]}"
-        when 2 then calc_bytes(->(a, b){ "JP #{a},#{b}" }, T_CC[@y], 2)
+        when 2 then calc_bytes(->(a, b){ "JP #{a},##{b}" }, T_CC[@y], 2)
         when 3
           case @y
           when 0 then calc_bytes(->(a, b){ "JP ##{b}" }, nil, 2)
@@ -197,8 +255,8 @@ module Z80Disassembler
       if @temp&.include?('(')
         @prefix = 'xx'; nil
       elsif ['dd', 'fd'].include?(@prev) && @temp
-        temp = @temp; @temp = nil; @prefix = nil; xx = @xx; @xx = nil
-        hl_to_xx(temp, xx)
+        temp = @temp; @temp = nil; @prefix = nil
+        hl_to_xx(temp, @xx)
       elsif @lambda && !@arg&.include?('HL')
         @prefix = 1; @temp
       else

data/lib/z80_disassembler/version.rb

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

metadata

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