Update

Author: xresende

Makefile

@@ -1,2 +1,2 @@
 msxbios:
-	python3 msxbios.py > msxbios.as
+	python3 msxbios.py > msxbios.asm

msxbios.as msxbios.asm

@@ -2,7 +2,7 @@
           ; MSX BIOS
           ; ========
           ; 
-          ; . Symbol table by MSX.BIOS by ASCII Corp., 1983 (v3.44)
+          ; . Symbol table by MSX.BIOS, ASCII Corp., 1983 (v3.44)
           ; 
           ;     file       : BIOHDR.MAC
           ;     use        : Restart calls and ROM entries table
@@ -16,6 +16,10 @@
           ; . Disassembled by Ximenes R. Resende ([email protected])
           ;     file       : EXPERT10.ROM
           ; 
+          ; 
+          ; The following RST's (RST 0 thru RST 5) are reserved for BASIC
+          ; interpreter, RST 6 for inter-slot calls, and RST 7 for
+          ; hardware interrupt
 
 
 BEGIN:                         ; MSX System Init

msxbios.py

@@ -26,11 +26,11 @@
 
 def msxbios_begin(rom, beg, end):
     """."""
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         'MSX BIOS',
         '========',
         '',
-        '. Symbol table by MSX.BIOS by ASCII Corp., 1983 (v3.44)',
+        '. Symbol table by MSX.BIOS, ASCII Corp., 1983 (v3.44)',
         '',
         '    file       : BIOHDR.MAC',
         '    use        : Restart calls and ROM entries table',
@@ -44,18 +44,22 @@ def msxbios_begin(rom, beg, end):
         '. Disassembled by Ximenes R. Resende ([email protected])',
         '    file       : EXPERT10.ROM',
         '',
+        '',
+        'The following RST\'s (RST 0 thru RST 5) are reserved for BASIC',
+        'interpreter, RST 6 for inter-slot calls, and RST 7 for',
+        'hardware interrupt',
         ])
