summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Norton2018-06-04 13:06:00 +0100
committerRobert Norton2018-06-04 13:06:00 +0100
commitb98a28ab824a56a9d3f0f07cb69f3b1c5ecf3cdd (patch)
tree3d2bea246de173945c955206c951925bfb26b44e
parent8745f6b56fe3c523a8730baed1fc1f7cc54b377b (diff)
parentebb3a7c46ceb01f6b461def9d34b732508c6333b (diff)
Merge branch 'arichardson-patch-1' into sail2
-rw-r--r--cheri/cheri_prelude_common.sail13
1 files changed, 12 insertions, 1 deletions
diff --git a/cheri/cheri_prelude_common.sail b/cheri/cheri_prelude_common.sail
index 47c8759c..cc4c657a 100644
--- a/cheri/cheri_prelude_common.sail
+++ b/cheri/cheri_prelude_common.sail
@@ -456,5 +456,16 @@ function dump_cp2_state () = {
print(concat_str("DEBUG CAP PCC", capToString(capRegToCapStruct(PCC))));
foreach(i from 0 to 31) {
print(concat_str("DEBUG CAP REG ", concat_str(string_of_int(i), capToString(readCapReg(to_bits(5, i))))))
- }
+ };
+ print(concat_str("DEBUG CAP HWREG 00", capToString(capRegToCapStruct(C00))));
+ print(concat_str("DEBUG CAP HWREG 01", capToString(capRegToCapStruct(CTLSU))));
+ print(concat_str("DEBUG CAP HWREG 08", capToString(capRegToCapStruct(CTLSP))));
+ /* TODO: these two should not be mirrored to match the FPGA */
+ print(concat_str("DEBUG CAP HWREG 22", capToString(capRegToCapStruct(C27))));
+ print(concat_str("DEBUG CAP HWREG 23", capToString(capRegToCapStruct(C28))));
+ /* KCC, KDC, EPCC */
+ print(concat_str("DEBUG CAP HWREG 29", capToString(capRegToCapStruct(C29))));
+ print(concat_str("DEBUG CAP HWREG 30", capToString(capRegToCapStruct(C30))));
+ print(concat_str("DEBUG CAP HWREG 31", capToString(capRegToCapStruct(C31))));
+
}