`else
, output wire [8:0] sys_odata,
input [8:0] sys_idata,
- output wire sys_tookdata
+ output wire sys_tookdata,
+
+ output wire cr_nADV, cr_nCE, cr_nOE, cr_nWE, cr_CRE, cr_nLB, cr_nUB, cr_CLK,
+ inout wire [15:0] cr_DQ,
+ output wire [22:0] cr_A,
+ output wire st_nCE
`endif
);
wire bus_rd_dcache;
wire bus_wr_dcache;
- wire [31:0] bus_rdata_blockram;
- wire bus_ready_blockram;
+ wire [31:0] bus_rdata_blockram, bus_rdata_cellularram;
+ wire bus_ready_blockram, bus_ready_cellularram;
assign bus_addr = bus_addr_icache | bus_addr_dcache;
- assign bus_rdata = bus_rdata_blockram;
+ assign bus_rdata = bus_rdata_blockram | bus_rdata_cellularram;
assign bus_wdata = bus_wdata_icache | bus_wdata_dcache;
assign bus_rd = bus_rd_icache | bus_rd_dcache;
assign bus_wr = bus_wr_icache | bus_wr_dcache;
- assign bus_ready = bus_ready_blockram;
+ assign bus_ready = bus_ready_blockram | bus_ready_cellularram;
wire [31:0] icache_rd_addr;
wire icache_rd_req;
/*AUTOWIRE*/
// Beginning of automatic wires (for undeclared instantiated-module outputs)
wire bubble_1a; // From fetch of Fetch.v
+ wire bubble_2a; // From issue of Issue.v
+ wire bubble_3a; // From execute of Execute.v
+ wire carry_2a; // From decode of Decode.v
+ wire [31:0] cpsr_2a; // From decode of Decode.v
+ wire [31:0] cpsr_3a; // From execute of Execute.v
+ wire cpsrup_3a; // From execute of Execute.v
+ wire [31:0] dc__addr_3a; // From memory of Memory.v
+ wire [2:0] dc__data_size_3a; // From memory of Memory.v
+ wire [31:0] dc__rd_data_3a; // From dcache of DCache.v
+ wire dc__rd_req_3a; // From memory of Memory.v
+ wire dc__rw_wait_3a; // From dcache of DCache.v
+ wire [31:0] dc__wr_data_3a; // From memory of Memory.v
+ wire dc__wr_req_3a; // From memory of Memory.v
wire [31:0] ic__rd_addr_0a; // From fetch of Fetch.v
wire [31:0] ic__rd_data_1a; // From icache of ICache.v
wire ic__rd_req_0a; // From fetch of Fetch.v
wire ic__rd_wait_0a; // From icache of ICache.v
wire [31:0] insn_1a; // From fetch of Fetch.v
+ wire [31:0] insn_2a; // From issue of Issue.v
+ wire [31:0] insn_3a; // From execute of Execute.v
+ wire [31:0] op0_2a; // From decode of Decode.v
+ wire [31:0] op0_3a; // From execute of Execute.v
+ wire [31:0] op1_2a; // From decode of Decode.v
+ wire [31:0] op1_3a; // From execute of Execute.v
+ wire [31:0] op2_2a; // From decode of Decode.v
+ wire [31:0] op2_3a; // From execute of Execute.v
wire [31:0] pc_1a; // From fetch of Fetch.v
+ wire [31:0] pc_2a; // From issue of Issue.v
+ wire [31:0] pc_3a; // From execute of Execute.v
wire [31:0] rf__rdata_0_1a; // From regfile of RegFile.v
wire [31:0] rf__rdata_1_1a; // From regfile of RegFile.v
wire [31:0] rf__rdata_2_1a; // From regfile of RegFile.v
- wire [31:0] rf__rdata_3_4a; // From regfile of RegFile.v
+ wire [31:0] rf__rdata_3_3a; // From regfile of RegFile.v
wire [3:0] rf__read_0_1a; // From decode of Decode.v
wire [3:0] rf__read_1_1a; // From decode of Decode.v
wire [3:0] rf__read_2_1a; // From decode of Decode.v
+ wire [3:0] rf__read_3_3a; // From memory of Memory.v
+ wire [31:0] spsr_2a; // From decode of Decode.v
+ wire [31:0] spsr_3a; // From execute of Execute.v
wire stall_0a; // From issue of Issue.v
+ wire [31:0] write_data_3a; // From execute of Execute.v
+ wire [3:0] write_num_3a; // From execute of Execute.v
+ wire write_reg_3a; // From execute of Execute.v
// End of automatics
wire execute_out_backflush;
.bus_wr(bus_wr_icache),
.bus_ready(bus_ready),
); */
- ICache icache(/*AUTOINST*/
+ ICache icache(
+ /*AUTOINST*/
// Outputs
.ic__rd_wait_0a (ic__rd_wait_0a),
.ic__rd_data_1a (ic__rd_data_1a[31:0]),
.bus_rdata (bus_rdata), // Templated
.bus_ready (bus_ready)); // Templated
- DCache dcache(
+ /* DCache AUTO_TEMPLATE (
.clk(clk),
- .addr(dcache_addr), .rd_req(dcache_rd_req), .wr_req(dcache_wr_req),
- .rw_wait(dcache_rw_wait), .wr_data(dcache_wr_data), .rd_data(dcache_rd_data),
- .bus_req(bus_req_dcache), .bus_ack(bus_ack_dcache),
- .bus_addr(bus_addr_dcache), .bus_rdata(bus_rdata),
- .bus_wdata(bus_wdata_dcache), .bus_rd(bus_rd_dcache),
- .bus_wr(bus_wr_dcache), .bus_ready(bus_ready));
+ .bus_req(bus_req_dcache),
+ .bus_ack(bus_ack_dcache),
+ .bus_addr(bus_addr_dcache),
+ .bus_rdata(bus_rdata),
+ .bus_wdata(bus_wdata_dcache),
+ .bus_rd(bus_rd_dcache),
+ .bus_wr(bus_wr_dcache),
+ .bus_ready(bus_ready),
+ );
+ */
+ DCache dcache(
+ /*AUTOINST*/
+ // Outputs
+ .dc__rw_wait_3a (dc__rw_wait_3a),
+ .dc__rd_data_3a (dc__rd_data_3a[31:0]),
+ .bus_req (bus_req_dcache), // Templated
+ .bus_addr (bus_addr_dcache), // Templated
+ .bus_wdata (bus_wdata_dcache), // Templated
+ .bus_rd (bus_rd_dcache), // Templated
+ .bus_wr (bus_wr_dcache), // Templated
+ // Inputs
+ .clk (clk), // Templated
+ .dc__addr_3a (dc__addr_3a[31:0]),
+ .dc__rd_req_3a (dc__rd_req_3a),
+ .dc__wr_req_3a (dc__wr_req_3a),
+ .dc__wr_data_3a (dc__wr_data_3a[31:0]),
+ .bus_ack (bus_ack_dcache), // Templated
+ .bus_rdata (bus_rdata), // Templated
+ .bus_ready (bus_ready)); // Templated
`ifdef verilator
BigBlockRAM
.bus_wdata(bus_wdata), .bus_rd(bus_rd), .bus_wr(bus_wr),
.bus_ready(bus_ready_blockram));
+`ifdef verilator
+ assign bus_rdata_cellularram = 32'h00000000;
+ assign bus_ready_cellularram = 0;
+`else
+ /* CellularRAM AUTO_TEMPLATE (
+ .bus_rdata(bus_rdata_cellularram),
+ .bus_ready(bus_ready_cellularram),
+ );
+ */
+ CellularRAM cellularram(
+ /*AUTOINST*/
+ // Outputs
+ .bus_rdata (bus_rdata_cellularram), // Templated
+ .bus_ready (bus_ready_cellularram), // Templated
+ .cr_nADV (cr_nADV),
+ .cr_nCE (cr_nCE),
+ .cr_nOE (cr_nOE),
+ .cr_nWE (cr_nWE),
+ .cr_CRE (cr_CRE),
+ .cr_nLB (cr_nLB),
+ .cr_nUB (cr_nUB),
+ .cr_CLK (cr_CLK),
+ .cr_A (cr_A[22:0]),
+ .st_nCE (st_nCE),
+ // Inouts
+ .cr_DQ (cr_DQ[15:0]),
+ // Inputs
+ .clk (clk),
+ .bus_addr (bus_addr[31:0]),
+ .bus_wdata (bus_wdata[31:0]),
+ .bus_rd (bus_rd),
+ .bus_wr (bus_wr));
+`endif
+
/* Fetch AUTO_TEMPLATE (
- .stall_0a(stall_cause_issue),
.jmp_0a(jmp),
.jmppc_0a(jmppc),
);
.Nrst (Nrst),
.ic__rd_wait_0a (ic__rd_wait_0a),
.ic__rd_data_1a (ic__rd_data_1a[31:0]),
- .stall_0a (stall_cause_issue), // Templated
+ .stall_0a (stall_0a),
.jmp_0a (jmp), // Templated
.jmppc_0a (jmppc)); // Templated
/* Issue AUTO_TEMPLATE (
.stall_1a(stall_cause_execute),
- .flush(execute_out_backflush | writeback_out_backflush),
+ .flush_1a(execute_out_backflush | writeback_out_backflush),
.cpsr_1a(writeback_out_cpsr),
- .bubble_2a(bubble_out_issue),
- .pc_2a(pc_out_issue),
- .insn_2a(insn_out_issue),
);
*/
Issue issue(
/*AUTOINST*/
// Outputs
.stall_0a (stall_0a),
- .bubble_2a (bubble_out_issue), // Templated
- .pc_2a (pc_out_issue), // Templated
- .insn_2a (insn_out_issue), // Templated
+ .bubble_2a (bubble_2a),
+ .pc_2a (pc_2a[31:0]),
+ .insn_2a (insn_2a[31:0]),
// Inputs
.clk (clk),
.Nrst (Nrst),
.stall_1a (stall_cause_execute), // Templated
- .flush (execute_out_backflush | writeback_out_backflush), // Templated
+ .flush_1a (execute_out_backflush | writeback_out_backflush), // Templated
.bubble_1a (bubble_1a),
.insn_1a (insn_1a[31:0]),
.pc_1a (pc_1a[31:0]),
.rf__rdata_0_1a (rf__rdata_0_1a[31:0]),
.rf__rdata_1_1a (rf__rdata_1_1a[31:0]),
.rf__rdata_2_1a (rf__rdata_2_1a[31:0]),
- .rf__rdata_3_4a (rf__rdata_3_4a[31:0]),
+ .rf__rdata_3_3a (rf__rdata_3_3a[31:0]),
.spsr (regfile_spsr), // Templated
// Inputs
.clk (clk),
.rf__read_0_1a (rf__read_0_1a[3:0]),
.rf__read_1_1a (rf__read_1_1a[3:0]),
.rf__read_2_1a (rf__read_2_1a[3:0]),
- .rf__read_3_4a (rf__read_3_4a[3:0]),
+ .rf__read_3_3a (rf__read_3_3a[3:0]),
.write (regfile_write), // Templated
.write_reg (regfile_write_reg), // Templated
.write_data (regfile_write_data)); // Templated
/* Decode AUTO_TEMPLATE (
.stall(stall_cause_execute),
- .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),
+ .cpsr_1a(writeback_out_cpsr),
+ .spsr_1a(writeback_out_spsr),
);
*/
Decode decode(
/*AUTOINST*/
// Outputs
- .op0 (decode_out_op0), // Templated
- .op1 (decode_out_op1), // Templated
- .op2 (decode_out_op2), // Templated
- .carry (decode_out_carry), // Templated
- .outcpsr (decode_out_cpsr), // Templated
- .outspsr (decode_out_spsr), // Templated
+ .op0_2a (op0_2a[31:0]),
+ .op1_2a (op1_2a[31:0]),
+ .op2_2a (op2_2a[31:0]),
+ .carry_2a (carry_2a),
+ .cpsr_2a (cpsr_2a[31:0]),
+ .spsr_2a (spsr_2a[31:0]),
.rf__read_0_1a (rf__read_0_1a[3:0]),
.rf__read_1_1a (rf__read_1_1a[3:0]),
.rf__read_2_1a (rf__read_2_1a[3:0]),
.stall (stall_cause_execute), // Templated
.insn_1a (insn_1a[31:0]),
.pc_1a (pc_1a[31:0]),
- .incpsr (writeback_out_cpsr), // Templated
- .inspsr (writeback_out_spsr), // Templated
+ .cpsr_1a (writeback_out_cpsr), // Templated
+ .spsr_1a (writeback_out_spsr), // Templated
.rf__rdata_0_1a (rf__rdata_0_1a[31:0]),
.rf__rdata_1_1a (rf__rdata_1_1a[31:0]),
.rf__rdata_2_1a (rf__rdata_2_1a[31:0]));
-
+
+ /* Execute AUTO_TEMPLATE (
+ .stall_2a(stall_cause_memory),
+ .flush_2a(writeback_out_backflush),
+ .outstall_2a(stall_cause_execute),
+ .jmp_2a(jmp_out_execute),
+ .jmppc_2a(jmppc_out_execute),
+ );
+ */
Execute execute(
- .clk(clk), .Nrst(~rst),
- .stall(stall_cause_memory), .flush(writeback_out_backflush),
- .inbubble(bubble_out_issue), .pc(pc_out_issue), .insn(insn_out_issue),
- .cpsr(decode_out_cpsr), .spsr(decode_out_spsr), .op0(decode_out_op0), .op1(decode_out_op1),
- .op2(decode_out_op2), .carry(decode_out_carry),
- .outstall(stall_cause_execute), .outbubble(bubble_out_execute),
- .write_reg(execute_out_write_reg), .write_num(execute_out_write_num),
- .write_data(execute_out_write_data),
- .jmp(jmp_out_execute), .jmppc(jmppc_out_execute),
- .outpc(pc_out_execute), .outinsn(insn_out_execute),
- .outop0(execute_out_op0), .outop1(execute_out_op1), .outop2(execute_out_op2),
- .outcpsr(execute_out_cpsr), .outspsr(execute_out_spsr), .outcpsrup(execute_out_cpsrup));
+ /*AUTOINST*/
+ // Outputs
+ .outstall_2a (stall_cause_execute), // Templated
+ .bubble_3a (bubble_3a),
+ .cpsr_3a (cpsr_3a[31:0]),
+ .spsr_3a (spsr_3a[31:0]),
+ .cpsrup_3a (cpsrup_3a),
+ .write_reg_3a (write_reg_3a),
+ .write_num_3a (write_num_3a[3:0]),
+ .write_data_3a (write_data_3a[31:0]),
+ .jmppc_2a (jmppc_out_execute), // Templated
+ .jmp_2a (jmp_out_execute), // Templated
+ .pc_3a (pc_3a[31:0]),
+ .insn_3a (insn_3a[31:0]),
+ .op0_3a (op0_3a[31:0]),
+ .op1_3a (op1_3a[31:0]),
+ .op2_3a (op2_3a[31:0]),
+ // Inputs
+ .clk (clk),
+ .Nrst (Nrst),
+ .stall_2a (stall_cause_memory), // Templated
+ .flush_2a (writeback_out_backflush), // Templated
+ .bubble_2a (bubble_2a),
+ .pc_2a (pc_2a[31:0]),
+ .insn_2a (insn_2a[31:0]),
+ .cpsr_2a (cpsr_2a[31:0]),
+ .spsr_2a (spsr_2a[31:0]),
+ .op0_2a (op0_2a[31:0]),
+ .op1_2a (op1_2a[31:0]),
+ .op2_2a (op2_2a[31:0]),
+ .carry_2a (carry_2a));
assign execute_out_backflush = jmp;
- assign cp_insn = insn_out_execute;
- Memory memory(
- .clk(clk), .Nrst(~rst),
- /* stall? */ .flush(writeback_out_backflush),
- .busaddr(dcache_addr), .rd_req(dcache_rd_req), .wr_req(dcache_wr_req),
- .rw_wait(dcache_rw_wait), .wr_data(dcache_wr_data), .rd_data(dcache_rd_data),
- .st_read(rf__read_3_4a), .st_data(rf__rdata_3_4a),
- .inbubble(bubble_out_execute), .pc(pc_out_execute), .insn(insn_out_execute),
- .op0(execute_out_op0), .op1(execute_out_op1), .op2(execute_out_op2),
- .spsr(execute_out_spsr), .cpsr(execute_out_cpsr), .cpsrup(execute_out_cpsrup),
- .write_reg(execute_out_write_reg), .write_num(execute_out_write_num), .write_data(execute_out_write_data),
- .outstall(stall_cause_memory), .outbubble(bubble_out_memory),
- .outpc(pc_out_memory), .outinsn(insn_out_memory),
- .out_write_reg(memory_out_write_reg), .out_write_num(memory_out_write_num),
+ assign cp_insn = insn_3a;
+ /* stall? */
+ /* Memory AUTO_TEMPLATE (
+ .flush(writeback_out_backflush),
+ .outstall(stall_cause_memory),
+ .outbubble(bubble_out_memory),
+ .outpc(pc_out_memory),
+ .outinsn(insn_out_memory),
+ .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), .outcpsrup(memory_out_cpsrup) /* XXX data_size */);
+ .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),
+ .outcpsrup(memory_out_cpsrup),
+ );
+ */
+ Memory memory(
+ /*AUTOINST*/
+ // Outputs
+ .dc__addr_3a (dc__addr_3a[31:0]),
+ .dc__rd_req_3a (dc__rd_req_3a),
+ .dc__wr_req_3a (dc__wr_req_3a),
+ .dc__wr_data_3a (dc__wr_data_3a[31:0]),
+ .dc__data_size_3a (dc__data_size_3a[2:0]),
+ .rf__read_3_3a (rf__read_3_3a[3:0]),
+ .cp_req (cp_req), // Templated
+ .cp_rnw (cp_rnw), // Templated
+ .cp_write (cp_write), // Templated
+ .outstall (stall_cause_memory), // Templated
+ .outbubble (bubble_out_memory), // Templated
+ .outpc (pc_out_memory), // Templated
+ .outinsn (insn_out_memory), // Templated
+ .out_write_reg (memory_out_write_reg), // Templated
+ .out_write_num (memory_out_write_num), // Templated
+ .out_write_data (memory_out_write_data), // Templated
+ .outspsr (memory_out_spsr), // Templated
+ .outcpsr (memory_out_cpsr), // Templated
+ .outcpsrup (memory_out_cpsrup), // Templated
+ // Inputs
+ .clk (clk),
+ .Nrst (Nrst),
+ .flush (writeback_out_backflush), // Templated
+ .dc__rw_wait_3a (dc__rw_wait_3a),
+ .dc__rd_data_3a (dc__rd_data_3a[31:0]),
+ .rf__rdata_3_3a (rf__rdata_3_3a[31:0]),
+ .cp_ack (cp_ack), // Templated
+ .cp_busy (cp_busy), // Templated
+ .cp_read (cp_read), // Templated
+ .bubble_3a (bubble_3a),
+ .pc_3a (pc_3a[31:0]),
+ .insn_3a (insn_3a[31:0]),
+ .op0_3a (op0_3a[31:0]),
+ .op1_3a (op1_3a[31:0]),
+ .op2_3a (op2_3a[31:0]),
+ .spsr_3a (spsr_3a[31:0]),
+ .cpsr_3a (cpsr_3a[31:0]),
+ .cpsrup_3a (cpsrup_3a),
+ .write_reg_3a (write_reg_3a),
+ .write_num_3a (write_num_3a[3:0]),
+ .write_data_3a (write_data_3a[31:0]));
Terminal terminal(
.clk(clk),
clockno <= clockno + 1;
$display("------------------------------------------------------------------------------");
$display("%3d: FETCH: Bubble: %d, Instruction: %08x, PC: %08x", clockno, bubble_1a, insn_1a, pc_1a);
- $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: op0 %08x, op1 %08x, op2 %08x, carry %d", clockno, decode_out_op0, decode_out_op1, decode_out_op2, decode_out_carry);
- $display("%3d: EXEC: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x, Reg: %d, [%08x -> %d], Jmp: %d [%08x]", clockno, stall_cause_execute, bubble_out_execute, insn_out_execute, pc_out_execute, execute_out_write_reg, execute_out_write_data, execute_out_write_num, jmp_out_execute, jmppc_out_execute);
+ $display("%3d: ISSUE: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x", clockno, stall_0a, bubble_2a, insn_2a, pc_2a);
+ $display("%3d: DECODE: op0 %08x, op1 %08x, op2 %08x, carry %d", clockno, op0_2a, op1_2a, op2_2a, carry_2a);
+ $display("%3d: EXEC: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x, Reg: %d, [%08x -> %d], Jmp: %d [%08x]", clockno, stall_cause_execute, bubble_3a, insn_3a, pc_3a, write_reg_3a, write_data_3a, write_num_3a, jmp_out_execute, jmppc_out_execute);
$display("%3d: MEMORY: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x, Reg: %d, [%08x -> %d]", clockno, stall_cause_memory, bubble_out_memory, insn_out_memory, pc_out_memory, memory_out_write_reg, memory_out_write_data, memory_out_write_num);
$display("%3d: WRITEB: CPSR %08x, SPSR %08x, Reg: %d [%08x -> %d], Jmp: %d [%08x]", clockno, writeback_out_cpsr, writeback_out_spsr, regfile_write, regfile_write_data, regfile_write_reg, jmp_out_writeback, jmppc_out_writeback);
end
git.joshuawise.com / firearm.git / blobdiff