supleed2/ELEC50010-IAC-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50010-IAC-CW.git synced 2024-11-10 01:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debugging and debugging

Browse source 
PC, Jump instr, branches
This commit is contained in:
jl7719 2020-12-16 12:29:22 +00:00
parent 0891f7e653
commit ad68ab0974
18 changed files with 49 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inputs/addiu/addiu-2.ref.txt Normal file
View file

@ -0,0 +1 @@
10

2
inputs/addiu/addiu-2.txt Normal file
View file

@ -0,0 +1,2 @@
2442000A
00000008

1
inputs/beq/beq-2.ref.txt Normal file
View file

@ -0,0 +1 @@
4

8
inputs/beq/beq-2.txt Normal file
View file

@ -0,0 +1,8 @@
34040005
34050005
10850003
34020005
00000008
00000000
2442000A
00000008

2
inputs/j/j-1.txt
View file

@ -1,4 +1,4 @@
08000004
0BF00004
00000000
00000008
00000000

2
inputs/jal/jal-1.txt
View file

@ -1,4 +1,4 @@
0C000005
0FF00005
00000000
24420001
00000008

2
inputs/jalr/jalr-1.txt
View file

@ -1,5 +1,5 @@
3C05BCF0
3405001C
34A5001C
00A02009
00000000
24420001

1
inputs/jalr/jalr-2.ref.txt Normal file
View file

@ -0,0 +1 @@
3217031184

6
inputs/jalr/jalr-2.txt Normal file
View file

@ -0,0 +1,6 @@
3C05BCF0
34A50014
00A01009
00000000
00000000
00000008

2
inputs/jr/jr-1.ref.txt
View file

@ -1 +1 @@
1
10

2
inputs/jr/jr-1.txt
View file

@ -1,5 +1,5 @@
3C05BFC0
34050014
34A50014
00A00008
00000000
00000008

1
inputs/jr/jr-2.ref.txt Normal file
View file

@ -0,0 +1 @@
5

2
inputs/jr/jr-2.txt Normal file
View file

@ -0,0 +1,2 @@
00000008
34020005

18
reference.txt
View file

@ -356,20 +356,18 @@ JR $5
NOP
JR $0
NOP
ORI $2,$0,1
ORI $2,$0,0xA
JR $0
BFC00014
0,4,8,c,10,14
3C05BFC0 0
34050014 4
00A00008 8
00000000 c
00000008 10
34020001 14
3C05BFC0
34A50014
00A00008
00000000
00000008
3402000A
00000008
register_v0 = 1
register_v0 = 10
==LB Load byte==

1
rtl/mips_cpu_alu.v
View file

@ -135,6 +135,7 @@ end
SLL: begin
ALURes = B << shamt;
$display("ALURES SLL: %h", ALURes);
end
SLLV: begin

3
rtl/mips_cpu_control.v
View file

@ -200,6 +200,7 @@ always @(*) begin
Ctrlshamt = Instr[10:6];// Shift amount piped in from the instruction
end else if(op == LUI)begin
Ctrlshamt = 5'd16;//Used specifically to implement LUI as the instruction itslef does not include shamt
$display("LUI SHIFTING");
end else begin Ctrlshamt = 5'bxxxxx;end
//CtrlMemWrite logic
@ -223,7 +224,7 @@ always @(*) begin
end else begin CtrlALUSrc = 1'bx;end
//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==MFLO) || (funct==MFHI) || (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==JAL) || (op==SLTI) || (op==XORI) || ((op==SPECIAL)&&((funct==ADDU) || (funct==AND) || (funct==MFLO) || (funct==MFHI) || (funct==OR) || (funct==SLL) || (funct==SLLV) || (funct==SLT) || (funct==SLTU) || (funct==SRA) || (funct==SRAV) || (funct==SRL) || (funct==SRLV) || (funct==SUBU) || (funct==JALR) || (funct==XOR)))) begin
CtrlRegWrite = 1;//The Registers are Write Enabled
$display("OPcode mflo: %h", op);
end else begin CtrlRegWrite = 0;end // The Registers are Write Disabled

14
rtl/mips_cpu_pc.v
View file

@ -8,11 +8,12 @@ module mips_cpu_pc(
output logic active
);
reg [31:0] pc_next, pc_lit_next;
reg [31:0] pc_next, pc_lit_next, pc_next_next;
initial begin
pc_out = 32'hBFC00000;
pc_next = pc_out + 32'd4;
end
assign pc_lit_next = pc_out + 32'd4;
@ -26,27 +27,28 @@ always_ff @(posedge clk) begin
active <= 0;
end
pc_out <= pc_next;
pc_next <= pc_next_next;
end
end
always @(*) begin
case(pc_ctrl)
2'd1: begin // Branch
pc_next = pc_out + 32'd4 + {{14{instr[15]}},instr[15:0],2'b00};
pc_next_next = pc_out + 32'd4 + {{14{instr[15]}},instr[15:0],2'b00};
end
2'd2: begin // Jump
pc_next = {pc_lit_next[31:28], instr[25:0], 2'b00};
pc_next_next = {pc_lit_next[31:28], instr[25:0], 2'b00};
$display("JUMPING");
$display("pc_lit_next: %h", pc_lit_next[31:28]);
$display("instr: %b", instr[25:0]);
$display("%h",pc_next);
end
2'd3: begin // Jump using Register
pc_next = reg_readdata;
pc_next_next = reg_readdata;
$display("REGREADEADTAATATAT %h", reg_readdata);
end
default: begin
pc_next = pc_out + 32'd4;
pc_next_next = pc_out + 32'd4;
end
endcase
end

6
test/test_mips_cpu_custom.sh
View file

@ -24,14 +24,14 @@
#./test/test_mips_cpu_harvard.sh rtl bgezal #Place return address thing how??
./test/test_mips_cpu_harvard.sh rtl bgtz #Pass
./test/test_mips_cpu_harvard.sh rtl blez #Pass
./test/test_mips_cpu_harvard.sh rtl bltz #Probably fails due to jump register thing?
./test/test_mips_cpu_harvard.sh rtl bltz #Pass
./test/test_mips_cpu_harvard.sh rtl bltzal #Pass
./test/test_mips_cpu_harvard.sh rtl bne #Pass
# jumps
#./test/test_mips_cpu_harvard.sh rtl j #Need new testcase
./test/test_mips_cpu_harvard.sh rtl j #Pass
#./test/test_mips_cpu_harvard.sh rtl jalr #Again how to link?
#./test/test_mips_cpu_harvard.sh rtl jal #how to link?
./test/test_mips_cpu_harvard.sh rtl jal #Pass
./test/test_mips_cpu_harvard.sh rtl jr #Pass
# shift