supleed2/ELEC50010-IAC-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50010-IAC-CW.git synced 2024-12-23 05:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tested all that can be tested for now

Browse source 
Mult/Div, Branch/Jump Linking, J needs implementation before testing and store to be tested when switched to bus
This commit is contained in:
jl7719 2020-12-13 14:40:16 +09:00
parent c31344c55f
commit 943745a1e0
44 changed files with 170 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inputs/div.ref.txt Normal file
View file

@ -0,0 +1 @@
3

2
inputs/j.ref.txt
View file

@ -1 +1 @@
1 7

9
inputs/j.txt
View file

@ -1,6 +1,11 @@
08000004 083F0004
00000000 00000000
00000000
00000000
00000000
00000008 00000008
00000000 00000000
34020001 34020007
00000008 00000008

2
inputs/jr.ref.txt
View file

@ -1 +1 @@
1 16

6
inputs/jr.txt
View file

@ -1,7 +1,7 @@
34050014 3C05BFC0
3C05BCF0 34A50014
00A00008 00A00008
00000000 00000000
00000008 00000008
34020001 34020010
00000008 00000008

2
inputs/lb.data.txt
View file

@ -1,4 +1,4 @@
00000000 00000000
008A0000 0000008A
00000000 00000000
00000000 00000000

4
inputs/lb.txt
View file

@ -1,3 +1,3 @@
34041003 34041000
80820003 80820005
00000008 00000008

2
inputs/lbu.data.txt
View file

@ -1,4 +1,4 @@
00000000 00000000
008A0000 0000008A
00000000 00000000
00000000 00000000

4
inputs/lbu.txt
View file

@ -1,3 +1,3 @@
34041003 34041000
90820003 90820006
00000008 00000008

2
inputs/lh.txt
View file

@ -1,3 +1,3 @@
34041003 34041000
84820004 84820004
00000008 00000008

2
inputs/lhu.txt
View file

@ -1,3 +1,3 @@
34041003 34041000
94820004 94820004
00000008 00000008

2
inputs/lui.txt
View file

@ -1,3 +1,3 @@
34045678
3C021234 3C021234
34425678
00000008 00000008

2
inputs/lwl.txt
View file

@ -1,4 +1,4 @@
34041003 34041001
34025678 34025678
88820003 88820003
00000008 00000008

2
inputs/lwr.txt
View file

@ -1,4 +1,4 @@
34041003 34041002
3C021234 3C021234
98820002 98820002
00000008 00000008

1
inputs/mfhi.ref.txt Normal file
View file

@ -0,0 +1 @@
3

1
inputs/mflo.ref.txt Normal file
View file

@ -0,0 +1 @@
12

1
inputs/mthi.ref.txt Normal file
View file

@ -0,0 +1 @@
5

1
inputs/mult.ref.txt Normal file
View file

@ -0,0 +1 @@
12

1
inputs/multu.ref.txt Normal file
View file

@ -0,0 +1 @@
12

2
inputs/ori.txt
View file

@ -1,5 +1,5 @@
34020008
00000008 00000008
34020008
00000000 00000000
00000000 00000000
00000000 00000000

10
inputs/reference/ibrahimreference.txt
View file

@ -138,15 +138,17 @@ int main(void) {
int b = -2147483647>>2; #arithemtic shift not logical - feed in 1s (sign extension) int b = -2147483647>>2; #arithemtic shift not logical - feed in 1s (sign extension)
} }
ori $4, $0, 2 ori $4, $0, 4
ori $5,$0,-2147483647 ori $5,$0,0xF000
srav $2,$5,$4 srav $2,$5,$4
SRAv $v0 $a1 $a0
jr $0 jr $0
register 0 = -536870912 (first 3 bits high - rest low) register 0 = -536870912 (first 3 bits high - rest low)
34040002 34040004
34050001 3405F000
//////// ////////
/////// ///////

55
inputs/reference/reference.txt
View file

