From 8eff03bf1a7850c385783498713245699f44b795 Mon Sep 17 00:00:00 2001
From: bbracker <bbracker@hmc.edu>
Date: Sun, 10 Oct 2021 12:25:05 -0700
Subject: [PATCH] simplify flopenrc's that didn't actually need to be
 flopenrc's

---
 wally-pipelined/src/fpu/fpu.sv   | 12 ++++++------
 wally-pipelined/src/ifu/bpred.sv |  6 ++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/wally-pipelined/src/fpu/fpu.sv b/wally-pipelined/src/fpu/fpu.sv
index 92fff23c6..6793479b2 100755
--- a/wally-pipelined/src/fpu/fpu.sv
+++ b/wally-pipelined/src/fpu/fpu.sv
@@ -204,15 +204,15 @@ module fpu (
      //    - if not captured any forwarded inputs will change durring computation
      //        - this problem is caused by stalling the execute stage
      //    - the other units don't have this problem, only div/sqrt stalls the execute stage
-     flopenrc #(64) reg_input1 (.d({XSgnE, XExpE, XManE[51:0]}), .q(DivInput1E),
-				.en(1'b1), .clear(FDivSqrtDoneE),
+     floprc #(64) reg_input1 (.d({XSgnE, XExpE, XManE[51:0]}), .q(DivInput1E),
+				.clear(FDivSqrtDoneE),
 				.reset(reset),  .clk(FDivBusyE));
-     flopenrc #(64) reg_input2 (.d({YSgnE, YExpE, YManE[51:0]}), .q(DivInput2E),
-				.en(1'b1), .clear(FDivSqrtDoneE),
+     floprc #(64) reg_input2 (.d({YSgnE, YExpE, YManE[51:0]}), .q(DivInput2E),
+				.clear(FDivSqrtDoneE),
 				.reset(reset),  .clk(FDivBusyE));
-      flopenrc #(6) reg_input3 (.d({XNaNE, YNaNE, XInfE, YInfE, XZeroE, YZeroE}), 
+     floprc #(6) reg_input3 (.d({XNaNE, YNaNE, XInfE, YInfE, XZeroE, YZeroE}), 
 				.q({XNaNQ, YNaNQ, XInfQ, YInfQ, XZeroQ, YZeroQ}),
-				.en(1'b1), .clear(FDivSqrtDoneE),
+			   .clear(FDivSqrtDoneE),
 				.reset(reset),  .clk(FDivBusyE));
             
       // fpdivsqrt using Goldschmidt's iteration
diff --git a/wally-pipelined/src/ifu/bpred.sv b/wally-pipelined/src/ifu/bpred.sv
index 22c9ec336..688c8377f 100644
--- a/wally-pipelined/src/ifu/bpred.sv
+++ b/wally-pipelined/src/ifu/bpred.sv
@@ -192,17 +192,15 @@ module bpred
   // The prediction and its results need to be passed through the pipeline
   // *** for other predictors will will be different.
   
-  flopenrc #(2) BPPredRegD(.clk(clk),
+  flopenr #(2) BPPredRegD(.clk(clk),
 			   .reset(reset),
 			   .en(~StallD),
-			   .clear(1'b0),
 			   .d(BPPredF),
 			   .q(BPPredD));
 
-  flopenrc #(2) BPPredRegE(.clk(clk),
+  flopenr #(2) BPPredRegE(.clk(clk),
 			   .reset(reset),
 			   .en(~StallE),
-			   .clear(1'b0),
 			   .d(BPPredD),
 			   .q(BPPredE));