X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/dfe0713aebc58dd093c309011ac0596597ab2cb5..6318a7e8b9da8c5372af7353dfaaf97763984cc9:/system.v

diff --git a/system.v b/system.v
index d7fc62c..f5312fc 100644
--- a/system.v
+++ b/system.v
@@ -151,13 +151,14 @@ module System(input clk);
 	
 	RegFile regfile(
 		.clk(clk),
-		.read_0(regfile_read_0), .read_1(regfile_read_1), .read_2(regfile_read_2), .read_2(regfile_read_3),
-		.rdata_0(regfile_rdata_0), .rdata_1(regfile_rdata_1), .rdata_2(regfile_rdata_2), .rdata_2(regfile_rdata_3),
+		.read_0(regfile_read_0), .read_1(regfile_read_1), .read_2(regfile_read_2), .read_3(regfile_read_3),
+		.rdata_0(regfile_rdata_0), .rdata_1(regfile_rdata_1), .rdata_2(regfile_rdata_2), .rdata_3(regfile_rdata_3),
 		.spsr(regfile_spsr),
 		.write(regfile_write), .write_reg(regfile_write_reg), .write_data(regfile_write_data));
 	
 	Decode decode(
 		.clk(clk),
+		.stall(stall_cause_execute),
 		.insn(insn_out_fetch), .inpc(pc_out_fetch), .incpsr(writeback_out_cpsr), .inspsr(writeback_out_spsr),
 		.op0(decode_out_op0), .op1(decode_out_op1), .op2(decode_out_op2),
 		.carry(decode_out_carry), .outcpsr(decode_out_cpsr), .outspsr(decode_out_spsr),
@@ -195,7 +196,7 @@ module System(input clk);
 		.out_write_reg(memory_out_write_reg), .out_write_num(memory_out_write_num), 
 		.out_write_data(memory_out_write_data),
 		.cp_req(cp_req), .cp_ack(cp_ack), .cp_busy(cp_busy), .cp_rnw(cp_rnw), .cp_read(cp_read), .cp_write(cp_write),
-		.outcpsr(memory_out_cpsr), .outspsr(memory_out_spsr));
+		.outcpsr(memory_out_cpsr), .outspsr(memory_out_spsr) /* XXX data_size */);
 	
 	Terminal terminal(	
 		.clk(clk),