@ -267,21 +267,21 @@ register_v0 = 0x40000000
==J Jump== ==J Jump==
J 4 J 12
NOP NOP
JR $0 JR $0
NOP NOP
ORI $2,$0,1 ORI $2,$0,1
JR $0 JR $0
08000004 0800000C
00000000 00000000
00000008 00000008
00000000 00000000
34020001 3402000A
00000008 00000008
register_v0 = 1 register_v0 = 10
==JALR Jump and link register== ==JALR Jump and link register==
@ -329,24 +329,24 @@ register_v0 = 2
==JR Jump register== ==JR Jump register==
ORI $5,$0,0x0014
LUI $5,0xBFC0 LUI $5,0xBFC0
ORI $5,$5,0x0014
JR $5 JR $5
NOP NOP
JR $0 JR $0
NOP NOP
ORI $2,$0,1 ORI $2,$0,0x10
JR $0 JR $0
34050014 3C05BFC0
3C05BCF0 34A50014
00A00008 00A00008
00000000 00000000
00000008 00000008
34020001 34020010
00000008 00000008
register_v0 = 1 register_v0 = 16
==LB Load byte== ==LB Load byte==
@ -356,8 +356,8 @@ JR $0
-Instruction Hex -Instruction Hex
34041003 34041000
80820003 80820006
00000008 00000008
-Memory Hex -Memory Hex
@ -434,12 +434,12 @@ register_v0 = 0x00008123
==LUI Load upper immediate== ==LUI Load upper immediate==
ORI $2,$0,0x5678
LUI $2,0x1234 LUI $2,0x1234
ORI $2,$2,0x5678
JR $0 JR $0
34045678
3C021234 3C021234
34425678
00000008 00000008
register_v0 = 0x12345678 register_v0 = 0x12345678
@ -467,14 +467,14 @@ register_v0 = 0x12345678
==LWL Load word left== ==LWL Load word left==
ORI $4,$0,0x1003 ORI $4,$0,0x1001
ORI $2,$0,0x5678 ORI $2,$0,0x5678
LWL $2,3($4) LWL $2,3($4)
JR $0 JR $0
-Instruction Hex -Instruction Hex
34041003 34041001
34025678 34025678
88820003 88820003
00000008 00000008
@ -490,14 +490,14 @@ register_v0 = 0x12345678
==LWR Load word right== ==LWR Load word right==
ORI $4,$0,0x1003 ORI $4,$0,0x1002
LUI $2,0x1234 LUI $2,0x1234
LWR $2,2($4) LWR $2,2($4)
JR $0 JR $0
-Instruction Hex -Instruction Hex
34041003 34041002
3C021234 3C021234
98820002 98820002
00000008 00000008
@ -559,6 +559,25 @@ register_v0 = 0x12345678
//SW Store word //SW Store word
ori $4, $0, 0xFFFF 3404FFFF
ori $5, $0, 0x1008 34051008
sw $4, 4($5) ACA40004
ori $5, $0, 0x100C 3405100C
lw $2, 0($5) 8CA20000
jr $0 00000008
ori $4, $0, 0x1234
ori $5, $0, 0x1008
sw $4, 0($5)
lw $2, 0($5)
jr $0
3404FFFF
34051008
ACA40000
8CA20000
00000008
//XOR Bitwise exclusive or //XOR Bitwise exclusive or
//XORI Bitwise exclusive or immediate //XORI Bitwise exclusive or immediate

1
inputs/sllv.ref.txt Normal file
View file

@ -0,0 +1 @@
12

4
inputs/sllv.txt
View file

@ -1,4 +1,4 @@
34040002 34040002
34050003 34050003
////// 00851004
////// 00000008

1
inputs/slt.ref.txt Normal file
View file

@ -0,0 +1 @@
1

4
inputs/slt.txt Normal file
View file

@ -0,0 +1,4 @@
3404FFFF
3405000B
0085102A
00000008

2
inputs/slti.txt
View file

@ -1,3 +1,3 @@
3404000a 3404000a
28820009
00000008 00000008
28820009

3
inputs/sltiu.txt
View file

