z80_disassembler 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9531e2820a522fbeac575e6abbfa981605c0e844a6d5089867bc4f2e0570b9e3
-  data.tar.gz: 5396c8c1afa4d9de805a7a2c40aecbb635ede8f365540f106135b76bb902e77a
+  metadata.gz: 5823cf66cb0d52c7313ddb8659a0bda9b44c06569feaea6043af3b5481ca8025
+  data.tar.gz: 291863116b95b7397b901bb17ff66a15ab2ca2b0ac8148ad92cae57acf1ce7ba
 SHA512:
-  metadata.gz: 8884e1eda23ad1b24a87f04b10395007376c2356b75c010ac2ed9df5b25167e2dfc1746745b155358aa6ebd2489e0eb021a47aa42eca9b9b89a0102bec6ec3cb
-  data.tar.gz: 7f174c3374e042f5265b179db3a4d302aa7fae2a6489275dc41a90228224bc05e74267aff4724e56c82ee145836a54d25f3e89f7af33f653d581984acc075335
+  metadata.gz: c15db9eb11f397f32d2fa27b86370baae9d3ec1726a73d5d472fd5b56c33e9dc85b3fbb5e5182ee38a254e981a60d767517c847f69fc75a9a374213f46891c93
+  data.tar.gz: 7a1ea4f6b42f360eac3e7ba9b6492b9857597bcbc92bbda9b392cf74979e27afbda9e1f0a6ff543e1c064bc627de5d0ed41fda750da5d29a1ac4a8d8269d8c8b

data/lib/z80_disassembler.rb

@@ -171,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}"
@@ -182,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)
@@ -288,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

data/lib/z80_disassembler/version.rb

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