Improve offset coloring

Author: rocky

trepan/lib/disassemble.py

@@ -40,7 +40,7 @@
     Integer,
     Keyword,
     LineNumber,
-    Number,
+    Offset,
     Symbol,
     format_token,
 )
@@ -313,7 +313,7 @@ def print_instruction(
         msg_nocr("  ")
 
     # Column: Instruction offset from start of code sequence
-    msg_nocr(format_token(Number, repr(offset).rjust(4), style=style))
+    msg_nocr(format_token(Offset, repr(offset).rjust(4), style=style))
     msg_nocr(" ")
 
     # Column: Instruction bytes

trepan/processor/command/info_subcmd/pc.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2017, 2020, 2024 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2017, 2020, 2024, 2026 Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 from xdis import findlinestarts
 
 from trepan.lib.disassemble import disassemble_bytes
+from trepan.lib.format import format_offset
 from trepan.misc import wrapped_lines
 
 # Our local modules
@@ -51,10 +52,11 @@ def run(self, args):
         mainfile = self.core.filename(None)
         if self.core.is_running():
             curframe = self.proc.curframe
+            style = self.settings["style"]
             if curframe:
                 line_no = inspect.getlineno(curframe)
                 offset = curframe.f_lasti
-                self.msg(f"PC offset is {offset}.")
+                self.msg(f"PC offset is {format_offset(offset, style)}.")
                 offset = max(offset, 0)
                 code = curframe.f_code
                 co_code = code.co_code