@ -1,3 +1,4 @@
3404000a 3404000a
2c820009
00000008 00000008
2c820009

2
inputs/sra.ref.txt
View file

@ -1 +1 @@
-536870912 4294967040

4
inputs/sra.txt
View file

@ -1,3 +1,3 @@
3404000C 3404F000
00041083 00041103
00000008 00000008

1
inputs/srav.ref.txt
View file

@ -0,0 +1 @@
4294967040

8
inputs/srav.txt
View file

@ -1,4 +1,4 @@
34040002 34040004
34050001 3405F000
//////// 00851007
/////// 00000008

1
inputs/srlv.ref.txt Normal file
View file

@ -0,0 +1 @@
4

4
inputs/srlv.txt
View file

@ -1,4 +1,4 @@
34040002 34040002
34050010 34050010
////// 00851006
////// 00000008

1
inputs/sw.ref.txt Normal file
View file

@ -0,0 +1 @@
4294967295

7
inputs/sw.txt
View file

@ -1,4 +1,5 @@
34040005 3404FFFF
34050001 34051008
aca40001 ACA40000
8CA20000
00000008 00000008

4
rtl/mips_cpu_alu.v
View file

@ -123,11 +123,11 @@ assign ALUOps = ALUOp;
end end
SRA: begin SRA: begin
ALURes = B >>> shamt; ALURes = $signed(B) >>> shamt;
end end
SRAV: begin SRAV: begin
ALURes = B >>> A; ALURes = $signed(B) >>> A;
end end
EQ: begin EQ: begin

10
rtl/mips_cpu_control.v
View file

