X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/5d9760a4dd32206c26c9f20fb995d29160bcbf71..6c715b10a8f5c06afe094824298b1573eebf9a2e:/system.v

diff --git a/system.v b/system.v
index 1035489..fb28c4f 100644
--- a/system.v
+++ b/system.v
@@ -8,9 +8,11 @@ module System(input clk, output wire bubbleshield, output wire [31:0] insn, outp
 	wire [31:0] bus_wdata;
 	wire bus_rd, bus_wr;
 	wire bus_ready;
-	
-	wire bus_req_icache = bus_req[`BUS_ICACHE];
+
+	wire bus_req_icache;	
+	assign bus_req = {7'b0, bus_req_icache};
 	wire bus_ack_icache = bus_ack[`BUS_ICACHE];
+	
 	wire [31:0] bus_addr_icache;
 	wire [31:0] bus_wdata_icache;
 	wire bus_rd_icache;
@@ -30,6 +32,27 @@ module System(input clk, output wire bubbleshield, output wire [31:0] insn, outp
 	wire icache_rd_req;
 	wire icache_rd_wait;
 	wire [31:0] icache_rd_data;
+	
+	wire stall_cause_issue;
+	
+	wire stall_in_fetch = stall_cause_issue;
+	wire stall_in_issue = 0;
+	
+	wire [31:0] decode_out_op0, decode_out_op1, decode_out_op2;
+	wire decode_out_carry;
+	wire [3:0] regfile_read_0, regfile_read_1, regfile_read_2;
+	wire [31:0] regfile_rdata_0, regfile_rdata_1, regfile_rdata_2;
+	
+	wire bubble_out_fetch;
+	wire bubble_out_issue;
+	wire [31:0] insn_out_fetch;
+	wire [31:0] insn_out_issue;
+	wire [31:0] pc_out_fetch;
+	wire [31:0] pc_out_issue;
+	
+	assign bubbleshield = bubble_out_issue;
+	assign insn = insn_out_issue;
+	assign pc = pc_out_issue;
 
 	BusArbiter busarbiter(.bus_req(bus_req), .bus_ack(bus_ack));
 
@@ -42,7 +65,7 @@ module System(input clk, output wire bubbleshield, output wire [31:0] insn, outp
 		.bus_addr(bus_addr_icache), .bus_rdata(bus_rdata),
 		.bus_wdata(bus_wdata_icache), .bus_rd(bus_rd_icache),
 		.bus_wr(bus_wr_icache), .bus_ready(bus_ready));
-
+	
 	BlockRAM blockram(
 		.clk(clk),
 		.bus_addr(bus_addr), .bus_rdata(bus_rdata_blockram),
@@ -54,7 +77,40 @@ module System(input clk, output wire bubbleshield, output wire [31:0] insn, outp
 		.Nrst(1 /* XXX */),
 		.rd_addr(icache_rd_addr), .rd_req(icache_rd_req),
 		.rd_wait(icache_rd_wait), .rd_data(icache_rd_data),
-		.stall(0 /* XXX */), .jmp(0 /* XXX */), .jmppc(0 /* XXX */),
-		.bubble(bubbleshield), .insn(insn), .pc(pc));
-
+		.stall(stall_in_fetch), .jmp(0 /* XXX */), .jmppc(0 /* XXX */),
+		.bubble(bubble_out_fetch), .insn(insn_out_fetch),
+		.pc(pc_out_fetch));
+	
+	Issue issue(
+		.clk(clk),
+		.Nrst(1 /* XXX */),
+		.stall(stall_in_issue), .flush(0 /* XXX */),
+		.inbubble(bubble_out_fetch), .insn(insn_out_fetch),
+		.inpc(pc_out_fetch), .cpsr(0 /* XXX */),
+		.outstall(stall_cause_issue), .outbubble(bubble_out_issue),
+		.outpc(pc_out_issue), .outinsn(insn_out_issue));
+	
+	RegFile regfile(
+		.clk(clk),
+		.read_0(regfile_read_0), .read_1(regfile_read_1), .read_2(regfile_read_2),
+		.rdata_0(regfile_rdata_0), .rdata_1(regfile_rdata_1), .rdata_2(regfile_rdata_2),
+		.write(0), .write_req(0), .write_data(0 /* XXX */));
+	
+	Decode decode(
+		.clk(clk),
+		.insn(insn_out_fetch), .inpc(pc_out_fetch), .incpsr(0 /* XXX */),
+		.op0(decode_out_op0), .op1(decode_out_op1), .op2(decode_out_op2),
+		.carry(decode_out_carry),
+		.read_0(regfile_read_0), .read_1(regfile_read_1), .read_2(regfile_read_2), 
+		.rdata_0(regfile_rdata_0), .rdata_1(regfile_rdata_1), .rdata_2(regfile_rdata_2));
+	
+	reg [31:0] clockno = 0;
+	always @(posedge clk)
+	begin
+		clockno <= clockno + 1;
+		$display("------------------------------------------------------------------------------");
+		$display("%3d: FETCH:            Bubble: %d, Instruction: %08x, PC: %08x", clockno, bubble_out_fetch, insn_out_fetch, pc_out_fetch);
+		$display("%3d: ISSUE:  Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x", clockno, stall_cause_issue, bubble_out_issue, insn_out_issue, pc_out_issue);
+		$display("%3d: DECODE:                      op1 %08x, op2 %08x, op3 %08x, carry %d", clockno, decode_out_op0, decode_out_op1, decode_out_op2, decode_out_carry);
+	end
 endmodule