jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Removed registered CYC_O (didn't work)

Browse Source 
git-svn-id: http://moon:8086/svn/vhdl/trunk@66 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2008-10-17 17:35:07 +00:00
parent 61b2095bf8
commit fe372f0efa
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/CPUs/MIPS/src/core/mips_bui.vhd
+12 -15
View File
@@ -189,29 +189,21 @@ begin
MRDY_O <= '1'; MRDY_O <= '1';
cyc_registered_out: read_cyc_register:
process(CLK_I) process(CLK_I)
variable cyc : std_logic;
begin begin
if rising_edge(CLK_I) then if rising_edge(CLK_I) then
if RST_I = '1' then if RST_I = '1' then
cyc := '0'; read_cycle <= '0';
CYC_O <= '0';
else else
CYC_O <= cyc or not bout_fifo_empty; read_cycle <= (dmem_mem_rd_gnt and CYC_O_dmem_rd)
if cyc = '0' then or (dcache_mem_gnt and CYC_O_dcache)
if (bout_fifo_we and bout_rdy) = '1' then or (icache_mem_gnt and CYC_O_icache);
cyc := '1';
end if;
elsif SRDY_I = '1' then
cyc := read_cycle;
end if;
end if; end if;
end if; end if;
end process; end process;
read_cycle <= (dmem_mem_rd_gnt and CYC_O_dmem_rd) or (dcache_mem_gnt and CYC_O_dcache) or (icache_mem_gnt and CYC_O_icache); CYC_O <= not bout_fifo_empty or read_cycle;
STB_O <= not bout_fifo_empty; STB_O <= not bout_fifo_empty;
ADDR_O <= bout_fifo_addr_out; ADDR_O <= bout_fifo_addr_out;
DAT_O <= bout_fifo_data_out; DAT_O <= bout_fifo_data_out;
@@ -300,9 +292,14 @@ inst_bout_fifo: entity work.fifo_sync_dist
data_r => bout_fifo_dout data_r => bout_fifo_dout
); );
bout_rdy <= not bout_fifo_full; bout_rdy <= not bout_fifo_full;
bout_fifo_re <= SRDY_I; bout_fifo_re <= not bout_fifo_empty and SRDY_I;
bout_fifo_we <= STB_O_dmem_wr or STB_O_dmem_rd or STB_O_dcache or STB_O_icache; bout_fifo_we <= STB_O_dmem_wr or STB_O_dmem_rd or STB_O_dcache or STB_O_icache;
-- bout_fifo_we <= STB_O_dmem_wr when dmem_mem_wr_gnt = '1' else
-- STB_O_dmem_rd when dmem_mem_rd_gnt = '1' else
-- STB_O_dcache when dcache_mem_gnt = '1' else
-- STB_O_icache when icache_mem_gnt = '1' else '0';
bout_fifo_data_in <= DAT_O_dmem_wr when dmem_mem_wr_gnt = '1' else (others => '-'); bout_fifo_data_in <= DAT_O_dmem_wr when dmem_mem_wr_gnt = '1' else (others => '-');