@ -99,6 +99,7 @@ always @(*) begin
CtrlPC = 2'd1; // Branches - Jumps relative to PC CtrlPC = 2'd1; // Branches - Jumps relative to PC
end else if((op==J) || (op==JAL))begin end else if((op==J) || (op==JAL))begin
CtrlPC = 2'd2; // Jumps within 256MB Region using 26-bit immediate in J type instruction CtrlPC = 2'd2; // Jumps within 256MB Region using 26-bit immediate in J type instruction
$display("Jump PC Ctrl");
end else if((op==SPECIAL)&&(funct==JR) || (funct==JALR))begin end else if((op==SPECIAL)&&(funct==JR) || (funct==JALR))begin
CtrlPC = 2'd3; // Jumps using Register. CtrlPC = 2'd3; // Jumps using Register.
//$display("Ctrl PC Jump Register"); //$display("Ctrl PC Jump Register");
@ -141,6 +142,7 @@ always @(*) begin
CtrlALUOp = 5'd23;//DIVU from ALUOps CtrlALUOp = 5'd23;//DIVU from ALUOps
end else if((op==LB) || (op==LBU) || (op==LH) || (op==LHU) || (op==LW) || (op==LWL) || (op==LWR) || (op==SB) || (op==SH) || (op==SW))begin end else if((op==LB) || (op==LBU) || (op==LH) || (op==LHU) || (op==LW) || (op==LWL) || (op==LWR) || (op==SB) || (op==SH) || (op==SW))begin
CtrlALUOp = 5'd0;//ADD from ALUOps CtrlALUOp = 5'd0;//ADD from ALUOps
$display("LB IN CONTROL");
end else if(op==LUI)begin end else if(op==LUI)begin
CtrlALUOp = 5'd7;//SLL from ALUOps CtrlALUOp = 5'd7;//SLL from ALUOps
end else if((op==SPECIAL)&&((funct==MTHI) || (funct==MTLO)))begin end else if((op==SPECIAL)&&((funct==MTHI) || (funct==MTLO)))begin
@ -156,8 +158,10 @@ always @(*) begin
$display("ALU Op = 7 (SLL)"); $display("ALU Op = 7 (SLL)");
end else if((op==SPECIAL)&&(funct==SLLV))begin end else if((op==SPECIAL)&&(funct==SLLV))begin
CtrlALUOp = 5'd8;//SLLV from ALUOps CtrlALUOp = 5'd8;//SLLV from ALUOps
$display("ALU Op = 9 (SLLV)");
end else if((op==SPECIAL)&&(funct==SRA))begin end else if((op==SPECIAL)&&(funct==SRA))begin
CtrlALUOp = 5'd11;//SRA from ALUOps CtrlALUOp = 5'd11;//SRA from ALUOps
$display("ALU Op = 11 (SRA)");
end else if((op==SPECIAL)&&(funct==SRAV))begin end else if((op==SPECIAL)&&(funct==SRAV))begin
CtrlALUOp = 5'd12;//SRAV from ALUOps CtrlALUOp = 5'd12;//SRAV from ALUOps
end else if((op==SPECIAL)&&(funct==SRL))begin end else if((op==SPECIAL)&&(funct==SRL))begin
@ -167,8 +171,10 @@ always @(*) begin
CtrlALUOp = 5'd10;//SRLV from ALUOps CtrlALUOp = 5'd10;//SRLV from ALUOps
end else if((op==SLTI) || ((op==SPECIAL)&&(funct==SLT)))begin end else if((op==SLTI) || ((op==SPECIAL)&&(funct==SLT)))begin
CtrlALUOp = 5'd20;//SLT from ALUOps CtrlALUOp = 5'd20;//SLT from ALUOps
$display("ALU Op = 20 (SLT/SLTI)");
end else if((op==SLTIU) || ((op==SPECIAL)&&(funct==SLTU)))begin end else if((op==SLTIU) || ((op==SPECIAL)&&(funct==SLTU)))begin
CtrlALUOp = 5'd21;//SLTU from ALUOps CtrlALUOp = 5'd21;//SLTU from ALUOps
$display("ALU Op = 21 (SLTU/SLTIU)");
end else if((op==SPECIAL)&&(funct==SUBU))begin end else if((op==SPECIAL)&&(funct==SUBU))begin
CtrlALUOp = 5'd1;//SUB from ALUOps CtrlALUOp = 5'd1;//SUB from ALUOps
end else if((op==XORI) || ((op==SPECIAL)&&(funct==XOR)))begin end else if((op==XORI) || ((op==SPECIAL)&&(funct==XOR)))begin
@ -193,12 +199,12 @@ always @(*) begin
//CtrlALUSrc logic //CtrlALUSrc logic
if((op==ADDIU) || (op==ANDI) || (op==LUI) || (op==ORI) || (op==SLTI) || (op==SLTIU) || (op==XORI) || (op==LB) || (op==LBU) || (op==LH) || (op==LHU) || (op==LW) || (op==LWL) || (op==LWR) || (op==SB) || (op==SH) || (op==SW))begin if((op==ADDIU) || (op==ANDI) || (op==LUI) || (op==ORI) || (op==SLTI) || (op==SLTIU) || (op==XORI) || (op==LB) || (op==LBU) || (op==LH) || (op==LHU) || (op==LW) || (op==LWL) || (op==LWR) || (op==SB) || (op==SH) || (op==SW))begin
CtrlALUSrc = 1;//ALU Bus B is fed from the 16-bit immediate sign extended to 32-bit value taken from Instr[15-0] CtrlALUSrc = 1;//ALU Bus B is fed from the 16-bit immediate sign extended to 32-bit value taken from Instr[15-0]
end else if((op==BEQ) || (op==BGTZ) || (op==BLEZ) || (op==BNE) || ((op==SPECIAL)&&((funct==ADDU) || (funct==AND) || (funct==DIV) || (funct==DIVU) || (funct==MULT) || (funct==MULTU) || (funct==OR) || (funct==SLL) || (funct==SLLV) || (funct==SLT) || (funct==SLTU) || (funct==SRAV) || (funct==SRL) || (funct==SRLV) || (funct==SUBU) || (funct==XOR))) || ((op==REGIMM)&&((rt==BGEZ) || (rt==BGEZAL) || (rt==BLTZ) || (rt==BLTZAL))))begin end else if((op==BEQ) || (op==BGTZ) || (op==BLEZ) || (op==BNE) || ((op==SPECIAL)&&((funct==ADDU) || (funct==AND) || (funct==DIV) || (funct==DIVU) || (funct==MULT) || (funct==MULTU) || (funct==OR) || (funct==SLL) || (funct==SLLV) || (funct==SLT) || (funct==SLTU) || (funct==SRA) || (funct==SRAV) || (funct==SRL) || (funct==SRLV) || (funct==SUBU) || (funct==XOR))) || ((op==REGIMM)&&((rt==BGEZ) || (rt==BGEZAL) || (rt==BLTZ) || (rt==BLTZAL))))begin
CtrlALUSrc = 0;///ALU Bus B is fed from rt. CtrlALUSrc = 0;///ALU Bus B is fed from rt.
end else begin CtrlALUSrc = 1'bx;end end else begin CtrlALUSrc = 1'bx;end
//CtrlRegWrite logic //CtrlRegWrite logic
if((op==ADDIU) || (op==ANDI) || (op==LB) || (op==LBU) || (op==LH) || (op==LHU) || (op==LUI) || (op==LW) || (op==LWL) || (op==LWR) || (op==ORI) || (op==SLTI) || (op==XORI) || ((op==SPECIAL)&&((funct==ADDU) || (funct==AND) || (funct==DIV) || (funct==DIVU) || (funct==MULT) || (funct==MULTU) || (funct==OR) || (funct==SLL) || (funct==SLLV) || (funct==SLT) || (funct==SLTU) || (funct==SRA) || (funct==SRAV) || (funct==SRL) || (funct==SRLV) || (funct==SUBU) || (funct==XOR)))) begin if((op==ADDIU) || (op==ANDI) || (op==LB) || (op==LBU) || (op==LH) || (op==LHU) || (op==LUI) || (op==LW) || (op==LWL) || (op==LWR) || (op==ORI) || (op==SLTI) || (op==XORI) || ((op==SPECIAL)&&((funct==ADDU) || (funct==AND) || (funct==DIV) || (funct==DIVU) || (funct==MULT) || (funct==MULTU) || (funct==OR) || (funct==SLL) || (funct==SLLV) || (funct==SLT) || (funct==SLTU) || (funct==SRA) || (funct==SRAV) || (funct==SRL) || (funct==SRLV) || (funct==SUBU) || (funct==XOR)))) begin
CtrlRegWrite = 1;//The Registers are Write Enabled CtrlRegWrite = 1;//The Registers are Write Enabled
end else begin CtrlRegWrite = 0;end // The Registers are Write Disabled end else begin CtrlRegWrite = 0;end // The Registers are Write Disabled
end end

