z80_disassembler 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02a2e2d32e438dfeec508dbb3d7c2d9346144a401398a5d1d512352c59750b89
-  data.tar.gz: 6b502bcf23a6d7fcb77468b18be19bc8bcd679a8382896d9468afee8a21b3b11
+  metadata.gz: 5823cf66cb0d52c7313ddb8659a0bda9b44c06569feaea6043af3b5481ca8025
+  data.tar.gz: 291863116b95b7397b901bb17ff66a15ab2ca2b0ac8148ad92cae57acf1ce7ba
 SHA512:
-  metadata.gz: 07a73a8a7504f85f2c91e952d249a4521e16e567b45387f011d0821d24d941aaa7faa1f1e3eedac1a621e234e139cb6feef413ebd548bf7ca0b9526bae24ee83
-  data.tar.gz: 482d90cf0c3e6b5938e9323319c086e93435178bbcd3c4c38be33b0871b932a8b99e016dce7546253be39be99a3a36d216ab8e14635488df046f7c01dc2a2816
+  metadata.gz: c15db9eb11f397f32d2fa27b86370baae9d3ec1726a73d5d472fd5b56c33e9dc85b3fbb5e5182ee38a254e981a60d767517c847f69fc75a9a374213f46891c93
+  data.tar.gz: 7a1ea4f6b42f360eac3e7ba9b6492b9857597bcbc92bbda9b392cf74979e27afbda9e1f0a6ff543e1c064bc627de5d0ed41fda750da5d29a1ac4a8d8269d8c8b

data/README.md

@@ -20,16 +20,20 @@ Or install it yourself as:
 
 ## Usage
 
-- prepare: parse.asm >> parse.C
-```bash
- sjasmplus parse.asm
-```
+* Example: zxn.ru/disasm - DEMO button
 
