Skip to content

Commit f4fec59

Browse files
committed
better mtime/mtimecmp handling in print_registers()
1 parent b49dd35 commit f4fec59

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "advanced/micropython/micropython"]
88
path = advanced/micropython/micropython
99
url = https://github.com/micropython/micropython
10+
[submodule "advanced/circuitpython/circuitpython"]
11+
path = advanced/circuitpython/circuitpython
12+
url = https://github.com/adafruit/circuitpython.git

cpu.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ def __init__(self, ram, init_regs=None, logger=None, trace_traps=False):
413413
csr_names = {
414414
'mstatus': 0x300, 'misa': 0x301, 'mie': 0x304, 'mtvec': 0x305,
415415
'mscratch': 0x340, 'mepc': 0x341, 'mcause': 0x342, 'mtval': 0x343, 'mip': 0x344,
416-
'mtime_lo': 0x7C0, 'mtime_hi': 0x7C1, 'mtimecmp_lo': 0x7C2, 'mtimecmp_hi': 0x7C3
416+
#'mtime_lo': 0x7C0, 'mtime_hi': 0x7C1, 'mtimecmp_lo': 0x7C2, 'mtimecmp_hi': 0x7C3
417417
}
418418
for name, addr in csr_names.items():
419419
self.CSR_NAME_ADDR[name] = addr
@@ -533,3 +533,8 @@ def print_registers(self):
533533
for name, addr in self.CSR_NAME_ADDR.items():
534534
value = self.csrs[addr]
535535
self.logger.info(f"{name:<12} ({addr:03X}): {value:08X} ({value})")
536+
537+
self.logger.info(f"{"mtime_lo":<18}: {self.mtime & 0xFFFFFFFF:08X} ({self.mtime & 0xFFFFFFFF})")
538+
self.logger.info(f"{"mtime_hi":<18}: {self.mtime >> 32:08X} ({self.mtime >> 32})")
539+
self.logger.info(f"{"mtimecmp_lo":<18}: {self.mtimecmp & 0xFFFFFFFF:08X} ({self.mtimecmp & 0xFFFFFFFF})")
540+
self.logger.info(f"{"mtimecmp_hi":<18}: {self.mtimecmp >> 32:08X} ({self.mtimecmp >> 32})")

0 commit comments

Comments
 (0)