- removed explicit tag_ram_read

- remove state 'rd_cache'
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/


git-svn-id: http://moon:8086/svn/vhdl/trunk@340 cc03376c-175c-47c8-b038-4cd826a8556b

lib/CPUs/MIPS/src/core/icache.vhd

@@ -101,7 +101,7 @@ END COMPONENT;
 		return result;
 	end to_tag_ram_data;
 
-	type cache_state_t is (init, ready, flush, mem_request, mem_access, mem_wait, mem_data, upd_cache, rd_cache);
+	type cache_state_t is (init, ready, flush, mem_request, mem_access, mem_wait, mem_data, upd_cache);
 	signal s, sn : cache_state_t;
 	
 	signal	cache_busy			: std_logic;
@@ -165,7 +165,7 @@ inst_tag_ram : dpram_1w1r
 		clka	=> CLK_I,
 		clkb	=> CLK_I,
 		en_a	=> '1',
-		en_b	=> tag_ram_re,
+		en_b	=> '1',
 		we_a	=> tag_ram_we,
 		addr_a	=> tag_ram_addr_wr,
 		addr_b	=> tag_ram_addr_rd,
@@ -230,13 +230,13 @@ cache_state:
 		CYC_O					<= '0';
 		STB_O					<= '0';
 		data_ram_re				<= '0';
-		tag_ram_re				<= '0';
 		was_miss				<= '0';
 		data_write				<= '0';
 		tag_ram_addr_wr			<= to_unsigned(cache_index_count, cache_index_width);
 		cache_entry_in.tv_p		<= (others => '0');
 		cache_entry_in.tag		<= tag_index_reg;
 		cache_entry_in.valid	<= '0';
+
 		sn	<= s;
 		
 		case s is
@@ -253,7 +253,6 @@ cache_state:
 				elsif cpu_en = '1' then
 					cpu_reg_en			<= '1';
 					data_ram_re			<= '1';
-					tag_ram_re			<= '1';
 				end if;	
 			end if;	
 		when flush =>
@@ -267,7 +266,6 @@ cache_state:
 				if cpu_en = '1' then
 					cpu_reg_en			<= '1';
 					data_ram_re			<= '1';
-					tag_ram_re			<= '1';
 				end if;
 			end if;
 		when mem_request =>
@@ -299,13 +297,10 @@ cache_state:
 			tag_ram_addr_wr			<= cache_index_reg;
 			tag_ram_we				<= '1';
 			cache_entry_in.valid	<= '1';
-			sn						<= rd_cache;
-			
-		when rd_cache =>
-			tag_ram_re				<= '1';
 			data_ram_re				<= '1';
 			was_miss				<= '1';
-			sn	<= ready;
+			sn						<= ready;
+			
 		when others => 
 			sn	<= ready;
 		end case;