Hardcode CSR variables instead of dynamic lookup, remove decode_duration

Author: object-Object

python/src/mlogv32/scripts/ram_proc.py

@@ -331,10 +331,28 @@ def lookup(
     variable = variable_format.get_variable(variable_index)
 
     print(
-        f"Address {hex(address)} is at processor {ram_index} ({ram_x}, {ram_y}) in variable {variable}."
+        f'Address {hex(address)} is at processor {ram_index} ({ram_x}, {ram_y}) in variable "{variable}".'
     )
 
 
+@app.command()
+def variables(
+    indices: list[str],
+    ram_size: Annotated[int, Option(min=1, max=726 * 6)] = 4096,
+    variable_format: Annotated[
+        VariableFormat,
+        Option("-f", "--format"),
+    ] = VariableFormat.minimized,
+):
+    for index_str in indices:
+        index = int(index_str, base=0)
+        if index >= ram_size:
+            variable = "(out of range)"
+        else:
+            variable = variable_format.get_variable(index)
+        print(f"{index_str} -> {variable}")
+
+
 @app.command()
 def build(
     ram_size: Annotated[int, Option(min=1, max=726 * 6)] = 4096,

src/main.mlog

@@ -78,36 +78,14 @@ reset__find_lookup_start:
 
     set LOOKUP_START i
 
-    # look up commonly used CSRs
-    set csr 0xc00
-    op add ret @counter 1
-    jump access_csr always
-    set CSR_CYCLE variable
-    
-    set csr 0xc01
-    op add ret @counter 1
-    jump access_csr always
-    set CSR_TIME variable
-
-    set csr 0xc02
-    op add ret @counter 1
-    jump access_csr always
-    set CSR_INSTRET variable
-
-    set csr 0xc80
-    op add ret @counter 1
-    jump access_csr always
-    set CSR_CYCLEH variable
-    
-    set csr 0xc81
-    op add ret @counter 1
-    jump access_csr always
-    set CSR_TIMEH variable
-
-    set csr 0xc82
-    op add ret @counter 1
-    jump access_csr always
-    set CSR_INSTRETH variable
+    # commonly used CSRs
+    # NOTE: we need to manually update these if we change the RAM proc variables
+    set CSR_CYCLE "WN" # 0xc00
+    set CSR_TIME "WO" # 0xc01
+    set CSR_INSTRET "WP" # 0xc02
+    set CSR_CYCLEH "Y%" # 0xc80
+    set CSR_TIMEH "Y&" # 0xc81
+    set CSR_INSTRETH "Y(" # 0xc82
 
     # read __etext from address 0, or default to ROM_SIZE if __etext is 0
     set address 0
@@ -121,8 +99,6 @@ reset__nonzero_etext:
 
     # decode .text
     set STATE "decoding"
-    set decode_start_time @time
-    set decode_duration null # for debug output
     set decode_address 4
     set decode_var null
 
@@ -138,7 +114,6 @@ reset__decode:
     op add decode_address decode_address 4
     jump reset__decode lessThan decode_address __etext
 
-    op sub decode_duration @time decode_start_time
     set STATE "running"
 
     # clear LR/SC reservation set

src/tools/registers.mlog

@@ -155,8 +155,6 @@ loop:
     set instruction result
 
     read __etext CPU "__etext"
-    read decode_time CPU "decode_duration"
-    op floor decode_time decode_time
     read reservation_set CPU "reservation_set"
 
     print "ROM_START\n{0}"
@@ -384,9 +382,6 @@ loop:
     op add ret @counter 1
     jump format_hex always
 
-    print "decode_time     = {0} ms\n"
-    format decode_time
-
     print "reservation_set = {0}\n\n"
     set n reservation_set
     op add ret @counter 1