From 48ac38fb35e90aa70d6af835fdf3e948f2ec08c8 Mon Sep 17 00:00:00 2001
From: Corey Hickson <chickson@hmc.edu>
Date: Sun, 24 Nov 2024 03:43:57 -0800
Subject: [PATCH 1/3] Add exceptionsM to fcov

---
 config/rv32gc/coverage.svh | 7 ++++++-
 config/rv64gc/coverage.svh | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 614cd5c3d..d3953b916 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -8,6 +8,10 @@
 // Define XLEN, used in covergroups
 `define XLEN32 1
 
+// Define relevant addresses
+`define CLINT_BASE 64'h02000000
+`define ACCESS_FAULT_ADDRESS 32'h0000
+
 // Unprivileged extensions
 `include "RV32I_coverage.svh"
 `include "RV32M_coverage.svh"
@@ -39,4 +43,5 @@
 `include "RV32VM_PMP_coverage.svh"
 `include "EndianU_coverage.svh"
 `include "EndianM_coverage.svh"
-`include "EndianS_coverage.svh"
\ No newline at end of file
+`include "EndianS_coverage.svh"
+`include "ExceptionsM_coverage.svh"
\ No newline at end of file
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 07561b1de..3974d7f96 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -8,6 +8,10 @@
 // Define XLEN, used in covergroups
 `define XLEN64 1
 
+// Define relevant addresses
+`define CLINT_BASE 64'h02000000
+`define ACCESS_FAULT_ADDRESS 64'h00000000
+
 // Unprivileged extensions
 `include "RV64I_coverage.svh"
 `include "RV64M_coverage.svh"
@@ -39,6 +43,7 @@
 `include "EndianU_coverage.svh"
 `include "EndianM_coverage.svh"
 `include "EndianS_coverage.svh"
+`include "ExceptionsM_coverage.svh"
 // `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"
 // `include "RV64CBO_PMP_coverage.svh"

From 034624523397179fc4ce5c85daff0979cfb8e7ce Mon Sep 17 00:00:00 2001
From: Corey Hickson <chickson@hmc.edu>
Date: Sun, 24 Nov 2024 16:36:59 -0800
Subject: [PATCH 2/3] removed unused and redundant clint base variable

---
 config/rv32gc/coverage.svh | 1 -
 config/rv64gc/coverage.svh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index d3953b916..b05362f8d 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -9,7 +9,6 @@
 `define XLEN32 1
 
 // Define relevant addresses
-`define CLINT_BASE 64'h02000000
 `define ACCESS_FAULT_ADDRESS 32'h0000
 
 // Unprivileged extensions
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 3974d7f96..85abee104 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -9,7 +9,6 @@
 `define XLEN64 1
 
 // Define relevant addresses
-`define CLINT_BASE 64'h02000000
 `define ACCESS_FAULT_ADDRESS 64'h00000000
 
 // Unprivileged extensions

From c105c4c720e945570311ca2f804219346cdc5826 Mon Sep 17 00:00:00 2001
From: Corey Hickson <chickson@hmc.edu>
Date: Sun, 24 Nov 2024 17:04:12 -0800
Subject: [PATCH 3/3] restored clint base for interrupt tests

---
 config/rv32gc/coverage.svh | 1 +
 config/rv64gc/coverage.svh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index b05362f8d..0403b7e4b 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -10,6 +10,7 @@
 
 // Define relevant addresses
 `define ACCESS_FAULT_ADDRESS 32'h0000
+`define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
 `include "RV32I_coverage.svh"
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 85abee104..e7c574020 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -10,6 +10,7 @@
 
 // Define relevant addresses
 `define ACCESS_FAULT_ADDRESS 64'h00000000
+`define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
 `include "RV64I_coverage.svh"