update RISC-V CPU example

WangXuan95 · Feb 25, 2022 · dbd15f4 · dbd15f4
1 parent e4f2d68
commit dbd15f4
Show file tree

Hide file tree

Showing 21 changed files with 17,102 additions and 540 deletions.
diff --git a/README.md b/README.md
diff --git a/readme_image/0.bluespec.png b/readme_image/0.bluespec.png
diff --git a/readme_image/18.rv32i_pipe.png b/readme_image/18.rv32i_pipe.png
diff --git a/readme_image/9.bit_coding.png b/readme_image/9.bit_coding.png
diff --git a/src/JpegEncoder/JpegEncoder.bsv b/src/JpegEncoder/JpegEncoder.bsv
@@ -6,11 +6,9 @@ package JpegEncoder;
 import Vector::*;
 import DReg::*;
 import BRAM::*;
-import StmtFSM::*;
 
 // user defined packages
 import DoubleBuffer::*;
-import PgmReader::*;
 
 
 interface JpegEncoder;
@@ -19,6 +17,7 @@ interface JpegEncoder;
    method Bit#(128) get;
 endinterface
 
+
 (* synthesize *)
 (* always_ready="init" *)
 module mkJpegEncoder (JpegEncoder);
@@ -323,41 +322,4 @@ endmodule
 
 
 
-module mkTb ();
-   PgmReader   pgm_reader  <- mkPgmReader("img/in003.pgm");
-   JpegEncoder jpg_encoder <- mkJpegEncoder;
-
-   Reg#(File)  jpg_file    <- mkReg(InvalidFile);
-
-   mkAutoFSM( seq
-      action
-         let fp <- $fopen("out.jpg.txt", "w");
-         jpg_file <= fp;
-      endaction
-
-      action
-         int width  = pgm_reader.image_width;
-         int height = pgm_reader.image_height;
-         if(width%8 != 0 || height%8 !=0) begin     // 合法性检查， width 和 height 必须是 8 的倍数，否则 JpegEncoder 不支持
-            $error("  Error: image width or height is not multiple of 8");
-            $finish;
-         end
-         jpg_encoder.init( unpack(pack(width/8)[8:0]) , unpack(pack(height/8)[8:0]) );
-      endaction
-
-      while(pgm_reader.not_finish) action
-         let pixels <- pgm_reader.get_pixels;
-         jpg_encoder.put(pixels);
-      endaction
-
-      delay(10000);
-   endseq );
-
-   rule write_jpg_to_file;
-      $fwrite(jpg_file, "%032x", jpg_encoder.get);
-   endrule
-
-endmodule
-
-
 endpackage
diff --git a/src/JpegEncoder/TbJpegEncoder.bsv b/src/JpegEncoder/TbJpegEncoder.bsv
@@ -0,0 +1,50 @@
+// Copyright(c) 2022 https://github.com/WangXuan95
+
+package TbJpegEncoder;
+
+// standard BSV packages
+import StmtFSM::*;
+
+// user defined packages
+import PgmReader::*;
+import JpegEncoder::*;
+
+
+module mkTb ();
+   PgmReader   pgm_reader  <- mkPgmReader("img/in003.pgm");
+   JpegEncoder jpg_encoder <- mkJpegEncoder;
+
+   Reg#(File)  jpg_file    <- mkReg(InvalidFile);
+
+   mkAutoFSM( seq
+      action
+         let fp <- $fopen("out.jpg.txt", "w");
+         jpg_file <= fp;
+      endaction
+
+      action
+         int width  = pgm_reader.image_width;
+         int height = pgm_reader.image_height;
+         if(width%8 != 0 || height%8 !=0) begin     // 合法性检查， width 和 height 必须是 8 的倍数，否则 JpegEncoder 不支持
+            $error("  Error: image width or height is not multiple of 8");
+            $finish;
+         end
+         jpg_encoder.init( unpack(pack(width/8)[8:0]) , unpack(pack(height/8)[8:0]) );
+      endaction
+
+      while(pgm_reader.not_finish) action
+         let pixels <- pgm_reader.get_pixels;
+         jpg_encoder.put(pixels);
+      endaction
+
+      delay(10000);
+   endseq );
+
+   rule write_jpg_to_file;
+      $fwrite(jpg_file, "%032x", jpg_encoder.get);
+   endrule
+
+endmodule
+
+
+endpackage
diff --git a/src/Rv32iCPU/DFIFOF1.bsv b/src/Rv32iCPU/DFIFOF1.bsv
@@ -0,0 +1,28 @@
+// Copyright(c) 2022 https://github.com/WangXuan95
+
+package DFIFOF1;
+
+import FIFOF::*;
+
+
+module mkDFIFOF1#(td default_value) (FIFOF#(td))
+   provisos (Bits#(td, sz));
+
+   FIFOF#(td) fifo <- mkUGFIFOF1;
+
+   method td first = fifo.notEmpty ? fifo.first : default_value;
+
+   method Action deq = fifo.deq;
+
+   method Action enq(td value) if(fifo.notFull) = fifo.enq(value);
+
+   method notEmpty = fifo.notEmpty;
+
+   method notFull = fifo.notFull;
+
+   method clear = fifo.clear;
+
+endmodule
+
+
+endpackage