X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/ac3ae95acace9eb20e9bd75b59aa5f944df4d429..69e8e27ffa6c1124ac91f55afe6d9a17d815a8b3:/Fetch.v

diff --git a/Fetch.v b/Fetch.v
index 834a0da..aa9bd7c 100644
--- a/Fetch.v
+++ b/Fetch.v
@@ -16,10 +16,12 @@ module Fetch(
 	
 	reg qjmp = 0;	/* A jump has been queued up while we were waiting. */
 	reg [31:0] qjmppc;
-	always @(posedge clk)
-		if (rd_wait && jmp && !qjmp)
+	always @(posedge clk or negedge Nrst)
+		if (!Nrst)
+			qjmp <= 0;
+		else if ((rd_wait || stall) && jmp)
 			{qjmp,qjmppc} <= {jmp, jmppc};
-		else if (!rd_wait && qjmp)	/* It has already been intoed. */
+		else if (!rd_wait && !stall && qjmp)	/* It has already been intoed. */
 			{qjmp,qjmppc} <= {1'b0, 32'hxxxxxxxx};
 	
 	reg [31:0] reqpc;
@@ -36,18 +38,10 @@ module Fetch(
 	assign rd_addr = reqpc;
 	assign rd_req = 1;
 	
-	always @(negedge Nrst)
-	begin
-		pc <= 32'hFFFFFFFC;
-		qjmp <= 0;
-		bubble <= 1;
-	end
-	
-	always @(posedge clk)
+	always @(posedge clk or negedge Nrst)
 	begin
 		if (!Nrst) begin
 			pc <= 32'hFFFFFFFC;
-			qjmp <= 0;
 			bubble <= 1;
 		end else if (!stall)
 		begin