[Modified] Fix bugs & 29 Functional Test Point PASS

2023-06-26 15:11:31 +08:00
parent 75644e4920
commit 78fe1f6cf5
12 changed files with 91 additions and 86 deletions
--- a/lacpu/rtl/cpu/regfile.v
+++ b/lacpu/rtl/cpu/regfile.v
@@ -56,13 +56,13 @@ module regfile(
    end

    //READ OUT 1
-    assign rdata1 = (raddr1==5'b0 ) ? 32'b0 : 
-                    (raddr1==waddr) ? wdata :
-                                      rf[raddr1];
+    assign rdata1 = (raddr1==5'b0 )      ? 32'b0 : 
+                    (raddr1==waddr) & we ? wdata :
+                                           rf[raddr1];

    //READ OUT 2
-    assign rdata2 = (raddr2==5'b0 ) ? 32'b0 : 
-                    (raddr2==waddr) ? wdata :
-                                      rf[raddr2];
+    assign rdata2 = (raddr2==5'b0 )      ? 32'b0 : 
+                    (raddr2==waddr) & we ? wdata :
+                                           rf[raddr2];

 endmodule