From a2a61e3911b4bc4823dbd61a7806bbdadef5972e Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Wed, 31 Dec 2014 12:12:08 +0100 Subject: [PATCH] Connect internal finish_wrb_mem_s to GPRF - gprf_finish_wrb_mem. Signed-off-by: Pavel Pisa --- hw/core_ctrl.vhd | 4 +++- hw/mbl_pkg.vhd | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/core_ctrl.vhd b/hw/core_ctrl.vhd index 9cd778d..4bfabbb 100644 --- a/hw/core_ctrl.vhd +++ b/hw/core_ctrl.vhd @@ -52,6 +52,7 @@ ENTITY core_ctrl IS delay_bit_o : OUT STD_LOGIC; -- GPRF control gprf_clken_o : OUT STD_LOGIC; + gprf_finish_wrb_mem_o : OUT STD_LOGIC; -- exeq to fetch feedback registers EX2IF_REG_i : IN EX2IF_Type; EX2IF_REG_o : OUT EX2IF_Type; @@ -133,7 +134,8 @@ BEGIN clken_pipe_s <= clken_s AND (NOT HAZARD_WRB_i.hazard); imem_clken_o <= clken_pipe_s; - gprf_clken_o <= clken_s OR finish_wrb_mem_s; + gprf_clken_o <= clken_s or finish_wrb_mem_s; + gprf_finish_wrb_mem_o <= finish_wrb_mem_s; -- signals for clearing the ID2EX and EX2MEM registers during branches flush_ID2EX_s <= ((EX2IF_REG_i.take_branch AND (NOT delayBit_r)) OR EX2IF_REG_r.take_branch) WHEN COMPATIBILITY_MODE_g = TRUE ELSE ((EX2IF_REG_i.take_branch AND (NOT delayBit_r)) OR EX2IF_REG_r.take_branch OR EX2CTRL_REG_i.flush_first OR diff --git a/hw/mbl_pkg.vhd b/hw/mbl_pkg.vhd index 78ffcdd..e8e2a46 100644 --- a/hw/mbl_pkg.vhd +++ b/hw/mbl_pkg.vhd @@ -299,6 +299,7 @@ PACKAGE mbl_pkg IS delay_bit_o : OUT STD_LOGIC; -- GPRF control gprf_clken_o : OUT STD_LOGIC; + gprf_finish_wrb_mem_o : OUT STD_LOGIC; -- exeq to fetch feedback registers EX2IF_REG_i : IN EX2IF_Type; EX2IF_REG_o : OUT EX2IF_Type; -- 2.39.2