From 63abcf671a0d6f5b0eb2854613307f22ddf160d8 Mon Sep 17 00:00:00 2001 From: jl7719 Date: Mon, 14 Dec 2020 17:49:30 +0000 Subject: [PATCH] Tidy up and change bash to ./ --- inputs/addiu.data.txt | 4 -- inputs/temp.ref.txt | 1 - inputs/temp.txt | 8 --- test/test_mips_cpu_custom.sh | 96 ++++++++++++++++++------------------ 4 files changed, 48 insertions(+), 61 deletions(-) delete mode 100644 inputs/addiu.data.txt delete mode 100644 inputs/temp.ref.txt delete mode 100644 inputs/temp.txt diff --git a/inputs/addiu.data.txt b/inputs/addiu.data.txt deleted file mode 100644 index 660d13d..0000000 --- a/inputs/addiu.data.txt +++ /dev/null @@ -1,4 +0,0 @@ -12341234 -01010101 -12312312 -88888888 \ No newline at end of file diff --git a/inputs/temp.ref.txt b/inputs/temp.ref.txt deleted file mode 100644 index 301160a..0000000 --- a/inputs/temp.ref.txt +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/inputs/temp.txt b/inputs/temp.txt deleted file mode 100644 index 3cc3faa..0000000 --- a/inputs/temp.txt +++ /dev/null @@ -1,8 +0,0 @@ -00000008 -34020008 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 \ No newline at end of file diff --git a/test/test_mips_cpu_custom.sh b/test/test_mips_cpu_custom.sh index eac765d..7ec4b34 100755 --- a/test/test_mips_cpu_custom.sh +++ b/test/test_mips_cpu_custom.sh @@ -1,67 +1,67 @@ #!/bin/bash # arithmetic -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 subu #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 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 xori #Pass -#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 mthi -#bash test/test_mips_cpu_harvard.sh rtl mtlo -#bash test/test_mips_cpu_harvard.sh rtl mult -#bash test/test_mips_cpu_harvard.sh rtl multu +./test/test_mips_cpu_harvard.sh rtl addu #Pass +./test/test_mips_cpu_harvard.sh rtl addiu #Pass +./test/test_mips_cpu_harvard.sh rtl subu #Pass +./test/test_mips_cpu_harvard.sh rtl and #Pass +./test/test_mips_cpu_harvard.sh rtl andi #Pass +./test/test_mips_cpu_harvard.sh rtl or #Pass +./test/test_mips_cpu_harvard.sh rtl ori #Pass +./test/test_mips_cpu_harvard.sh rtl xor #Pass +./test/test_mips_cpu_harvard.sh rtl xori #Pass +#./test/test_mips_cpu_harvard.sh rtl div +#./test/test_mips_cpu_harvard.sh rtl divu +#./test/test_mips_cpu_harvard.sh rtl mthi +#./test/test_mips_cpu_harvard.sh rtl mtlo +#./test/test_mips_cpu_harvard.sh rtl mult +#./test/test_mips_cpu_harvard.sh rtl multu # branches -bash test/test_mips_cpu_harvard.sh rtl beq #Pass -bash test/test_mips_cpu_harvard.sh rtl bgez #Pass -#bash test/test_mips_cpu_harvard.sh rtl bgezal #Place return address thing how?? -bash test/test_mips_cpu_harvard.sh rtl bgtz #Pass -bash test/test_mips_cpu_harvard.sh rtl blez #Pass -#bash test/test_mips_cpu_harvard.sh rtl bltz #Probably fails due to jump register thing? -bash test/test_mips_cpu_harvard.sh rtl bltzal #Pass -bash test/test_mips_cpu_harvard.sh rtl bne #Pass +./test/test_mips_cpu_harvard.sh rtl beq #Pass +./test/test_mips_cpu_harvard.sh rtl bgez #Pass +#./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 bltzal #Pass +./test/test_mips_cpu_harvard.sh rtl bne #Pass # jumps -#bash test/test_mips_cpu_harvard.sh rtl j #Need new testcase -#bash test/test_mips_cpu_harvard.sh rtl jalr #Again how to link? -#bash test/test_mips_cpu_harvard.sh rtl jal #how to link? -bash test/test_mips_cpu_harvard.sh rtl jr #Pass +#./test/test_mips_cpu_harvard.sh rtl j #Need new testcase +#./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 jr #Pass # shift -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 sra #Pass -bash test/test_mips_cpu_harvard.sh rtl srav #Pass -bash test/test_mips_cpu_harvard.sh rtl sllv #Pass -bash test/test_mips_cpu_harvard.sh rtl srlv #Pass +./test/test_mips_cpu_harvard.sh rtl sll #Pass +./test/test_mips_cpu_harvard.sh rtl srl #Pass +./test/test_mips_cpu_harvard.sh rtl sra #Pass +./test/test_mips_cpu_harvard.sh rtl srav #Pass +./test/test_mips_cpu_harvard.sh rtl sllv #Pass +./test/test_mips_cpu_harvard.sh rtl srlv #Pass # load & store -bash test/test_mips_cpu_harvard.sh rtl lw #Pass -bash test/test_mips_cpu_harvard.sh rtl lb #Pass -bash test/test_mips_cpu_harvard.sh rtl lbu #Pass -bash test/test_mips_cpu_harvard.sh rtl lh #Pass -bash test/test_mips_cpu_harvard.sh rtl lhu #Pass -bash test/test_mips_cpu_harvard.sh rtl lui #Pass -bash test/test_mips_cpu_harvard.sh rtl lwl #Pass -bash test/test_mips_cpu_harvard.sh rtl lwr #Pass -bash test/test_mips_cpu_harvard.sh rtl sw #Pass -#bash test/test_mips_cpu_harvard.sh rtl sb #Once switched to bus -#bash test/test_mips_cpu_harvard.sh rtl sh #Once switched to bus +./test/test_mips_cpu_harvard.sh rtl lw #Pass +./test/test_mips_cpu_harvard.sh rtl lb #Pass +./test/test_mips_cpu_harvard.sh rtl lbu #Pass +./test/test_mips_cpu_harvard.sh rtl lh #Pass +./test/test_mips_cpu_harvard.sh rtl lhu #Pass +./test/test_mips_cpu_harvard.sh rtl lui #Pass +./test/test_mips_cpu_harvard.sh rtl lwl #Pass +./test/test_mips_cpu_harvard.sh rtl lwr #Pass +./test/test_mips_cpu_harvard.sh rtl sw #Pass +#./test/test_mips_cpu_harvard.sh rtl sb #Once switched to bus +#./test/test_mips_cpu_harvard.sh rtl sh #Once switched to bus # set on less than **Branch delay slots dont work on these... -bash test/test_mips_cpu_harvard.sh rtl slti #Pass -bash test/test_mips_cpu_harvard.sh rtl sltiu #Pass -bash test/test_mips_cpu_harvard.sh rtl slt #Pass -bash test/test_mips_cpu_harvard.sh rtl sltu #Pass +./test/test_mips_cpu_harvard.sh rtl slti #Pass +./test/test_mips_cpu_harvard.sh rtl sltiu #Pass +./test/test_mips_cpu_harvard.sh rtl slt #Pass +./test/test_mips_cpu_harvard.sh rtl sltu #Pass