z80_disassembler 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec8c298c96f675474f4497b21dcaa30916ee84d4d9497cb9955077492a82c8b
-  data.tar.gz: 743c39db53d628947ecb3ee2e2975429148502f9423a72ff1f932463d597607e
+  metadata.gz: 1978d7b54f457019351da2f76221d0f10d2670af3daef7584fe0b5ed1b2fbca1
+  data.tar.gz: bdfb0bd39eb724dbffd4958bfe27ccf814e472ebcbab22376cca2c09fedda7af
 SHA512:
-  metadata.gz: ecfb066e24b951e0dc21faedc8943183f60bc0c4e1fe22ac865d47ba3ffcf25a95ecceda7a1f01beb7d2f2ba14c588c513c51bb7e939d3b341cf6df0a352d2da
-  data.tar.gz: 9be12ff8b4614e4c47fe6342f38d149b92a9a49d9bc09dea4d098435f34bd80b5d283cc809bce2ea4a7a84d0330f90b7e7013d541374cc5a909e8c4b9e2c8d64
+  metadata.gz: c843df467fc7bbc7bdc8a58806ea8eebbef00aad80e1ec5901d07c0ea0b2aaf7c7c7353a22b406e1a1fe3c74a057ba75529bf7dda114e4fe96003023d352dbde
+  data.tar.gz: 609ada4bff4bb488015456b9134693c8d5426db2e575e6166bbb7ff9d72b820d086b3eac98ddc642b3dc3479c4c889fadc3de815805207a09efa6c25020e497a

data/lib/z80_disassembler.rb

@@ -132,9 +132,9 @@ module Z80Disassembler
         resp = @lambda.call(@arg, byte.to_s(16).rjust(2, '0').upcase)
         @prefix = nil; temp = @temp; @temp = nil
         if temp && resp.include?('(HL)')
-          resp += temp
+          @xx ? resp = displacement(temp.hex, resp) : resp += temp
         elsif temp && resp.include?(')')
-          # resp = @xx ? displacement(temp.hex, resp) :
+          # resp = displacement(temp.hex, resp) if @xx
           resp = resp.sub(')', "#{temp})").sub('(', '(#')
         elsif temp
           resp += temp
@@ -170,7 +170,7 @@ module Z80Disassembler
     def displacement(byte, temp)
       @prefix = nil
       byte -= 256 if byte > 127
-      des = ['', "+#{byte.to_s}", byte.to_s][byte <=> 0]
+      des = ['+0', "+#{byte}", byte.to_s][byte <=> 0]
       temp.sub('HL', @xx + des)
     end
 
@@ -216,7 +216,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)

data/lib/z80_disassembler/version.rb

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

metadata

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