diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 8fdd269..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 8f52a2e..ea6eaf9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ exec/* *.out.txt mips_cpu_harvard.vcd .DS_Store -.DS_Store inputs/.DS_Store diff --git a/inputs/slt/slt-1.txt b/inputs/slt/slt-1.txt index ff579ee..2d14014 100644 --- a/inputs/slt/slt-1.txt +++ b/inputs/slt/slt-1.txt @@ -1,4 +1,4 @@ 3404000F 3405000B -0085102A -00000008 \ No newline at end of file +00000008 +0085102A \ No newline at end of file diff --git a/inputs/sltu/sltu-1.txt b/inputs/sltu/sltu-1.txt index 438e8e3..3c29220 100644 --- a/inputs/sltu/sltu-1.txt +++ b/inputs/sltu/sltu-1.txt @@ -1,4 +1,4 @@ 3404000a 34050009 -0085102b -00000008 \ No newline at end of file +00000008 +0085102b \ No newline at end of file diff --git a/inputs/xor/xor-1.txt b/inputs/xor/xor-1.txt index 46f4ec9..2cdcac2 100644 --- a/inputs/xor/xor-1.txt +++ b/inputs/xor/xor-1.txt @@ -1,4 +1,4 @@ 34040005 34050002 -00851026 -00000008 \ No newline at end of file +00000008 +00851026 \ No newline at end of file diff --git a/test/test_mips_cpu_harvard.sh b/test/test_mips_cpu_harvard.sh index cddad0a..19cb6b7 100755 --- a/test/test_mips_cpu_harvard.sh +++ b/test/test_mips_cpu_harvard.sh @@ -1,13 +1,13 @@ #!/bin/bash SRC_DIR=${1?Error: no source directory given in argument}; -SRC=$(ls ${SRC_DIR} | grep -E "harvard|memory|alu|regfile|pc|control"); +SRC=$(find ./${SRC_DIR}/*); SRC_TEMP=""; for src in ${SRC} do - SRC_TEMP+=${SRC_DIR}/${src}" "; + SRC_TEMP+=${src}" "; done -SRC=${SRC_TEMP} +SRC=${SRC_TEMP}; INSTR=${2:-"No instruction specified: running all testcases"}; diff --git a/testbench/mips_cpu_harvard_tb.v b/testbench/mips_cpu_harvard_tb.v index 34a5111..624f9c5 100644 --- a/testbench/mips_cpu_harvard_tb.v +++ b/testbench/mips_cpu_harvard_tb.v @@ -49,15 +49,8 @@ module mips_cpu_harvard_tb; end initial begin - $display("Initial Reset 0"); - reset <= 0; - - - $display("Initial Reset 1"); - @(posedge clk); - reset <= 1; - $display("Initial Reset 0: Start Program"); + reset <= 1; @(posedge clk); reset <= 0;