14
rtl/mips_cpu_memory.v
View file

@ -15,8 +15,8 @@ module mips_cpu_memory(
); );
parameter RAM_INIT_FILE = ""; parameter RAM_INIT_FILE = "";
parameter MEM_INIT_FILE = ""; parameter MEM_INIT_FILE = "";
reg [31:0] data_memory [0:63]; reg [31:0] data_memory [0:31];
reg [31:0] instr_memory [0:63]; reg [31:0] instr_memory [0:31];
initial begin initial begin
integer i; integer i;
@ -58,11 +58,17 @@ module mips_cpu_memory(
always_ff @(posedge clk) begin always_ff @(posedge clk) begin
$display("Instruction Read: %h", instr_readdata); $display("Instruction Read: %h", instr_readdata);
//$display("RAM : INFO : data_read=%h, data_address = %h, mem=%h", data_read, data_address, memory[data_address]); //$display("RAM : INFO : data_read=%h, data_address = %h, mem=%h", data_read, data_address, memory[data_address]);
if (!data_read & data_write) begin //cannot read and write to memory in the same cycle if (data_write) begin //cannot read and write to memory in the same cycle
if (instr_address != data_address) begin //cannot modify the instruction being read if (instr_address != data_address) begin //cannot modify the instruction being read
data_memory[data_address>>2] <= data_writedata; data_memory[(data_address-32'h00001000)>>2] <= data_writedata;
$display("Store in memory");
$display(data_writedata);
end
for (integer k = 0; k<$size(data_memory); k++) begin
$display("byte +%h: %h", 32'h00001000+k*4, data_memory[k]);
end end
end end
end end
endmodule endmodule

12
rtl/mips_cpu_pc.v
View file

@ -23,6 +23,9 @@ always_ff @(posedge clk) begin
active <= 1; active <= 1;
pc_out <= 32'hBFC00000; pc_out <= 32'hBFC00000;
end else begin end else begin
if(pc_out == 32'd0) begin
active <= 0;
end
pc_out <= pc_next; pc_out <= pc_next;
case(pc_ctrl) case(pc_ctrl)
default: begin default: begin
@ -33,15 +36,18 @@ always_ff @(posedge clk) begin
end end
2'd2: begin // Jump 2'd2: begin // Jump
pc_next <= {pc_lit_next[31:28], instr[25:0], 2'b00}; pc_next <= {pc_lit_next[31:28], instr[25:0], 2'b00};
$display("Im JUMPING");
$display("pc_lit_next: %h", pc_lit_next[31:28]);
$display("instr: %b", instr[25:0]);
$display("%h",pc_next);
end end
2'd3: begin // Jump using Register 2'd3: begin // Jump using Register
pc_next <= reg_readdata; pc_next <= reg_readdata;
$display("Im JUMPING AROUND LOLOLOL");
$display("%h",reg_readdata);
end end
endcase endcase
end end
if (pc_out == 32'd0) begin
active <= 0;
end
end end
endmodule // pc endmodule // pc

6
rtl/mips_cpu_regfile.v
View file

@ -29,6 +29,7 @@ always_ff @(negedge clk) begin
if (writereg == 5'b00000) begin if (writereg == 5'b00000) begin
// skip writing if rd is $0 // skip writing if rd is $0
end else if (regwrite) begin end else if (regwrite) begin
$display("%b", opcode);
case (opcode) case (opcode)
6'b100000: begin //lb, load byte 6'b100000: begin //lb, load byte
case (readdata1[1:0]) case (readdata1[1:0])
@ -37,6 +38,8 @@ always_ff @(negedge clk) begin
2'b10: memory[writereg] <= {{24{writedata[23]}}, writedata[23:16]}; 2'b10: memory[writereg] <= {{24{writedata[23]}}, writedata[23:16]};
2'b11: memory[writereg] <= {{24{writedata[31]}}, writedata[31:24]}; 2'b11: memory[writereg] <= {{24{writedata[31]}}, writedata[31:24]};
endcase // readdata1[1:0] endcase // readdata1[1:0]
$display("writedata %h", writedata);
$display("memory writereg %h", memory[writereg]);
end end
6'b100100: begin //lbu, load byte unsigned 6'b100100: begin //lbu, load byte unsigned
case (readdata1[1:0]) case (readdata1[1:0])
@ -59,9 +62,6 @@ always_ff @(negedge clk) begin
endcase // readdata1[1:0] endcase // readdata1[1:0]
end end
6'b100010: begin //lwl, load word left 6'b100010: begin //lwl, load word left
$display("LWLWLWLWLWLWWL");
$display(readdata1[1:0]);
$display("%h",memory[writereg]);
case (readdata1[1:0]) case (readdata1[1:0])
2'b00: memory[writereg][31:24] <= writedata[7:0]; 2'b00: memory[writereg][31:24] <= writedata[7:0];
2'b01: memory[writereg][31:16] <= writedata[15:0]; 2'b01: memory[writereg][31:16] <= writedata[15:0];

53
test/test_mips_cpu_custom.sh
View file

@ -1,15 +1,15 @@
#!/bin/bash #!/bin/bash
#:'
# arithmetic # arithmetic
bash test/test_mips_cpu_harvard.sh rtl addu #Pass bash test/test_mips_cpu_harvard.sh rtl addu #Pass
bash test/test_mips_cpu_harvard.sh rtl addiu #Pass bash test/test_mips_cpu_harvard.sh rtl addiu #Pass
bash test/test_mips_cpu_harvard.sh rtl ori #Pass bash test/test_mips_cpu_harvard.sh rtl subu #Pass
bash test/test_mips_cpu_harvard.sh rtl and #Pass bash test/test_mips_cpu_harvard.sh rtl and #Pass
bash test/test_mips_cpu_harvard.sh rtl andi #Pass bash test/test_mips_cpu_harvard.sh rtl andi #Pass
bash test/test_mips_cpu_harvard.sh rtl or #Pass bash test/test_mips_cpu_harvard.sh rtl or #Pass
bash test/test_mips_cpu_harvard.sh rtl ori #Pass
bash test/test_mips_cpu_harvard.sh rtl xor #Pass bash test/test_mips_cpu_harvard.sh rtl xor #Pass
bash test/test_mips_cpu_harvard.sh rtl xori #Pass bash test/test_mips_cpu_harvard.sh rtl xori #Pass
bash test/test_mips_cpu_harvard.sh rtl subu #Pass
#bash test/test_mips_cpu_harvard.sh rtl div #bash test/test_mips_cpu_harvard.sh rtl div
#bash test/test_mips_cpu_harvard.sh rtl divu #bash test/test_mips_cpu_harvard.sh rtl divu
#bash test/test_mips_cpu_harvard.sh rtl mthi #bash test/test_mips_cpu_harvard.sh rtl mthi
@ -29,38 +29,39 @@ bash test/test_mips_cpu_harvard.sh rtl bltzal #Pass
bash test/test_mips_cpu_harvard.sh rtl bne #Pass bash test/test_mips_cpu_harvard.sh rtl bne #Pass
# jumps # jumps
#bash test/test_mips_cpu_harvard.sh rtl j #bash test/test_mips_cpu_harvard.sh rtl j #Need new testcase
#bash test/test_mips_cpu_harvard.sh rtl jalr #bash test/test_mips_cpu_harvard.sh rtl jalr #Again how to link?
#bash test/test_mips_cpu_harvard.sh rtl jal #bash test/test_mips_cpu_harvard.sh rtl jal #how to link?
#bash test/test_mips_cpu_harvard.sh rtl jr bash test/test_mips_cpu_harvard.sh rtl jr #Pass
# shift # shift
bash test/test_mips_cpu_harvard.sh rtl sll #Pass bash test/test_mips_cpu_harvard.sh rtl sll #Pass
bash test/test_mips_cpu_harvard.sh rtl srl #Pass bash test/test_mips_cpu_harvard.sh rtl srl #Pass
#bash test/test_mips_cpu_harvard.sh rtl sra bash test/test_mips_cpu_harvard.sh rtl sra #Pass
#bash test/test_mips_cpu_harvard.sh rtl srav bash test/test_mips_cpu_harvard.sh rtl srav #Pass
#bash test/test_mips_cpu_harvard.sh rtl srlv bash test/test_mips_cpu_harvard.sh rtl sllv #Pass
#' bash test/test_mips_cpu_harvard.sh rtl srlv #Pass
# load & store # load & store
bash test/test_mips_cpu_harvard.sh rtl lw #Pass bash test/test_mips_cpu_harvard.sh rtl lw #Pass
bash test/test_mips_cpu_harvard.sh rtl lb bash test/test_mips_cpu_harvard.sh rtl lb #Pass
bash test/test_mips_cpu_harvard.sh rtl lbu bash test/test_mips_cpu_harvard.sh rtl lbu #Pass
bash test/test_mips_cpu_harvard.sh rtl lh bash test/test_mips_cpu_harvard.sh rtl lh #Pass
bash test/test_mips_cpu_harvard.sh rtl lhu bash test/test_mips_cpu_harvard.sh rtl lhu #Pass
bash test/test_mips_cpu_harvard.sh rtl lui bash test/test_mips_cpu_harvard.sh rtl lui #Pass
bash test/test_mips_cpu_harvard.sh rtl lwl bash test/test_mips_cpu_harvard.sh rtl lwl #Pass
bash test/test_mips_cpu_harvard.sh rtl lwr bash test/test_mips_cpu_harvard.sh rtl lwr #Pass
#bash test/test_mips_cpu_harvard.sh rtl sw bash test/test_mips_cpu_harvard.sh rtl sw #Pass
#bash test/test_mips_cpu_harvard.sh rtl sb #bash test/test_mips_cpu_harvard.sh rtl sb #Once switched to bus
#bash test/test_mips_cpu_harvard.sh rtl sh #bash test/test_mips_cpu_harvard.sh rtl sh #Once switched to bus
# set on less than # set on less than **Branch delay slots dont work on these...
#bash test/test_mips_cpu_harvard.sh rtl slti bash test/test_mips_cpu_harvard.sh rtl slti #Pass
#bash test/test_mips_cpu_harvard.sh rtl sltiu bash test/test_mips_cpu_harvard.sh rtl sltiu #Pass
#bash test/test_mips_cpu_harvard.sh rtl slt # missing bash test/test_mips_cpu_harvard.sh rtl slt #Pass
#bash test/test_mips_cpu_harvard.sh rtl sltu #Pass bash test/test_mips_cpu_harvard.sh rtl sltu #Pass

2
test/test_mips_cpu_harvard.sh
View file

@ -53,7 +53,7 @@ iverilog -Wall -g2012 \
-P mips_cpu_harvard_tb.RAM_INIT_FILE=\"inputs/${INSTR}.txt\" \ -P mips_cpu_harvard_tb.RAM_INIT_FILE=\"inputs/${INSTR}.txt\" \
-P mips_cpu_harvard_tb.MEM_INIT_FILE=\"inputs/${INSTR}.data.txt\" \ -P mips_cpu_harvard_tb.MEM_INIT_FILE=\"inputs/${INSTR}.data.txt\" \
-o exec/mips_cpu_harvard_tb_${INSTR} testbench/mips_cpu_harvard_tb.v \ -o exec/mips_cpu_harvard_tb_${INSTR} testbench/mips_cpu_harvard_tb.v \
${SRC} 2> /dev/null ${SRC} #2> /dev/null
/mnt/c/Windows/System32/cmd.exe /C vvp ./exec/mips_cpu_harvard_tb_${INSTR} &> ./inputs/${INSTR}.log.txt; # log file for debugging (contains $display) /mnt/c/Windows/System32/cmd.exe /C vvp ./exec/mips_cpu_harvard_tb_${INSTR} &> ./inputs/${INSTR}.log.txt; # log file for debugging (contains $display)
echo "$(tail -1 ./inputs/${INSTR}.log.txt)" > ./inputs/${INSTR}.out.txt; # register v0 output to compare with reference echo "$(tail -1 ./inputs/${INSTR}.log.txt)" > ./inputs/${INSTR}.out.txt; # register v0 output to compare with reference
if diff -w ./inputs/${INSTR}.out.txt ./inputs/${INSTR}.ref.txt &> /dev/null # compare if diff -w ./inputs/${INSTR}.out.txt ./inputs/${INSTR}.ref.txt &> /dev/null # compare

6
testbench/mips_cpu_harvard_tb.v
View file

@ -69,7 +69,11 @@ module mips_cpu_harvard_tb;
//$display("Clk: %d", clk); //$display("Clk: %d", clk);
@(posedge clk); @(posedge clk);
//$display("Register v0: %d", register_v0); //$display("Register v0: %d", register_v0);
$display("Reg File Write data: %d", cpuInst.in_writedata); //$display("Reg File Write data: %d", cpuInst.in_writedata);
$display("Reg File Out Read data: %h", cpuInst.out_readdata1);
$display("Reg File opcode: %b", cpuInst.regfile.opcode);
//$display("ALU output: %h", cpuInst.out_ALURes);
//$display("ALU input B: %h", cpuInst.alu.B);
end end
@(posedge clk); @(posedge clk);
$display("TB: CPU Halt; active=0"); $display("TB: CPU Halt; active=0");