X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/c4e2ac3b3f80b9d92660c87009714362cdb7f875..1783621cc5b0d6411aa33cf9961b29f8e440e605:/Issue.v

diff --git a/Issue.v b/Issue.v
index 7815a08..792fdbd 100644
--- a/Issue.v
+++ b/Issue.v
@@ -180,7 +180,7 @@ module Issue(
 		`DECODE_LDRSTR:
 		begin
 			use_cpsr = `COND_MATTERS(cond);
-			use_regs = idxbit(rn) | (insn[20] /* L */ ? 0 : idxbit(rd));
+			use_regs = idxbit(rn) | (insn[25] /* I */ ? idxbit(rm) : 0) | (insn[20] /* L */ ? 0 : idxbit(rd));
 			def_cpsr = 0;
 			def_regs = insn[20] /* L */ ? idxbit(rd) : 0;
 		end
@@ -196,7 +196,7 @@ module Issue(
 			use_cpsr = `COND_MATTERS(cond);
 			use_regs = 0;
 			def_cpsr = 0;
-			def_regs = 0;
+			def_regs = insn[24] /* L */ ? (16'b1 << 14) : 0;
 		end
 		`DECODE_LDCSTC:	/* Coprocessor data transfer */
 		begin
@@ -291,29 +291,21 @@ module Issue(
 			delayedflush <= 1;
 		else if (!outstall /* anything has been handled this time around */)
 			delayedflush <= 0;
-	
+
 	/* Actually do the issue. */
 	always @(posedge clk)
 	begin
 		if (waiting)
 			$display("ISSUE: Stalling instruction %08x because %d/%d", insn, waiting_cpsr, waiting_regs);
 
-		if((flush || delayedflush) && !outstall)
-		begin
-			cpsr_inflight[0] = 1'b0;
-			cpsr_inflight[1] = 1'b0;
-			regs_inflight[0] = 16'b0;
-			regs_inflight[1] = 16'b0;
-			outbubble <= 1'b1;
-		end
-		else if (!stall)
+		if (!stall)
 		begin
 			cpsr_inflight[0] <= cpsr_inflight[1];	/* I'm not sure how well selects work with arrays, and that seems like a dumb thing to get anusulated by. */
 			cpsr_inflight[1] <= (waiting || inbubble || !condition_met) ? 0 : def_cpsr;
 			regs_inflight[0] <= regs_inflight[1];
 			regs_inflight[1] <= (waiting || inbubble || !condition_met) ? 0 : def_regs;
 			
-			outbubble <= inbubble | waiting | !condition_met;
+			outbubble <= inbubble | waiting | !condition_met | flush | delayedflush;
 			outpc <= inpc;
 			outinsn <= insn;
 		end