X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/b770ec9a582cb5401f2b969bda91d65a4adf5f67..4dc317445bd5132ca57744d7faf27731ea10d3b9:/Execute.v

diff --git a/Execute.v b/Execute.v
index 66a63e5..6582581 100644
--- a/Execute.v
+++ b/Execute.v
@@ -121,8 +121,8 @@ module Execute(
 				mult_in1 = op2 /* Rs */;
 				$display("New MUL instruction");
 			end
-			outstall = stall | ((!prevstall | !mult_done) && !inbubble);
-			next_outbubble = inbubble | !mult_done | !prevstall;
+			outstall = outstall | ((!prevstall | !mult_done) && !inbubble);
+			next_outbubble = next_outbubble | !mult_done | !prevstall;
 			next_outcpsr = insn[20] /* S */ ? {mult_result[31] /* N */, mult_result == 0 /* Z */, 1'b0 /* C */, cpsr[28] /* V */, cpsr[27:0]} : cpsr;
 			next_write_reg = 1;
 			next_write_num = insn[19:16] /* Rd -- why the fuck isn't this the same place as ALU */;
@@ -258,7 +258,7 @@ module ALU(
 
 	assign sum = {1'b0, in0} + {1'b0, in1};
 	assign diff = {1'b0, in0} - {1'b0, in1};
-	assign rdiff = {1'b0, in1} + {1'b0, in0};
+	assign rdiff = {1'b0, in1} - {1'b0, in0};
 	assign sum_v = (in0[31] ^~ in1[31]) & (sum[31] ^ in0[31]);
 	assign diff_v = (in0[31] ^ in1[31]) & (diff[31] ^ in0[31]);
 	assign rdiff_v = (in0[31] ^ in1[31]) & (rdiff[31] ^ in1[31]);