]> rtime.felk.cvut.cz Git - fpga/lx-cpu1/tumbl.git/commitdiff
Connect internal finish_wrb_mem_s to GPRF - gprf_finish_wrb_mem. master
authorPavel Pisa <ppisa@pikron.com>
Wed, 31 Dec 2014 11:12:08 +0000 (12:12 +0100)
committerPavel Pisa <ppisa@pikron.com>
Wed, 31 Dec 2014 11:12:08 +0000 (12:12 +0100)
Signed-off-by: Pavel Pisa <ppisa@pikron.com>
hw/core_ctrl.vhd
hw/mbl_pkg.vhd

index 9cd778d297ffe187d72bceeaf1701d086dffea82..4bfabbb1a84f149cbf3ab958cd605fdf896098e5 100644 (file)
@@ -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
index 78ffcdd998c569bf293423dcbbe0af26fba8db96..e8e2a46326d04228fe07aa299a7e64f52b423768 100644 (file)
@@ -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;