supleed2/ELEC50010-IAC-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50010-IAC-CW.git synced 2024-11-12 18:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix {} for bit duplication, remove module name from endmodule

Browse source
This commit is contained in:
Aadi Desai 2020-12-16 13:38:09 -08:00
parent 744aee097f
commit da0c9aba01
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rtl/mips_cpu_bus.v
View file

@ -92,22 +92,22 @@ always_comb begin
partial_write = 1'b1; partial_write = 1'b1;
case (harvard_data_address[1:0]) case (harvard_data_address[1:0])
2'b00: begin 2'b00: begin
partial_writedata = {24{1'b0}, harvard_writedata[7:0]}; partial_writedata = {{24{1'b0}}, harvard_writedata[7:0]};
write_byteenable = 4'b0001; write_byteenable = 4'b0001;
write_data_address = {harvard_data_address[31:2], 2'b00}; write_data_address = {harvard_data_address[31:2], 2'b00};
end end
2'b01: begin 2'b01: begin
partial_writedata = {16{1'b0}, harvard_writedata[7:0], 8{1'b0}}; partial_writedata = {{16{1'b0}}, harvard_writedata[7:0], {8{1'b0}}};
write_byteenable = 4'b0010; write_byteenable = 4'b0010;
write_data_address = {harvard_data_address[31:2], 2'b00}; write_data_address = {harvard_data_address[31:2], 2'b00};
end end
2'b10: begin 2'b10: begin
partial_writedata = {8{1'b0}, harvard_writedata[7:0], 16{1'b0}}; partial_writedata = {{8{1'b0}}, harvard_writedata[7:0], {16{1'b0}}};
write_byteenable = 4'b0100; write_byteenable = 4'b0100;
write_data_address = {harvard_data_address[31:2], 2'b00}; write_data_address = {harvard_data_address[31:2], 2'b00};
end end
2'b11: begin 2'b11: begin
partial_writedata = {harvard_writedata[7:0], 24{1'b0}}; partial_writedata = {harvard_writedata[7:0], {24{1'b0}}};
write_byteenable = 4'b1000; write_byteenable = 4'b1000;
write_data_address = {harvard_data_address[31:2], 2'b00}; write_data_address = {harvard_data_address[31:2], 2'b00};
end end
@ -117,7 +117,7 @@ always_comb begin
partial_write = 1'b1; partial_write = 1'b1;
case (harvard_data_address[1:0]) case (harvard_data_address[1:0])
2'b00: begin 2'b00: begin
partial_writedata = {16{1'b0}, harvard_writedata[15:0]}; partial_writedata = {{16{1'b0}}, harvard_writedata[15:0]};
write_byteenable = 4'b0011; write_byteenable = 4'b0011;
write_data_address = {harvard_data_address[31:2], 2'b00}; write_data_address = {harvard_data_address[31:2], 2'b00};
end end
@ -127,7 +127,7 @@ always_comb begin
write_data_address = 32'hxxxxxxxx; write_data_address = 32'hxxxxxxxx;
end end
2'b10: begin 2'b10: begin
partial_writedata = {harvard_writedata[15:0], 16{1'b0}}; partial_writedata = {harvard_writedata[15:0], {16{1'b0}}};
write_byteenable = 4'b1100; write_byteenable = 4'b1100;
write_data_address = {harvard_data_address[31:2], 2'b00}; write_data_address = {harvard_data_address[31:2], 2'b00};
end end
@ -221,4 +221,4 @@ mips_cpu_harvard mips_cpu_harvard( // Harvard CPU within wrapper
.data_readdata(harvard_readdata) // data in from read instruction, input .data_readdata(harvard_readdata) // data in from read instruction, input
); );
endmodule : mips_cpu_bus endmodule

4
test/test_mips_cpu_bus.sh
View file

@ -47,10 +47,10 @@ else
-P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.txt\" \ -P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.txt\" \
-P mips_cpu_bus_tb.DATA_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.data.txt\" \ -P mips_cpu_bus_tb.DATA_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.data.txt\" \
-o exec/mips_cpu_bus_tb_${TESTCASE} testbench/mips_cpu_bus_tb.v \ -o exec/mips_cpu_bus_tb_${TESTCASE} testbench/mips_cpu_bus_tb.v \
${SRC} 2> /dev/null ${SRC} #2> /dev/null
./exec/mips_cpu_bus_tb_${TESTCASE} &> ./inputs/${INSTR}/${TESTCASE}.log.txt; # log file for debugging (contains $display) ./exec/mips_cpu_bus_tb_${TESTCASE} &> ./inputs/${INSTR}/${TESTCASE}.log.txt; # log file for debugging (contains $display)
echo "$(tail -1 ./inputs/${INSTR}/${TESTCASE}.log.txt)" > ./inputs/${INSTR}/${TESTCASE}.out.txt; # register v0 output to compare with reference echo "$(tail -1 ./inputs/${INSTR}/${TESTCASE}.log.txt)" > ./inputs/${INSTR}/${TESTCASE}.out.txt; # register v0 output to compare with reference
if diff -w ./inputs/${INSTR}/${TESTCASE}.out.txt ./inputs/${INSTR}/${TESTCASE}.ref.txt &> /dev/null # compare if diff -w ./inputs/${INSTR}/${TESTCASE}.out.txt ./inputs/${INSTR}/${TESTCASE}.ref.txt #&> /dev/null # compare
then then
echo ${TESTCASE} ${INSTR} "Pass"; echo ${TESTCASE} ${INSTR} "Pass";
else else