z80_disassembler 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fda0599a6e835b5063fc6115dcdc364cfc895b2a7cbf1dba8f57965698526a5
-  data.tar.gz: 705361c3aa8d088e967411643e9774a1d1cbc169a9e7ce57d8ffa8087a833f68
+  metadata.gz: 56e8580f70e53450065ba78d68f19758e0072a28f1eec1c67ac4cff7d825e464
+  data.tar.gz: 62f84332480a3e3cd218f41db288e9050d908e05fccb550a288823b23193a9e3
 SHA512:
-  metadata.gz: 6b2b887c58d4bf48e32094f9753e71520ff3b1c12d7d7ab46870c0179628005b3e13be8c191c0fd305e78004c3b2b630833536fceb77ff49f004ed19cb17b59e
-  data.tar.gz: cfd8680fc373ed1031ffd89af3ad8ff7c1cdb67f6fa5e5aa53f15b9f1d4e172c7c5983f14d62914f2baa3e0d49249472f744cb851b69770c546205e51f3c4b5e
+  metadata.gz: 6ea0700062335768dbf0d6fe916f1b3c318a8312c018c6a84519d95a6c9d218fb0fe7277ed93dfc9ddcdbecc7d62c37a1eed15110bc2501ecde3b9870245f147
+  data.tar.gz: 173aa895338469e982c9f82f41a8d1b458eb7bfd5cf357ba0c0dd81db56d555754597b266ce6cae83d6d327bb04d39026bd320f0b9d34b6703a7e0f605fa60a7

data/lib/z80_disassembler.rb

@@ -6,7 +6,7 @@ module Z80Disassembler
   class Error < StandardError; end
 
   class Disassembler
-    attr_reader :org
+    attr_reader :org, :file_size
 
     #             0       1       2       3       4       5       6       7
     T_R   = [    'B',    'C',    'D',    'E',    'H',    'L', '(HL)',    'A'].freeze
@@ -69,29 +69,75 @@ module Z80Disassembler
       del_links = []
       link_num = 0
       int_addrs = @org..(@org + @file_size)
-      with_links = @result.select { |z| z[2] =~ /#[0-F]{4}/ && int_addrs.include?(z[2].split('#').last[0..3].hex) }
-      with_links.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]
       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] || '').ljust(16, ' ')
-        adr = '#' + str.split('#').last[0..3]
-        string = hash_links.keys.include?(adr) ? str.sub(adr, hash_links[adr]) : str
+        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} "
+      ]
       [
+        *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',
+        'LOAD      = #EF',
+        'CLEAR     = #FD',
+        'RANDOMIZE = #F9',
+        '        org #5C00',
+        '        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',
+        '        org codnam',
+        '        db "disasm"',
+        '        org codnam + 10',
+        '        db "\"", CODE, ":"',
+        '        db RANDOMIZE, USR, "8", #0E, 0, 0',
+        '        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, end - begin',
+        '        savebin "disasm.C",   begin, length',
+        '        savehob "disasm.$C", "disasm.C", begin, length',
         ''
       ].join("\n")
     end
@@ -113,16 +159,18 @@ 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}" : "$-#{255 - z[1].hex}"
+          z[1] = z[1].hex < 127 ? "$+#{z[1].hex + 2}" : "$-#{255 - z[1].hex - 1}"
           resp = z.join
         end
         resp
@@ -131,6 +179,7 @@ module Z80Disassembler
     end
 
     def hl_to_xx(temp, reg)
+      @xx = nil
       if temp.include?('HL')
         temp.sub('HL', reg)
       elsif temp.include?(' L')
@@ -149,7 +198,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
 
@@ -195,7 +244,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)
@@ -234,8 +283,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.3'
+  VERSION = '0.3.0'
 end

metadata

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