From 4b4b5836e8f26529d3efd202e8e7261538f895d6 Mon Sep 17 00:00:00 2001
From: Peter Rugg <pdr32@cam.ac.uk>
Date: Fri, 29 May 2020 13:27:23 +0100
Subject: [PATCH] Populate tval with CHERI trap information

---
 src_Core/CPU/CsrFile.bsv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src_Core/CPU/CsrFile.bsv b/src_Core/CPU/CsrFile.bsv
index 70c1f3d..dbb61d0 100644
--- a/src_Core/CPU/CsrFile.bsv
+++ b/src_Core/CPU/CsrFile.bsv
@@ -1027,7 +1027,7 @@ module mkCsrFile #(Data hartid)(CsrFile);
             end
             tagged CapException .ce: begin
                 cause_code = pack(CHERIFault);
-                // populate CHERI cause register.
+                trap_val = zeroExtend({pack(ce.cheri_exc_reg), pack(ce.cheri_exc_code)});
             end
             tagged Interrupt .i: begin
                 cause_code = zeroExtend(pack(i));