z80_disassembler 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe96f8335ed977825007f7846ed1b5b515ee9bab79fad0c67976504926c827e
-  data.tar.gz: c9341766fb32cf922aea077fa5968755b05e05ac03b45d277b8cc9de023f5b46
+  metadata.gz: 02a2e2d32e438dfeec508dbb3d7c2d9346144a401398a5d1d512352c59750b89
+  data.tar.gz: 6b502bcf23a6d7fcb77468b18be19bc8bcd679a8382896d9468afee8a21b3b11
 SHA512:
-  metadata.gz: 4fabf9e9a350e8ddedbc85acb8c8f738fd471e347591107f81a169c14c5d3dbca0f779f7706294ec6a3fde06895d6d5a429b6c6c48c8f9e5e84ba2de29097539
-  data.tar.gz: cc8e487897234f43ddc6962d1ce979704b9295a7f99551d592db7413acb5d985ccf0d394952b26d0e08e84caafb91e31a96b1a1abe94f48a154b2cc3332e9010
+  metadata.gz: 07a73a8a7504f85f2c91e952d249a4521e16e567b45387f011d0821d24d941aaa7faa1f1e3eedac1a621e234e139cb6feef413ebd548bf7ca0b9526bae24ee83
+  data.tar.gz: 482d90cf0c3e6b5938e9323319c086e93435178bbcd3c4c38be33b0871b932a8b99e016dce7546253be39be99a3a36d216ab8e14635488df046f7c01dc2a2816

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
@@ -108,8 +108,36 @@ module Z80Disassembler
         '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
@@ -131,13 +159,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)')
+          @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 + 2}" : "$-#{255 - z[1].hex - 1}"
@@ -149,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')
@@ -167,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
 
@@ -213,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)
@@ -252,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.4'
+  VERSION = '0.3.1'
 end

metadata

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