Switch back to $past-based scheduling; my clever idea wasn't clever enough.

1 files changed, 9 insertions, 17 deletions

diff --git a/hdl/mem.sv b/hdl/mem.sv
index c362e37..9c5f567 100644
--- a/hdl/mem.sv
+++ b/hdl/mem.sv
@@ -18,32 +18,24 @@ parameter ADDR_BITS;
 parameter DATA_BITS;
 parameter INIT_FILE;
 
-`output(ready)
-`input(valid)
-`input(write)
-`input(address)
-`input(write_data)
-`output(read_valid)
-`output(read_data)
-
 bit [DATA_BITS-1:0] storage [0:(1<<ADDR_BITS)-1];
 initial $readmemh(INIT_FILE, storage);
 
 always_ff @(posedge clk) begin
     if (reset) begin
-        ready_ = 0;
-        read_valid_ = 0;
+        ready = 0;
+        read_valid = 0;
     end else begin
-        read_valid_ = 0;
-        if (ready_ && valid_) begin
-            if (write_) begin
-                storage[address_] = write_data_;
+        read_valid = 0;
+        if (ready && `lag(valid)) begin
+            if (`lag(write)) begin
+                storage[`lag(address)] = `lag(write_data);
             end else begin
-                read_valid_ = 1;
-                read_data_ = storage[address_];
+                read_valid = 1;
+                read_data = storage[`lag(address)];
             end
         end
-        ready_ = 1;
+        ready = 1;
     end
 end