z80_disassembler 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89919a8e31426ffe53e01448701e22a11015ee15a2a750d294e6cc2b1d23b66
-  data.tar.gz: 6fcb81e94bb2b94b8fffb5420585a6031445b12f8d05e59c632d20cc367f61ad
+  metadata.gz: 6d345233ff0d5429ba5c05cdb82c304de2ef46b6ebe7761bda8b805c986c85e2
+  data.tar.gz: e43f8bf8fd592ec156d5bb6c942e6847691e853701a65e2b0afdaffd827c626e
 SHA512:
-  metadata.gz: a214c2d6f7d70af405911cd305a2213a327f00d33ace63e88c5a30d16bcfea243e6ff5f0a4175af176a7407514195a8ef9e97a5a240bb9a27d590ffae88d9669
-  data.tar.gz: eb2dd90529f337f516691e5eacfcab0a619565baf008f4cfacb1b69a157a0edbb9e5e59eb0f7ec5e01da03a691d1c2d4a885f6caec8a1654fff4425b80611241
+  metadata.gz: 991885755e9d4fbe5128b6b81fdb5e4804d6921850acbf9e07bc8c0c66fb290d293ea32be1fc56c1a9da06d55a64d4100b2558f488999812ba832d9a8ab2434c
+  data.tar.gz: db4bdd7cb73f1ba8bdf430c54578f02f1a74ca5de3373bf2b1e4dda855b400652fa0604ca6e1e7cd1b3b0a228f0f4aa79ffb22e9d1d4116c6a0663d625c73bc7

data/README.md

@@ -27,10 +27,10 @@ Or install it yourself as:
 
 - example: parse.C >> parse.C.txt and compare with parse.txt
 ```ruby
-Z80Disassembler::Disassembler.new(params[:file], 32768).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 ;"
 ```
-return hash { 32768=>["#8000", "PUSH IY", "fd e5"], 32770=>[...], ... }
-
 ## 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

@@ -28,38 +28,19 @@ module Z80Disassembler
       @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 = []; @ascii = []; @result = {}
+      @bytes = []; @ascii = []; @result = []
     end
 
     def start
       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)
-        @ascii << ((32..126).include?(byte) ? ASCII[byte - 32] : '_')
+        @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]
+        @result << [@addr, "##{@addr.to_s(16)}".upcase, str, @bytes.join(' '), @ascii.join]
         @addr += @bytes.size
         @bytes = []
         @ascii = []
@@ -67,8 +48,51 @@ module Z80Disassembler
       @result
     end
 
+    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)

data/lib/z80_disassembler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Z80Disassembler
-  VERSION = '0.2.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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - dvitvitskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies: []
 description:
 email: