From 34218536c1156f530f57e0f3a397b8318142d34e Mon Sep 17 00:00:00 2001
From: liangkangnan <liangkangnan@163.com>
Date: Thu, 1 Jul 2021 09:46:56 +0800
Subject: [PATCH] temp commit

Signed-off-by: liangkangnan <liangkangnan@163.com>
---
 rtl/core/pipe_ctrl.sv | 49 ++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/rtl/core/pipe_ctrl.sv b/rtl/core/pipe_ctrl.sv
index 6c6f742..09cfef3 100644
--- a/rtl/core/pipe_ctrl.sv
+++ b/rtl/core/pipe_ctrl.sv
@@ -20,43 +20,50 @@
 // 发出暂停、冲刷流水线信号
 module pipe_ctrl(
 
-    input wire clk,
-    input wire rst_n,
+    input wire                    clk,
+    input wire                    rst_n,
 
-    input wire stall_from_id_i,
-    input wire stall_from_ex_i,
-    input wire stall_from_jtag_i,
-    input wire stall_from_clint_i,
-    input wire jump_assert_i,
-    input wire[31:0] jump_addr_i,
+    input wire                    stall_from_id_i,
+    input wire                    stall_from_ex_i,
+    input wire                    stall_from_jtag_i,
+    input wire                    stall_from_clint_i,
+    input wire                    jump_assert_i,
+    input wire[31:0]              jump_addr_i,
 
-    output wire flush_o,
-    output wire[`STALL_WIDTH-1:0] stall_o,
-    output wire[31:0] flush_addr_o
+    output wire                   flush_o,              // 冲刷标志
+    output wire[`STALL_WIDTH-1:0] stall_o,              // 暂停标志
+    output wire[31:0]             flush_addr_o          // 冲刷地址
 
     );
 
     assign flush_addr_o = jump_addr_i;
-    assign flush_o = jump_assert_i | stall_from_clint_i;
+    assign flush_o      = jump_assert_i;
 
     reg[`STALL_WIDTH-1:0] stall;
 
     always @ (*) begin
-        if (stall_from_ex_i | stall_from_clint_i) begin
+        stall[`STALL_EX] = 1'b0;
+        stall[`STALL_ID] = 1'b0;
+        stall[`STALL_IF] = 1'b0;
+        stall[`STALL_PC] = 1'b0;
+
+        if (stall_from_clint_i) begin
             stall[`STALL_EX] = 1'b1;
             stall[`STALL_ID] = 1'b1;
             stall[`STALL_IF] = 1'b1;
             stall[`STALL_PC] = 1'b1;
-        end else if (stall_from_id_i) begin
-            stall[`STALL_EX] = 1'b0;
-            stall[`STALL_ID] = 1'b0;
+        end
+
+        if (stall_from_ex_i) begin
+            stall[`STALL_EX] = 1'b1;
+            stall[`STALL_ID] = 1'b1;
+            stall[`STALL_IF] = 1'b1;
+            stall[`STALL_PC] = 1'b1;
+        end
+
+        if (stall_from_id_i) begin
             stall[`STALL_IF] = 1'b1;
             stall[`STALL_PC] = 1'b1;
-        end else begin
-            stall[`STALL_EX] = 1'b0;
-            stall[`STALL_ID] = 1'b0;
-            stall[`STALL_IF] = 1'b0;
-            stall[`STALL_PC] = 1'b0;
         end
     end