folkert/python-pdp1170
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accomodate octal formatting in machinestate for logging while still leaving raw values for, e.g., breakpoonts

Browse source
This commit is contained in:
Neil Webber 2024-04-18 17:02:38 -05:00
parent 9408867f47
commit 6e54a9dc9e
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
machine.py
View file

@ -599,7 +599,7 @@ class PDP11:
reason = ".run -- HALTED: {}" reason = ".run -- HALTED: {}"
else: else:
reason = ".run -- breakpoint: {}" reason = ".run -- breakpoint: {}"
self.logger.info(reason.format(self.machinestate())) self.logger.info(reason.format(self.machinestate(fmt=oct)))
def redyellowcheck(self): def redyellowcheck(self):
"""stack limits: possibly sets YELLOW straps, or go RED.""" """stack limits: possibly sets YELLOW straps, or go RED."""
@ -682,7 +682,7 @@ class PDP11:
if trap is None: if trap is None:
return return
self.logger.debug(f"TRAP: {trap}:\n{self.machinestate()}") self.logger.debug(f"TRAP: {trap}:\n{self.machinestate(fmt=oct)}")
self.error_register |= trap.cpuerr self.error_register |= trap.cpuerr
# get the vector information -- always from KERNEL/DSPACE # get the vector information -- always from KERNEL/DSPACE
@ -788,7 +788,7 @@ class PDP11:
# stack is not mapped, or the stack pointer is odd, or similar # stack is not mapped, or the stack pointer is odd, or similar
# very bad mistakes by the kernel code. It is a fatal halt # very bad mistakes by the kernel code. It is a fatal halt
self.logger.info(f"Trap ({e}) pushing trap frame onto stack") self.logger.info(f"Trap ({e}) pushing trap frame onto stack")
self.logger.info(f"Machine state: {self.machinestate()}") self.logger.info(f"Machine state: {self.machinestate(fmt=oct)}")
self.logger.info("HALTING") self.logger.info("HALTING")
self.halted = self.HALTED_STACK self.halted = self.HALTED_STACK
else: else:
@ -1011,7 +1011,7 @@ class PDP1170(PDP11):
return s return s
# logging/debugging convenience # logging/debugging convenience
def machinestate(self): def machinestate(self, fmt=None):
# machine state is arbitrarily collected into a dictionary: # machine state is arbitrarily collected into a dictionary:
d = {} d = {}
regnames = (* (f"R{i}" for i in range(6)), "SP", "PC") regnames = (* (f"R{i}" for i in range(6)), "SP", "PC")
@ -1037,4 +1037,13 @@ class PDP1170(PDP11):
except PDPTrap as e: except PDPTrap as e:
d['MMR2inst'] = e d['MMR2inst'] = e
# For humans (e.g., if logging) it may be desired to have things
# in octal or some other format. Eventually maybe "fmt" should
# be more elaborate but as a start "if fmt is oct" then convert
# everything into an octal string.
if fmt is oct:
for k, v in d.items():
pfx = '0' if v > 7 else ''
d[k] = pfx + oct(v)[2:]
return d return d