z80_disassembler 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe96f8335ed977825007f7846ed1b5b515ee9bab79fad0c67976504926c827e
-  data.tar.gz: c9341766fb32cf922aea077fa5968755b05e05ac03b45d277b8cc9de023f5b46
+  metadata.gz: 9970749ade07cf2808e1e6792d3c45f26d8325e6fc2fd492d6b3f88c4d843c40
+  data.tar.gz: ebbfd99ccff00c4e86e5a8e09e31774359c7798d13ed847c65d1b0e95ccf04e5
 SHA512:
-  metadata.gz: 4fabf9e9a350e8ddedbc85acb8c8f738fd471e347591107f81a169c14c5d3dbca0f779f7706294ec6a3fde06895d6d5a429b6c6c48c8f9e5e84ba2de29097539
-  data.tar.gz: cc8e487897234f43ddc6962d1ce979704b9295a7f99551d592db7413acb5d985ccf0d394952b26d0e08e84caafb91e31a96b1a1abe94f48a154b2cc3332e9010
+  metadata.gz: 8455ef820171b02eb4e886a7a37ef4dc43679c0c8bf4b777d9dc73e93732c4ec8899da13b4ea73d38f4704d5b8487ba42ab722cda462b11a7a33f7b46f68eefc
+  data.tar.gz: cecc4ee2168d08c0e1a373209f472cc78936f69e8f6ad067b04e9632e44c9d7291b3027215c5a6329d2226dfeb8a208b1aa28adb9c2ba6b56e400785f74e51c2

data/lib/z80_disassembler.rb

@@ -26,7 +26,7 @@ module Z80Disassembler
     ].freeze
 
     def initialize(file, org = 32_768)
-      @file = file; @org = org.to_i
+      @file = file; @org = 25108 # org.to_i
       if file.original_filename[-3..-1] == '.$C'
         File.open(@file) do |f|
           z = f.read(17)
@@ -131,13 +131,15 @@ 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)')
+          resp += temp
+        elsif temp && resp.include?(')')
+          # resp = @xx ? displacement(temp.hex, resp) :
+          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}"
@@ -149,6 +151,7 @@ module Z80Disassembler
     end
 
     def hl_to_xx(temp, reg)
+      @xx = nil
       if temp.include?('HL')
         temp.sub('HL', reg)
       elsif temp.include?(' L')
@@ -167,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 = ['', "+#{byte.to_s}", byte.to_s][byte <=> 0]
       temp.sub('HL', @xx + des)
     end
 
@@ -252,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.4'
+  VERSION = '0.2.5'
 end

metadata

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