From b8d86df2d0044ceb9b19fc837b2b39f62d347e21 Mon Sep 17 00:00:00 2001
From: jon <>
Date: Tue, 4 May 2021 11:29:36 +0100
Subject: [PATCH] Guard Meltdown_CF protection (such as it is) with ifdef
 rather than just comment it out.

---
 src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv
index c8677d5..dd07cb1 100755
--- a/src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv
+++ b/src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv
@@ -327,9 +327,10 @@ module mkAluExePipeline#(AluExeInput inIfc)(AluExePipeline);
             doAssert(!exec_result.controlFlow.mispredict, "Scr inst cannot mispredict");
             doAssert(cast(exec_result.controlFlow.nextPc) == x.ppc && x.ppc == addPc(x.pc, 4), "Scr inst ppc = pc+4");
         end
+`ifdef MELTDOWN_CF_MITIGATION
         // This condition can eliminate Meltdown-CF vulnerabilities for exception conditions that don't need the bounds check result.
-        //if (isValid(exec_result.capException)) exec_result.data = setValidCap(exec_result.data, False);
-
+        if (isValid(exec_result.capException)) exec_result.data = setValidCap(exec_result.data, False);
+`endif
         // send bypass
         if(x.dst matches tagged Valid .dst) begin
             inIfc.sendBypass[exeSendBypassPort].send(dst.indx, exec_result.data);