z80_disassembler 0.2.5 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9970749ade07cf2808e1e6792d3c45f26d8325e6fc2fd492d6b3f88c4d843c40
-  data.tar.gz: ebbfd99ccff00c4e86e5a8e09e31774359c7798d13ed847c65d1b0e95ccf04e5
+  metadata.gz: 32244bf0d6dba7c4803d9e2eb5877108f38f54b8beee841ca975afe10cdefdcd
+  data.tar.gz: 655e5e7d776633635dd35045ea7f93523712ca07b0e8a361c67e862f06f2262b
 SHA512:
-  metadata.gz: 8455ef820171b02eb4e886a7a37ef4dc43679c0c8bf4b777d9dc73e93732c4ec8899da13b4ea73d38f4704d5b8487ba42ab722cda462b11a7a33f7b46f68eefc
-  data.tar.gz: cecc4ee2168d08c0e1a373209f472cc78936f69e8f6ad067b04e9632e44c9d7291b3027215c5a6329d2226dfeb8a208b1aa28adb9c2ba6b56e400785f74e51c2
+  metadata.gz: 57a38e4cd87ede79eb82cda138ac0337149575796cc1a1e2ff033de2beccd8b583fd59d5eddc2ab535f46907cadf8c69d2b3e9ad952950daf946291dc06261a2
+  data.tar.gz: 7e78cf72592390ecae2fd6d72173b10d87badad9586d6ea224d46fc92b970e27cbc4d1197d8ae3d14351ebcdedada8579d66f8578c8ff697cd3bef45168fb1b5

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
@@ -26,7 +26,7 @@ module Z80Disassembler
     ].freeze
 
     def initialize(file, org = 32_768)
-      @file = file; @org = 25108 # org.to_i
+      @file = file; @org = org.to_i
       if file.original_filename[-3..-1] == '.$C'
         File.open(@file) do |f|
           z = f.read(17)
@@ -88,7 +88,8 @@ module Z80Disassembler
                       end
         string = hash_links.keys.include?(adr) ? str.sub(substr, hash_links[adr]) : str
 
-        "#{link} #{string.ljust(16, ' ')}; #{addr16.ljust(5, ' ')} / #{addr.to_s.ljust(5, ' ')} ; #{bytes.ljust(14, ' ')} ; #{ascii.ljust(4, ' ')} ;"
+        defb = bytes.split(" ").map { |x| "##{x}"}.join(",")
+        "#{link} #{string.ljust(16, ' ')}; #{addr16.ljust(5, ' ')} / #{addr.to_s.ljust(5, ' ')} ; #{ascii.ljust(4, ' ')} ; #{defb}"
       end.join("\n")
 
       header = [
@@ -108,8 +109,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
@@ -132,9 +161,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 +199,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 +245,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.5'
+  VERSION = '0.3.2'
 end

metadata

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