Make Key{board,press}Tracer handle '{m[]}' with a hexadecimal address

Author: skoolkid

skoolkit/__init__.py

@@ -32,7 +32,7 @@
 except ImportError: # pragma: no cover
     CCMIOSimulator = None
 
-VERSION = '9.6rc2'
+VERSION = '9.6rc3'
 PACKAGE_DIR = os.path.dirname(__file__)
 
 BASE_10 = 10

skoolkit/loadtracer.py

@@ -22,7 +22,7 @@
 from skoolkit.pagingtracer import PagingTracer
 from skoolkit.simulator import R1
 from skoolkit.simutils import A, D, E, F, H, IXh, IXl, SP, PC, T, IFF
-from skoolkit.traceutils import Registers, disassemble, get_trace_line
+from skoolkit.traceutils import Registers, disassemble
 
 DEC = tuple(tuple((
         v % 256,
@@ -244,7 +244,7 @@ def run(self, border, out7ffd, outfffd, ay, outfe):
         registers = simulator.registers
         tracefile = self.tracefile
         if tracefile:
-            trace_line = get_trace_line(self.trace_line)
+            trace_line = self.trace_line
             prefix = self.prefix
             byte_fmt = self.byte_fmt
             word_fmt = self.word_fmt

skoolkit/tap2sna.py

@@ -37,6 +37,7 @@
 from skoolkit.snapshot import (move, patch, poke, print_reg_help,
                                print_state_help, write_snapshot)
 from skoolkit.tape import parse_pzx, parse_tap, parse_tzx
+from skoolkit.traceutils import get_trace_line
 
 SUPPORTED_TAPES = ('.pzx', '.tap', '.tzx')
 
@@ -503,7 +504,7 @@ def sim_load(blocks, options, config):
 
     if options.trace:
         tracefile = open_file(options.trace, 'w')
-        trace_line = config['TraceLine'] + '\n'
+        trace_line = get_trace_line(config['TraceLine'] + '\n')
         op_fmt = config['TraceOperand']
         prefix, byte_fmt, word_fmt = (op_fmt + ',' * (2 - op_fmt.count(','))).split(',')[:3]
     else:

sphinx/source/changelog.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-9.6rc2
+9.6rc3
 ------
 * :ref:`tap2sna.py` can now load from two tape files (e.g. when side 1 and side
   2 of a tape are in separate files)

sphinx/source/conf.py

@@ -48,7 +48,7 @@
 # The short X.Y version.
 version = '9.6'
 # The full version, including alpha/beta/rc tags.
-release = '9.6rc2'
+release = '9.6rc3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

tests/slow_test_sim_load.py

@@ -1192,7 +1192,7 @@ def test_trace_with_load_command(self):
         ]
         tapfile = self._write_tap(blocks)
         tracefile = '{}/sim-load.trace'.format(self.make_directory())
-        trace_line = 'TraceLine={t:>8} ${pc:04X} {i:<15} {r[a]:02X} {m[23756]:02X}'
+        trace_line = 'TraceLine={t:>8} ${pc:04X} {i:<15} {r[a]:02X} {m[$5ccc]:02X}'
         output, error = self.run_tap2sna(('-c', f'trace={tracefile}', '-c', 'load=LOAD ""', '-I', trace_line, tapfile, 'out.z80'))
         out_lines = output.strip().split('\n')
         exp_out_lines = [
@@ -1553,7 +1553,7 @@ def test_trace_with_option_press(self):
             '--start', '1343',
             '-c', 'finish-tape=1',
             '-c', f'trace={tracefile}',
-            '-I', 'TraceLine={t:>8} ${pc:04X} {i:<15} {r[a]:02X} {m[23756]:02X}',
+            '-I', 'TraceLine={t:>8} ${pc:04X} {i:<15} {r[a]:02X} {m[0x5CCC]:02X}',
             tapfile,
             'out.z80'
         )