X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/dfe0713aebc58dd093c309011ac0596597ab2cb5..ac3ba6ad6814e7d0cfb296d8b699f5b3ed2632a5:/Decode.v

diff --git a/Decode.v b/Decode.v
index 9bfb03d..2c22746 100644
--- a/Decode.v
+++ b/Decode.v
@@ -2,6 +2,7 @@
 
 module Decode(
 	input clk,
+	input stall,
 	input [31:0] insn,
 	input [31:0] inpc,
 	input [31:0] incpsr,
@@ -180,7 +181,7 @@ module Decode(
 			read_2 = insn[15:12];
 			
 			op0_out = regs0;
-			if(insn[25]) begin
+			if(!insn[25] /* immediate */) begin
 				op1_out = {20'b0, insn[11:0]};
 				carry_out = incpsr[`CPSR_C];
 			end else begin
@@ -226,12 +227,15 @@ module Decode(
 
 	
 	always @ (posedge clk) begin
-		op0 <= op0_out;   /* Rn - always */
-		op1 <= op1_out; /* 'operand 2' - Rm */
-		op2 <= op2_out;   /* thirdedge - Rs */
-		carry <= carry_out;
-		outcpsr <= incpsr;
-		outspsr <= inspsr;
+		if (!stall)
+		begin
+			op0 <= op0_out;   /* Rn - always */
+			op1 <= op1_out; /* 'operand 2' - Rm */
+			op2 <= op2_out;   /* thirdedge - Rs */
+			carry <= carry_out;
+			outcpsr <= incpsr;
+			outspsr <= inspsr;
+		end
 	end
 
 endmodule