-- 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 "            LD IX,link_1    ; #621A / 25114 ; DD 21 00 63    ;  ! c ;\n"
+text = z.start
+z.file_size
+z.org
+file_name = 'tmp/disasm'
+file = Tempfile.new(file_name)
+file.write(text)
+file.write(Z80Disassembler::Disassembler.compile_text(file_name))
+file.close
+compiled = system "sjasmplus --nologo #{file.path} 2> #{file_name}.log"
+logs = File.open("#{file_name}.log").read.split("\n")
 ```
 ## Development
 

data/lib/z80_disassembler.rb

@@ -6,7 +6,7 @@ module Z80Disassembler
   class Error < StandardError; end
 
   class Disassembler
-    attr_reader :org, :file_size
+    attr_reader :org, :file_size, :rmda
 
     #             0       1       2       3       4       5       6       7
     T_R   = [    'B',    'C',    'D',    'E',    'H',    'L', '(HL)',    'A'].freeze
@@ -42,10 +42,22 @@ module Z80Disassembler
       @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; @result = []
+      @lambda = nil; @prefix = nil; @prev = nil
+      @hash_links = {}; @del_links = []
+      @rmda = """
+;--- #{Date.today} --- https://rmda.su
+;    _______  _/| __ ______    ____
+;   /  __   //  |/  \\\\   _  \\ /    \\
+;  /   _/ _//        \\\\  \\\\  \\\\  \\  \\
+;  \\___\\   \\\\___\\/___//______//__/\\__\\
+;       \\__/
+;--- size: #{@file_size}b #{"--- filename: #{@file_name}" if @file_name}
+
+      """
     end
 
     def start
+      result = []
       addr = @org
       bytes = []; ascii = []
       @code.each do |byte|
@@ -56,58 +68,51 @@ module Z80Disassembler
         bytes << @prev.rjust(2, '0').upcase
         next unless str
 
-        @result << [addr, "##{addr.to_s(16)}".upcase, str, bytes.join(' '), ascii.join]
+        result << [addr, "##{addr.to_s(16)}".upcase, str, bytes.join(' '), ascii.join]
         addr += bytes.size
         bytes = []
         ascii = []
       end
-      @result
-    end
 
-    def text
-      hash_links = {}
-      del_links = []
       link_num = 0
       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|
+      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]
+        @hash_links[z] = "link_#{link_num += 1}" unless @hash_links[z]
       end
-      @result.select { |z| z[2] =~ /\$/ }.each do |x|
+      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]
+        @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, ' ')
+      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}"]
+                        ["$#{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
+        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, ' ')} ;"
+        defb = bytes_.split(" ").map { |x| "##{x}"}.join(",")
+        "#{link} #{string.ljust(16, ' ')}; #{addr16.ljust(5, ' ')} / #{addr_.to_s.ljust(5, ' ')} ; #{ascii_.ljust(4, ' ')} ; #{defb}"
       end.join("\n")
+      [
+          @rmda,
+          '                 device zxspectrum128',
+          '                 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:',
+          ''
+      ].join("\n")
+    end
 
-      header = [
-        ";--- #{Date.today} --- https://rmda.su ",
-        ';    _______  _/| __ ______    ____ ',
-        ';   /  __   //  |/  \\\\   _  \ /    \ ',
-        ';  /   _/ _//        \\\\  \\\\  \\\\  \  \ ',
-        ';  \___\   \\\\___\/___//______//__/\__\ ',
-        ';       \__/ ',
-        ";--- size: #{@file_size} --- filename: #{@file_name} "
-      ]
+    def self.compile_text(file_name)
+      name = file_name.split('/').last
       [
-        *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:',
         'length equ end - begin',
         'CODE      = #AF',
         'USR       = #C0',
@@ -115,29 +120,28 @@ module Z80Disassembler
         'CLEAR     = #FD',
         'RANDOMIZE = #F9',
         '        org #5C00',
-        'baszac db 0, 1', # Line number
-        '        dw linlen',      # Line length
-        'linzac',
-        '        db CLEAR, "8", #0E, 0, 0',
+        'baszac  db 0,1',    # Line number
+        '        dw linlen', # Line length
+        'linzac  db CLEAR, "8", #0E, 0, 0',
         '        dw begin - 1',
         '        db 0, ":"',
         '        db LOAD, "\""',
-        'codnam ds 10, 32',
+        'codnam  ds 10, 32',
         '        org codnam',
         '        db "disasm"',
         '        org codnam + 10',
         '        db "\"", CODE, ":"',
         '        db RANDOMIZE, USR, "8", #0E, 0, 0',
-        '        dw begin',       # call address
+        '        dw begin',  # call address
         '        db 0, #0D',
         'linlen = $ - linzac',
         'baslen = $ - baszac',
-        '        emptytap "disasm.tap"',
-        '        savetap "disasm.tap", BASIC, "disasm", baszac, baslen, 1',
-        '        savetap "disasm.tap", CODE,  "disasm", begin,  length, begin',
-        '        savesna "disasm.sna", begin',
-        '        savebin "disasm.C",   begin, length',
-        '        savehob "disasm.$C", "disasm.C", begin, length',
+        "        emptytap '#{file_name}.tap'",
+        "        savetap '#{file_name}.tap', BASIC, '#{name}', baszac, baslen, 1",
+        "        savetap '#{file_name}.tap', CODE,  '#{name}', begin,  length, begin",
+        "        savesna '#{file_name}.sna', begin",
+        "        savebin '#{file_name}.bin', begin, length",
+        "        savehob '#{file_name}.$C', '#{file_name}.bin', begin, length",
         ''
       ].join("\n")
     end
@@ -145,13 +149,13 @@ module Z80Disassembler
     private
 
     def bytes_to_int(array)
-      array.bytes.reverse.map { |x| x.to_s(16).rjust(2, "0") }.join.hex
+      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
-      when 'ed' then @prefix = nil; ed_prefix
+      when 'ed' then @prefix = nil; ed_prefix(byte)
       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)
@@ -167,7 +171,7 @@ module Z80Disassembler
         elsif temp
           resp += temp
         end
-        resp = hl_to_xx(resp, @xx) unless @xx.nil?
+        resp = hl_to_xx(resp) unless @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}"
@@ -178,21 +182,22 @@ module Z80Disassembler
       end
     end
 
-    def hl_to_xx(temp, reg)
-      @xx = nil
-      if temp.include?('HL')
-        temp.sub('HL', reg)
+    def hl_to_xx(temp)
+      resp = if temp.include?('HL')
+        temp.sub('HL', @xx)
       elsif temp.include?(' L')
-        temp.sub(' L', " #{reg}L")
+        temp.sub(' L', " #{@xx}L")
       elsif temp.include?(',L')
-        temp.sub(',L', ",#{reg}L")
+        temp.sub(',L', ",#{@xx}L")
       elsif temp.include?(' H')
-        temp.sub(' H', " #{reg}H")
+        temp.sub(' H', " #{@xx}H")
       elsif temp.include?(',H')
-        temp.sub(',H', ",#{reg}H")
+        temp.sub(',H', ",#{@xx}H")
       else
-        temp
+        @xx ? "DB ##{@xx == 'IX' ? 'DD' : 'FD'} ;\n#{''.ljust(16, ' ')} #{temp.ljust(16, ' ')}" : temp
       end
+      @xx = nil
+      resp
     end
 
     def displacement(byte, temp)
@@ -284,7 +289,7 @@ module Z80Disassembler
         @prefix = 'xx'; nil
       elsif ['dd', 'fd'].include?(@prev) && @temp
         temp = @temp; @temp = nil; @prefix = nil
-        hl_to_xx(temp, @xx)
+        hl_to_xx(temp)
       elsif @lambda && !@arg&.include?('HL')
         @prefix = 1; @temp
       else
@@ -296,7 +301,7 @@ module Z80Disassembler
       ["#{T_ROT[@y]} ", "BIT #{@y},", "RES #{@y},", "SET #{@y},"][@x] + T_R[@z]
     end
 
-    def ed_prefix
+    def ed_prefix(byte)
       if @x == 1
         case @z
         when 0 then "IN #{"#{T_R[@y]}," if @y != 6}(C)"
@@ -311,7 +316,7 @@ module Z80Disassembler
       elsif @x == 2 && @z <= 3 && @y >= 4
         [['LDI','CPI','INI','OUTI'],['LDD','CPD','IND','OUTD'],['LDIR','CPIR','INIR','OTIR'],['LDDR','CPDR','INDR','OTDR']][@y - 4][@z]
       else
-        'NOP'
+        "#{'DB #ED'}, ##{byte.to_s(16).rjust(2, '0').upcase}"
       end
     end
   end

data/lib/z80_disassembler/version.rb

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

metadata

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