-    rom.add_line_comment(0x0006, comment=[
+    rom.add_comment_line(0x0006, comment=[
         '** VDP Information **',
         'Any program that access the VDP hardware directly',
         'should read the I/O port address found here, to be certain',
         'the software is compatible with future versions of the VDP',
         ])
 
-    rom.add_ins_comment(addr=0x0000, comment='Fail safe')
-    rom.add_ins_comment(addr=0x0001, comment='Find all connected RAM')
-    rom.add_ins_comment(addr=0x0006, comment='Port address for VDP data read')
-    rom.add_ins_comment(addr=0x0007, comment='Port address for VDP data write')
+    rom.add_comment_ins(addr=0x0000, comment='Fail safe')
+    rom.add_comment_ins(addr=0x0001, comment='Find all connected RAM')
+    rom.add_comment_ins(addr=0x0006, comment='Port address for VDP data read')
+    rom.add_comment_ins(addr=0x0007, comment='Port address for VDP data write')
     rom.add_dw(0x0004)
     rom.add_db([
         0x0006, 0x0007, 0x000B, 0x000F, 0x0013, 
@@ -67,7 +71,7 @@ def msxbios_begin(rom, beg, end):
 
 def msxbios_ioinij(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'Following are used for I/O initializations',
         '',
@@ -77,7 +81,7 @@ def msxbios_ioinij(rom, beg, end):
 
 def msxbios_vdprmc(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'The following entry points provide control of the ',
         'VDP\'s registers, screen mode settings, and memory block',
@@ -89,7 +93,7 @@ def msxbios_vdprmc(rom, beg, end):
 
 def msxbios_psgini(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'The following entry points are used for PSG initialization, ',
         'read and write PSG registers, and PLAY statement execution.',
@@ -99,7 +103,7 @@ def msxbios_psgini(rom, beg, end):
 
 def msxbios_inpprt(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'General INPUT and PRINT utilities.',
         '',
@@ -109,7 +113,7 @@ def msxbios_inpprt(rom, beg, end):
 
 def msxbios_joystk(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'General INPUT and PRINT utilities.',
         '',
@@ -119,7 +123,7 @@ def msxbios_joystk(rom, beg, end):
 
 def msxbios_tapect(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'Following are used to access the cassette tape, ',
         'data read/write, and motor on/off',
@@ -130,7 +134,7 @@ def msxbios_tapect(rom, beg, end):
 
 def msxbios_basicq(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'BASIC queues',
         '',
@@ -140,20 +144,20 @@ def msxbios_basicq(rom, beg, end):
 
 def msxbios_basgrp(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'For BASIC interpreter\'s GENGRP and ADVGRP modules use',
         '',
         ])
-    rom.add_ins_comment(addr=0x015C, comment='RESERVED FOR EXPANSION - start')
-    rom.add_ins_comment(addr=0x01B5, comment='RESERVED FOR EXPANSION - end')
+    rom.add_comment_ins(addr=0x015C, comment='RESERVED FOR EXPANSION - start')
+    rom.add_comment_ins(addr=0x01B5, comment='RESERVED FOR EXPANSION - end')
     rom.add_db(0x015C, 0x01B5)
     rom.disassemble(pc=beg, lastpc=end, nrbytes=None, print_addr=True)
 
 
 def msxbios_slotsm(rom, beg, end):
 
-    rom.add_line_comment(addr=beg, comment=[
+    rom.add_comment_line(addr=beg, comment=[
         '',
         'SLOTS',
         '',
@@ -214,7 +218,7 @@ def msxbios():
 
     # rom.disassemble(pc=0x0000, lastpc=0x008D, nrbytes=None, print_addr=True)
 
-    # rom.add_ins_comment(addr=0x01B6, comment='Calculate bit pattern and mask code')
+    # rom.add_comment_ins(addr=0x01B6, comment='Calculate bit pattern and mask code')
 
     # rom.disassemble(pc='RDSLT', lastpc=0x01C5, nrbytes=None, print_addr=True)
     # rom.disassemble(pc='RDESLT', lastpc=0x01CF, nrbytes=None, print_addr=True)
@@ -230,8 +234,8 @@ def msxbios():
     # rom.disassemble(pc='SELPRM', lastpc=0x02A2, nrbytes=None, print_addr=True)
     # rom.disassemble(pc='SELEXP', lastpc=0x02D6, nrbytes=None, print_addr=True)
 
-    # rom.add_skip('0x033B') # avoid replacing 0x0000 <-> _CHKRAM
-    # rom.add_skip('0x039E') # avoid replacing 0x0000 <-> _CHKRAM
+    # rom.add_symbol_skip('0x033B') # avoid replacing 0x0000 <-> _CHKRAM
+    # rom.add_symbol_skip('0x039E') # avoid replacing 0x0000 <-> _CHKRAM
     # rom.disassemble(pc='CHKRAM', lastpc=0x03F8, nrbytes=None, print_addr=True)
 
 

msxdis.py

@@ -129,21 +129,22 @@ def memsize(self):
         return len(self._memory)
 
     def add_symbol(self, addr, symbol, comment=None):
-        """."""
+        """Add an address to symbol convertion."""
         addr = MSXDisassembler._conv_pc2addr(addr)
         self._symbols[addr] = dict(symbol=symbol, comment=comment)
 
     def add_db_string(self, addr, size=None, terminator=None):
-        """."""
+        """Add db command at specific address with bytes converted to strings."""
         addr = MSXDisassembler._conv_pc2addr(addr)
         self._db_string[addr] = dict(size=size, terminator=terminator)
 
     def add_db_bytes(self, addr):
-        """Add address from which db gathers bytes until a symbol address is found."""
+        """Add db command at specific address that gathers bytes until a symbol address is found."""
         addr = MSXDisassembler._conv_pc2addr(addr)
         self._db_bytes.append(addr)
 
     def add_db(self, addr_beg, addr_end=None):
+        """Add db command at specific address."""
         if isinstance(addr_beg, (list, tuple)):
             for addr_ in addr_beg:
                 addr = MSXDisassembler._conv_pc2addr(addr_)
@@ -158,23 +159,27 @@ def add_db(self, addr_beg, addr_end=None):
                 self._db.append(addr)
 
     def add_dw(self, addr):
+        """Add dw command at specific address."""
         addr = MSXDisassembler._conv_pc2addr(addr)
         self._dw.append(addr)
 
-    def add_ins_comment(self, addr, comment):
+    def add_comment_ins(self, addr, comment):
+        """Add instruction comment at specific address."""
         addr = MSXDisassembler._conv_pc2addr(addr)
         self._ins_comments[addr] = comment
 
-    def add_line_comment(self, addr, comment):
+    def add_comment_line(self, addr, comment):
+        """Add line comment at specific address."""
         addr = MSXDisassembler._conv_pc2addr(addr)
         self._line_comments[addr] = comment
 
-    def add_skip(self, addr):
+    def add_symbol_skip(self, addr):
+        """Skip symbol replacement at specific address."""
         addr = MSXDisassembler._conv_pc2addr(addr)
         self._skip.append(addr)
 
     def print_rom_header(self, print_addr=True):
-        """."""
+        """Print ROM header."""
         text = list()
         text.append('; ROM SIZE      :' + str(len(self._memory)))
         text.append('; ROM ID        :' + self._rom_id)
@@ -237,6 +242,7 @@ def print_rom_header(self, print_addr=True):
         return text
 
     def load_symbols(self, fname):
+        """Load symbols from file."""
         self._use_symbols = True
         with open(fname, 'r') as fp:
             data = fp.readlines()
@@ -255,7 +261,7 @@ def load_symbols(self, fname):
         self._symbols.update(symbols)
 
     def disassemble(self, pc=None, lastpc=None, nrbytes=None, print_addr=True):
-        """."""
+        """Disassemble code."""
         text = list()
 
         if isinstance(pc, str):
@@ -400,9 +406,7 @@ def disassemble(self, pc=None, lastpc=None, nrbytes=None, print_addr=True):
             text += lines
             text.append(line)
 
-        # print lines
-        for line in text:
-            print(line)
+        MSXDisassembler.print_code(text)
 
         return text
 
@@ -423,9 +427,7 @@ def _add_symbols_comments(self, ins, pc, addr, char, tab_flag):
             spcs = ' ' * (MSXDisassembler._COMMENTPOS - len(ins_sym) - len(prefix))
             if symbol['comment'] is not None and pc_ not in self._skip:
                 comt = spcs + ' ; ' + symbol['comment']
-        line = prefix + ins_sym
-        if True:
-            line += comt
+        line = prefix + ins_sym + comt
         return line
 
     @staticmethod