Merge branch 'CHERI' into pdr32-wip

2020-05-11 14:08:42 +01:00
parent f5ec436d19 77c7a6f3c0
commit 461ca6a703
36 changed files with 928 additions and 587 deletions
--- a/src_Core/CPU/CsrFile.bsv
+++ b/src_Core/CPU/CsrFile.bsv
@@ -1025,6 +1025,10 @@ module mkCsrFile #(Data hartid)(CsrFile);
                    default: return 0;
                endcase);
            end
+            tagged CapException .ce: begin
+                cause_code = pack(CHERIFault);
+                // populate CHERI cause register.
+            end
            tagged Interrupt .i: begin
                cause_code = zeroExtend(pack(i));
                cause_interrupt = 1;