add containing SoC module, pull test program memory out of CPU

1 files changed, 142 insertions, 0 deletions

diff --git a/soc.v b/soc.v
new file mode 100644
index 0000000..3624279
--- /dev/null
+++ b/soc.v
@@ -0,0 +1,142 @@
+module soc (
+	input clk,
+
+	output [15:0] debugPC,
+	output [3:0] debugAluOp,
+	output [2:0] debugAluReg1,
+	output [2:0] debugAluReg2,
+	output [1:0] debugAluOpSource1,
+	output [1:0] debugAluOpSource2,
+	output debugAluDest,
+
+	output [2:0] debugRegDest,
+	output debugRegSetH,
+	output debugRegSetL,
+
+	output [2:0] debugRegAddr,
+	output debugMemReadB,
+	output debugMemReadW,
+	output debugMemWriteB,
+	output debugMemWriteW,
+
+	output [5:0] debugSetRegCond,
+	
+	output [15:0] dbg_r0,
+	output [15:0] dbg_r1,
+	output [15:0] dbg_r2,
+	output [15:0] dbg_r3,
+	output [15:0] dbg_r4,
+	output [15:0] dbg_r5,
+	output [15:0] dbg_r6,
+	output [15:0] dbg_r7,
+	output [9:0] dbg_state,
+	
+	output dbg_setPC,
+	output [15:0] dbg_setPCValue,
+	
+	output [1:0] dbg_statusreg,
+	output dbg_needWait,
+	
+	output dbg_re_o,
+	output dbg_we_o,
+	output [15:0] dbg_addr_o,
+	output [15:0] dbg_data_io
+);
+
+	wire needWait_i;
+	wire [15:0] addr_o;
+	wire re_o, we_o;
+	wire [15:0] data_io;
+	wire [32:0] ctrl_from_decoder;
+
+	nqcpu cpu_inst (
+		.clk(clk),
+		.needWait_i(needWait_i),
+		.addr_o(addr_o),
+		.re_o(re_o),
+		.we_o(we_o),
+		.data_io(data_io),
+
+		.debugCtrl(ctrl_from_decoder),
+		.debugPC(debugPC),
+		.dbg_r0(dbg_r0),
+		.dbg_r1(dbg_r1),
+		.dbg_r2(dbg_r2),
+		.dbg_r3(dbg_r3),
+		.dbg_r4(dbg_r4),
+		.dbg_r5(dbg_r5),
+		.dbg_r6(dbg_r6),
+		.dbg_r7(dbg_r7),
+		.dbg_state(dbg_state),
+		.dbg_setPC(dbg_setPC),
+		.dbg_setPCValue(dbg_setPCValue),
+		.dbg_statusreg(dbg_statusreg),
+	);
+
+	//-- debug ROM --
+	reg read_finished;
+	reg [15:0] romData;
+
+	assign needWait_i = re_o & !read_finished;
+	assign data_io = re_o ? romData : 16'hZZZZ;
+
+	initial begin
+		read_finished = 1'b0;
+		romData = 16'h0;
+	end
+
+	always @(posedge clk) begin
+		if(re_o) begin
+			read_finished <= 1'b1;
+
+			// sample proggy:
+			case(addr_o[15:1])
+				15'h0: romData <= 16'h0BB6;
+				15'h1: romData <= 16'h0102;
+				15'h2: romData <= 16'h0326;
+				15'h3: romData <= 16'h054A;
+				15'h4: romData <= 16'h5201;
+				15'h5: romData <= 16'h540A;
+				15'h6: romData <= 16'h0AA0;
+				15'h7: romData <= 16'h0004;
+				15'h8: romData <= 16'h0809;
+				15'h9: romData <= 16'h6AFA;
+				15'hA: romData <= 16'h6E00;
+				default: romData <= 16'b1111_000000000000;		// nop
+			endcase
+		end
+		else begin
+			read_finished <= 1'b0;
+		end
+	end
+	//---------------
+
+	ctrl_decode debug_decode (
+		.control_signals(ctrl_from_decoder),
+
+		.aluOp(debugAluOp),
+		.aluReg1(debugAluReg1),
+		.aluReg2(debugAluReg2),
+		.aluOpSource1(debugAluOpSource1),
+		.aluOpSource2(debugAluOpSource2),
+		.aluDest(debugAluDest),
+
+		.regDest(debugRegDest),
+		.regSetH(debugRegSetH),
+		.regSetL(debugRegSetL),
+
+		.regAddr(debugRegAddr),
+		.memReadB(debugMemReadB),
+		.memReadW(debugMemReadW),
+		.memWriteB(debugMemWriteB),
+		.memWriteW(debugMemWriteW),
+
+		.setRegCond(debugSetRegCond)
+	);
+
+	assign dbg_needWait = needWait_i;
+	assign dbg_re_o = re_o;
+	assign dbg_we_o = we_o;
+	assign dbg_addr_o = addr_o;
+	assign dbg_data_io = data_io;
+endmodule