From a19474056272a35b52b04c8563683e0718658993 Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Fri, 17 Feb 2023 19:14:38 -0800
Subject: [PATCH] Fixed RAM bugs and refactored with read taking place after
 clock edge rather than before.

---
 src/generic/mem/ram1p1rwbe.sv  | 16 +++++++++++-----
 src/generic/mem/ram2p1r1wbe.sv | 17 +++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/generic/mem/ram1p1rwbe.sv b/src/generic/mem/ram1p1rwbe.sv
index 4c170745..f3c98873 100644
--- a/src/generic/mem/ram1p1rwbe.sv
+++ b/src/generic/mem/ram1p1rwbe.sv
@@ -34,7 +34,7 @@
 
 `include "wally-config.vh"
 
-module ram1p1rwbe #(parameter DEPTH=64, WIDTH=128) (
+module ram1p1rwbe #(parameter DEPTH=64, WIDTH=44) (
   input logic                     clk,
   input logic                     ce,
   input logic [$clog2(DEPTH)-1:0] addr,
@@ -69,7 +69,7 @@ module ram1p1rwbe #(parameter DEPTH=64, WIDTH=128) (
 			      .A(addr), .D(din), 
 			      .BWEB(~BitWriteMask), .Q(dout));
 
-  end else if (`USE_SRAM == 1 & WIDTH == 22  & DEPTH == 32) begin // RV32 cache tag
+  end else if ((`USE_SRAM == 1) & (WIDTH == 22)  & (DEPTH == 64)) begin // RV32 cache tag
      genvar index;
      // 64 x 22-bit SRAM
      logic [WIDTH-1:0] BitWriteMask;
@@ -86,9 +86,15 @@ module ram1p1rwbe #(parameter DEPTH=64, WIDTH=128) (
     integer i;
 
     // Read
-    always_ff @(posedge clk) 
-      if(ce) dout <= #1 RAM[addr];
- 
+    logic [$clog2(DEPTH)-1:0] addrd;
+    flopen #($clog2(DEPTH)) adrreg(clk, ce, addr, addrd);
+    assign dout = RAM[addrd];
+
+    /*      // Read
+      always_ff @(posedge clk) 
+	if(ce) dout <= #1 mem[addr]; */
+
+
     // Write divided into part for bytes and part for extra msbs
 	// Questa sim version 2022.3_2 does not allow multiple drivers for RAM when using always_ff.
 	// Therefore these always blocks use the older always @(posedge clk) 
diff --git a/src/generic/mem/ram2p1r1wbe.sv b/src/generic/mem/ram2p1r1wbe.sv
index d285dbe1..cefd5ab9 100644
--- a/src/generic/mem/ram2p1r1wbe.sv
+++ b/src/generic/mem/ram2p1r1wbe.sv
@@ -33,7 +33,7 @@
 
 `include "wally-config.vh"
 
-module ram2p1r1wbe #(parameter DEPTH=128, WIDTH=256) (
+module ram2p1r1wbe #(parameter DEPTH=1024, WIDTH=68) (
   input  logic                     clk,
   input  logic                     ce1, ce2,
   input  logic [$clog2(DEPTH)-1:0] ra1,
@@ -52,7 +52,7 @@ module ram2p1r1wbe #(parameter DEPTH=128, WIDTH=256) (
   // TRUE Smem macro
   // ***************************************************************************
 
-   if (`USE_SRAM == 1 & WIDTH == 68 & DEPTH == 1024) begin
+   if ((`USE_SRAM == 1) & (WIDTH == 68) & (DEPTH == 1024)) begin
    
       ram2p1r1wbe_1024x68 memory1(.CLKA(clk), .CLKB(clk), 
 				  .CEBA(~ce1), .CEBB(~ce2),
@@ -64,7 +64,7 @@ module ram2p1r1wbe #(parameter DEPTH=128, WIDTH=256) (
 				  .QA(rd1),
 				  .QB());
 
-   end else if (`USE_SRAM == 1 & WIDTH == 36 & DEPTH == 1024) begin
+   end else if ((`USE_SRAM == 1) & (WIDTH == 36) & (DEPTH == 1024)) begin
    
       ram2p1r1wbe_1024x36 memory1(.CLKA(clk), .CLKB(clk), 
 				  .CEBA(~ce1), .CEBB(~ce2),
@@ -76,7 +76,7 @@ module ram2p1r1wbe #(parameter DEPTH=128, WIDTH=256) (
 				  .QA(rd1),
 				  .QB());      
 
-   end else if (`USE_SRAM == 1 & WIDTH == 2 & DEPTH == 1024) begin
+   end else if ((`USE_SRAM == 1) & (WIDTH == 2) & (DEPTH == 1024)) begin
 
       logic [SRAMWIDTH-1:0]     SRAMReadData;      
       logic [SRAMWIDTH-1:0]     SRAMWriteData;      
@@ -113,9 +113,14 @@ module ram2p1r1wbe #(parameter DEPTH=128, WIDTH=256) (
       // ***************************************************************************
       integer i;
       
-      // Read
+    // Read
+    logic [$clog2(DEPTH)-1:0] ra1d;
+    flopen #($clog2(DEPTH)) adrreg(clk, ce1, ra1, ra1d);
+    assign rd1 = mem[ra1d];
+
+/*      // Read
       always_ff @(posedge clk) 
-	if(ce1) rd1 <= #1 mem[ra1];
+	if(ce1) rd1 <= #1 mem[ra1]; */
    
    // Write divided into part for bytes and part for extra msbs
    if(WIDTH >= 8)