X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/03cf736e2c85ee881927ceef1fae0542c85077da..9fc6c23c06d09346659d9ac1de1865a1f17a9604:/Decode.v

diff --git a/Decode.v b/Decode.v
index 359bbc0..495942b 100644
--- a/Decode.v
+++ b/Decode.v
@@ -63,11 +63,12 @@ module Decode(
 		`DECODE_BRANCH,			/* Branch */
 		`DECODE_LDCSTC,			/* Coprocessor data transfer */
 		`DECODE_CDP,			/* Coprocessor data op */
-		`DECODE_MRCMCR,			/* Coprocessor register transfer */
 		`DECODE_SWI:			/* SWI */
-			rpc = inpc - 8;
+			rpc = inpc + 8;
+		`DECODE_MRCMCR:			/* Coprocessor register transfer */
+			rpc = inpc + 12;
 		`DECODE_ALU:			/* ALU */
-			rpc = inpc - (insn[25] ? 8 : (insn[4] ? 12 : 8));
+			rpc = inpc + (insn[25] ? 8 : (insn[4] ? 12 : 8));
 		default:			/* X everything else out */
 			rpc = 32'hxxxxxxxx;
 		endcase
@@ -137,16 +138,20 @@ module Decode(
 		begin
 			read_0 = insn[19:16];
 			read_1 = insn[3:0];
-			
+			read_2 = insn[15:12];
+
 			op0_out = regs0;
 			op1_out = regs1;
+			op2_out = regs2;
 		end
 		`DECODE_ALU_HDATA_IMM:	/* Halfword transfer - immediate offset */
 		begin
 			read_0 = insn[19:16];
+			read_1 = insn[15:12];
 			
 			op0_out = regs0;
 			op1_out = {24'b0, insn[11:8], insn[3:0]};
+			op2_out = regs1;
 		end
 		`DECODE_ALU:		/* ALU */
 		begin
@@ -171,6 +176,7 @@ module Decode(
 		begin
 			read_0 = insn[19:16]; /* Rn */
 			read_1 = insn[3:0];   /* Rm */
+			read_2 = insn[15:12];
 			
 			op0_out = regs0;
 			if(insn[25]) begin
@@ -180,6 +186,7 @@ module Decode(
 				op1_out = shift_res;
 				carry_out = shift_cflag_out;
 			end
+			op2_out = regs2;
 		end
 		`DECODE_LDMSTM:		/* Block data transfer */
 		begin