From a31d41512baf6118766600a308b3f08f88135078 Mon Sep 17 00:00:00 2001 From: jl7719 Date: Fri, 18 Dec 2020 12:42:58 +0000 Subject: [PATCH] Rename all instruction mem init files to .instr.txt --- inputs/addiu/{addiu-1.txt => addiu-1.instr.txt} | 0 inputs/addu/{addu-1.txt => addu-1.instr.txt} | 0 inputs/addu/{addu-2.txt => addu-2.instr.txt} | 0 inputs/and/{and-1.txt => and-1.instr.txt} | 0 inputs/andi/{andi-1.txt => andi-1.instr.txt} | 0 inputs/beq/{beq-1.txt => beq-1.instr.txt} | 0 inputs/bgez/{bgez-1.txt => bgez-1.instr.txt} | 0 inputs/bgezal/{bgezal-1.txt => bgezal-1.instr.txt} | 0 inputs/bgezal/{bgezal-2.txt => bgezal-2.instr.txt} | 0 inputs/bgtz/{bgtz-1.txt => bgtz-1.instr.txt} | 0 inputs/blez/{blez-1.txt => blez-1.instr.txt} | 0 inputs/bltz/{bltz-1.txt => bltz-1.instr.txt} | 0 inputs/bltzal/{bltzal-1.txt => bltzal-1.instr.txt} | 0 inputs/bne/{bne-1.txt => bne-1.instr.txt} | 0 inputs/div/{div-1.txt => div-1.instr.txt} | 0 inputs/div/{div-2.txt => div-2.instr.txt} | 0 inputs/div/{div-3.txt => div-3.instr.txt} | 0 inputs/div/{div-4.txt => div-4.instr.txt} | 0 inputs/div/{div-5.txt => div-5.instr.txt} | 0 inputs/divu/{divu-1.txt => divu-1.instr.txt} | 0 inputs/j/{j-1.txt => j-1.instr.txt} | 0 inputs/jal/{jal-1.txt => jal-1.instr.txt} | 0 inputs/jalr/{jalr-1.txt => jalr-1.instr.txt} | 0 inputs/jr/{jr-1.txt => jr-1.instr.txt} | 0 inputs/jr/{jr-2.txt => jr-2.instr.txt} | 0 inputs/jr/{jr-3.txt => jr-3.instr.txt} | 0 inputs/lb/{lb-1.txt => lb-1.instr.txt} | 0 inputs/lbu/{lbu-1.txt => lbu-1.instr.txt} | 0 inputs/lh/{lh-1.txt => lh-1.instr.txt} | 0 inputs/lhu/{lhu-1.txt => lhu-1.instr.txt} | 0 inputs/lui/{lui-1.txt => lui-1.instr.txt} | 0 inputs/lw/{lw-1.txt => lw-1.instr.txt} | 0 inputs/lwl/{lwl-1.txt => lwl-1.instr.txt} | 0 inputs/lwr/{lwr-1.txt => lwr-1.instr.txt} | 0 inputs/mthi/{mthi-1.txt => mthi-1.instr.txt} | 0 inputs/mtlo/{mtlo-1.txt => mtlo-1.instr.txt} | 0 inputs/mult/{mult-1.txt => mult-1.instr.txt} | 0 inputs/multu/{multu-1.txt => multu-1.instr.txt} | 0 inputs/or/{or-1.txt => or-1.instr.txt} | 0 inputs/ori/{ori-1.txt => ori-1.instr.txt} | 0 inputs/sb/{sb-1.txt => sb-1.instr.txt} | 0 inputs/sh/{sh-1.txt => sh-1.instr.txt} | 0 inputs/sh/{sh-2.txt => sh-2.instr.txt} | 0 inputs/sll/{sll-1.txt => sll-1.instr.txt} | 0 inputs/sllv/{sllv-1.txt => sllv-1.instr.txt} | 0 inputs/slt/{slt-1.txt => slt-1.instr.txt} | 0 inputs/slti/{slti-1.txt => slti-1.instr.txt} | 0 inputs/sltiu/{sltiu-1.txt => sltiu-1.instr.txt} | 0 inputs/sltu/{sltu-1.txt => sltu-1.instr.txt} | 0 inputs/sra/{sra-1.txt => sra-1.instr.txt} | 0 inputs/srav/{srav-1.txt => srav-1.instr.txt} | 0 inputs/srl/{srl-1.txt => srl-1.instr.txt} | 0 inputs/srlv/{srlv-1.txt => srlv-1.instr.txt} | 0 inputs/subu/{subu-1.txt => subu-1.instr.txt} | 0 inputs/sw/{sw-1.txt => sw-1.instr.txt} | 0 inputs/sw/{sw-2.txt => sw-2.instr.txt} | 0 inputs/xor/{xor-1.txt => xor-1.instr.txt} | 0 inputs/xor/{xor-2.txt => xor-2.instr.txt} | 0 inputs/xori/{xori-1.txt => xori-1.instr.txt} | 0 inputs/xori/{xori-2.txt => xori-2.instr.txt} | 0 test/test_mips_cpu_bus.sh | 6 +++--- test/test_mips_cpu_harvard.sh | 4 ++-- 62 files changed, 5 insertions(+), 5 deletions(-) rename inputs/addiu/{addiu-1.txt => addiu-1.instr.txt} (100%) rename inputs/addu/{addu-1.txt => addu-1.instr.txt} (100%) rename inputs/addu/{addu-2.txt => addu-2.instr.txt} (100%) rename inputs/and/{and-1.txt => and-1.instr.txt} (100%) rename inputs/andi/{andi-1.txt => andi-1.instr.txt} (100%) rename inputs/beq/{beq-1.txt => beq-1.instr.txt} (100%) rename inputs/bgez/{bgez-1.txt => bgez-1.instr.txt} (100%) rename inputs/bgezal/{bgezal-1.txt => bgezal-1.instr.txt} (100%) rename inputs/bgezal/{bgezal-2.txt => bgezal-2.instr.txt} (100%) rename inputs/bgtz/{bgtz-1.txt => bgtz-1.instr.txt} (100%) rename inputs/blez/{blez-1.txt => blez-1.instr.txt} (100%) rename inputs/bltz/{bltz-1.txt => bltz-1.instr.txt} (100%) rename inputs/bltzal/{bltzal-1.txt => bltzal-1.instr.txt} (100%) rename inputs/bne/{bne-1.txt => bne-1.instr.txt} (100%) rename inputs/div/{div-1.txt => div-1.instr.txt} (100%) rename inputs/div/{div-2.txt => div-2.instr.txt} (100%) rename inputs/div/{div-3.txt => div-3.instr.txt} (100%) rename inputs/div/{div-4.txt => div-4.instr.txt} (100%) rename inputs/div/{div-5.txt => div-5.instr.txt} (100%) rename inputs/divu/{divu-1.txt => divu-1.instr.txt} (100%) rename inputs/j/{j-1.txt => j-1.instr.txt} (100%) rename inputs/jal/{jal-1.txt => jal-1.instr.txt} (100%) rename inputs/jalr/{jalr-1.txt => jalr-1.instr.txt} (100%) rename inputs/jr/{jr-1.txt => jr-1.instr.txt} (100%) rename inputs/jr/{jr-2.txt => jr-2.instr.txt} (100%) rename inputs/jr/{jr-3.txt => jr-3.instr.txt} (100%) rename inputs/lb/{lb-1.txt => lb-1.instr.txt} (100%) rename inputs/lbu/{lbu-1.txt => lbu-1.instr.txt} (100%) rename inputs/lh/{lh-1.txt => lh-1.instr.txt} (100%) rename inputs/lhu/{lhu-1.txt => lhu-1.instr.txt} (100%) rename inputs/lui/{lui-1.txt => lui-1.instr.txt} (100%) rename inputs/lw/{lw-1.txt => lw-1.instr.txt} (100%) rename inputs/lwl/{lwl-1.txt => lwl-1.instr.txt} (100%) rename inputs/lwr/{lwr-1.txt => lwr-1.instr.txt} (100%) rename inputs/mthi/{mthi-1.txt => mthi-1.instr.txt} (100%) rename inputs/mtlo/{mtlo-1.txt => mtlo-1.instr.txt} (100%) rename inputs/mult/{mult-1.txt => mult-1.instr.txt} (100%) rename inputs/multu/{multu-1.txt => multu-1.instr.txt} (100%) rename inputs/or/{or-1.txt => or-1.instr.txt} (100%) rename inputs/ori/{ori-1.txt => ori-1.instr.txt} (100%) rename inputs/sb/{sb-1.txt => sb-1.instr.txt} (100%) rename inputs/sh/{sh-1.txt => sh-1.instr.txt} (100%) rename inputs/sh/{sh-2.txt => sh-2.instr.txt} (100%) rename inputs/sll/{sll-1.txt => sll-1.instr.txt} (100%) rename inputs/sllv/{sllv-1.txt => sllv-1.instr.txt} (100%) rename inputs/slt/{slt-1.txt => slt-1.instr.txt} (100%) rename inputs/slti/{slti-1.txt => slti-1.instr.txt} (100%) rename inputs/sltiu/{sltiu-1.txt => sltiu-1.instr.txt} (100%) rename inputs/sltu/{sltu-1.txt => sltu-1.instr.txt} (100%) rename inputs/sra/{sra-1.txt => sra-1.instr.txt} (100%) rename inputs/srav/{srav-1.txt => srav-1.instr.txt} (100%) rename inputs/srl/{srl-1.txt => srl-1.instr.txt} (100%) rename inputs/srlv/{srlv-1.txt => srlv-1.instr.txt} (100%) rename inputs/subu/{subu-1.txt => subu-1.instr.txt} (100%) rename inputs/sw/{sw-1.txt => sw-1.instr.txt} (100%) rename inputs/sw/{sw-2.txt => sw-2.instr.txt} (100%) rename inputs/xor/{xor-1.txt => xor-1.instr.txt} (100%) rename inputs/xor/{xor-2.txt => xor-2.instr.txt} (100%) rename inputs/xori/{xori-1.txt => xori-1.instr.txt} (100%) rename inputs/xori/{xori-2.txt => xori-2.instr.txt} (100%) diff --git a/inputs/addiu/addiu-1.txt b/inputs/addiu/addiu-1.instr.txt similarity index 100% rename from inputs/addiu/addiu-1.txt rename to inputs/addiu/addiu-1.instr.txt diff --git a/inputs/addu/addu-1.txt b/inputs/addu/addu-1.instr.txt similarity index 100% rename from inputs/addu/addu-1.txt rename to inputs/addu/addu-1.instr.txt diff --git a/inputs/addu/addu-2.txt b/inputs/addu/addu-2.instr.txt similarity index 100% rename from inputs/addu/addu-2.txt rename to inputs/addu/addu-2.instr.txt diff --git a/inputs/and/and-1.txt b/inputs/and/and-1.instr.txt similarity index 100% rename from inputs/and/and-1.txt rename to inputs/and/and-1.instr.txt diff --git a/inputs/andi/andi-1.txt b/inputs/andi/andi-1.instr.txt similarity index 100% rename from inputs/andi/andi-1.txt rename to inputs/andi/andi-1.instr.txt diff --git a/inputs/beq/beq-1.txt b/inputs/beq/beq-1.instr.txt similarity index 100% rename from inputs/beq/beq-1.txt rename to inputs/beq/beq-1.instr.txt diff --git a/inputs/bgez/bgez-1.txt b/inputs/bgez/bgez-1.instr.txt similarity index 100% rename from inputs/bgez/bgez-1.txt rename to inputs/bgez/bgez-1.instr.txt diff --git a/inputs/bgezal/bgezal-1.txt b/inputs/bgezal/bgezal-1.instr.txt similarity index 100% rename from inputs/bgezal/bgezal-1.txt rename to inputs/bgezal/bgezal-1.instr.txt diff --git a/inputs/bgezal/bgezal-2.txt b/inputs/bgezal/bgezal-2.instr.txt similarity index 100% rename from inputs/bgezal/bgezal-2.txt rename to inputs/bgezal/bgezal-2.instr.txt diff --git a/inputs/bgtz/bgtz-1.txt b/inputs/bgtz/bgtz-1.instr.txt similarity index 100% rename from inputs/bgtz/bgtz-1.txt rename to inputs/bgtz/bgtz-1.instr.txt diff --git a/inputs/blez/blez-1.txt b/inputs/blez/blez-1.instr.txt similarity index 100% rename from inputs/blez/blez-1.txt rename to inputs/blez/blez-1.instr.txt diff --git a/inputs/bltz/bltz-1.txt b/inputs/bltz/bltz-1.instr.txt similarity index 100% rename from inputs/bltz/bltz-1.txt rename to inputs/bltz/bltz-1.instr.txt diff --git a/inputs/bltzal/bltzal-1.txt b/inputs/bltzal/bltzal-1.instr.txt similarity index 100% rename from inputs/bltzal/bltzal-1.txt rename to inputs/bltzal/bltzal-1.instr.txt diff --git a/inputs/bne/bne-1.txt b/inputs/bne/bne-1.instr.txt similarity index 100% rename from inputs/bne/bne-1.txt rename to inputs/bne/bne-1.instr.txt diff --git a/inputs/div/div-1.txt b/inputs/div/div-1.instr.txt similarity index 100% rename from inputs/div/div-1.txt rename to inputs/div/div-1.instr.txt diff --git a/inputs/div/div-2.txt b/inputs/div/div-2.instr.txt similarity index 100% rename from inputs/div/div-2.txt rename to inputs/div/div-2.instr.txt diff --git a/inputs/div/div-3.txt b/inputs/div/div-3.instr.txt similarity index 100% rename from inputs/div/div-3.txt rename to inputs/div/div-3.instr.txt diff --git a/inputs/div/div-4.txt b/inputs/div/div-4.instr.txt similarity index 100% rename from inputs/div/div-4.txt rename to inputs/div/div-4.instr.txt diff --git a/inputs/div/div-5.txt b/inputs/div/div-5.instr.txt similarity index 100% rename from inputs/div/div-5.txt rename to inputs/div/div-5.instr.txt diff --git a/inputs/divu/divu-1.txt b/inputs/divu/divu-1.instr.txt similarity index 100% rename from inputs/divu/divu-1.txt rename to inputs/divu/divu-1.instr.txt diff --git a/inputs/j/j-1.txt b/inputs/j/j-1.instr.txt similarity index 100% rename from inputs/j/j-1.txt rename to inputs/j/j-1.instr.txt diff --git a/inputs/jal/jal-1.txt b/inputs/jal/jal-1.instr.txt similarity index 100% rename from inputs/jal/jal-1.txt rename to inputs/jal/jal-1.instr.txt diff --git a/inputs/jalr/jalr-1.txt b/inputs/jalr/jalr-1.instr.txt similarity index 100% rename from inputs/jalr/jalr-1.txt rename to inputs/jalr/jalr-1.instr.txt diff --git a/inputs/jr/jr-1.txt b/inputs/jr/jr-1.instr.txt similarity index 100% rename from inputs/jr/jr-1.txt rename to inputs/jr/jr-1.instr.txt diff --git a/inputs/jr/jr-2.txt b/inputs/jr/jr-2.instr.txt similarity index 100% rename from inputs/jr/jr-2.txt rename to inputs/jr/jr-2.instr.txt diff --git a/inputs/jr/jr-3.txt b/inputs/jr/jr-3.instr.txt similarity index 100% rename from inputs/jr/jr-3.txt rename to inputs/jr/jr-3.instr.txt diff --git a/inputs/lb/lb-1.txt b/inputs/lb/lb-1.instr.txt similarity index 100% rename from inputs/lb/lb-1.txt rename to inputs/lb/lb-1.instr.txt diff --git a/inputs/lbu/lbu-1.txt b/inputs/lbu/lbu-1.instr.txt similarity index 100% rename from inputs/lbu/lbu-1.txt rename to inputs/lbu/lbu-1.instr.txt diff --git a/inputs/lh/lh-1.txt b/inputs/lh/lh-1.instr.txt similarity index 100% rename from inputs/lh/lh-1.txt rename to inputs/lh/lh-1.instr.txt diff --git a/inputs/lhu/lhu-1.txt b/inputs/lhu/lhu-1.instr.txt similarity index 100% rename from inputs/lhu/lhu-1.txt rename to inputs/lhu/lhu-1.instr.txt diff --git a/inputs/lui/lui-1.txt b/inputs/lui/lui-1.instr.txt similarity index 100% rename from inputs/lui/lui-1.txt rename to inputs/lui/lui-1.instr.txt diff --git a/inputs/lw/lw-1.txt b/inputs/lw/lw-1.instr.txt similarity index 100% rename from inputs/lw/lw-1.txt rename to inputs/lw/lw-1.instr.txt diff --git a/inputs/lwl/lwl-1.txt b/inputs/lwl/lwl-1.instr.txt similarity index 100% rename from inputs/lwl/lwl-1.txt rename to inputs/lwl/lwl-1.instr.txt diff --git a/inputs/lwr/lwr-1.txt b/inputs/lwr/lwr-1.instr.txt similarity index 100% rename from inputs/lwr/lwr-1.txt rename to inputs/lwr/lwr-1.instr.txt diff --git a/inputs/mthi/mthi-1.txt b/inputs/mthi/mthi-1.instr.txt similarity index 100% rename from inputs/mthi/mthi-1.txt rename to inputs/mthi/mthi-1.instr.txt diff --git a/inputs/mtlo/mtlo-1.txt b/inputs/mtlo/mtlo-1.instr.txt similarity index 100% rename from inputs/mtlo/mtlo-1.txt rename to inputs/mtlo/mtlo-1.instr.txt diff --git a/inputs/mult/mult-1.txt b/inputs/mult/mult-1.instr.txt similarity index 100% rename from inputs/mult/mult-1.txt rename to inputs/mult/mult-1.instr.txt diff --git a/inputs/multu/multu-1.txt b/inputs/multu/multu-1.instr.txt similarity index 100% rename from inputs/multu/multu-1.txt rename to inputs/multu/multu-1.instr.txt diff --git a/inputs/or/or-1.txt b/inputs/or/or-1.instr.txt similarity index 100% rename from inputs/or/or-1.txt rename to inputs/or/or-1.instr.txt diff --git a/inputs/ori/ori-1.txt b/inputs/ori/ori-1.instr.txt similarity index 100% rename from inputs/ori/ori-1.txt rename to inputs/ori/ori-1.instr.txt diff --git a/inputs/sb/sb-1.txt b/inputs/sb/sb-1.instr.txt similarity index 100% rename from inputs/sb/sb-1.txt rename to inputs/sb/sb-1.instr.txt diff --git a/inputs/sh/sh-1.txt b/inputs/sh/sh-1.instr.txt similarity index 100% rename from inputs/sh/sh-1.txt rename to inputs/sh/sh-1.instr.txt diff --git a/inputs/sh/sh-2.txt b/inputs/sh/sh-2.instr.txt similarity index 100% rename from inputs/sh/sh-2.txt rename to inputs/sh/sh-2.instr.txt diff --git a/inputs/sll/sll-1.txt b/inputs/sll/sll-1.instr.txt similarity index 100% rename from inputs/sll/sll-1.txt rename to inputs/sll/sll-1.instr.txt diff --git a/inputs/sllv/sllv-1.txt b/inputs/sllv/sllv-1.instr.txt similarity index 100% rename from inputs/sllv/sllv-1.txt rename to inputs/sllv/sllv-1.instr.txt diff --git a/inputs/slt/slt-1.txt b/inputs/slt/slt-1.instr.txt similarity index 100% rename from inputs/slt/slt-1.txt rename to inputs/slt/slt-1.instr.txt diff --git a/inputs/slti/slti-1.txt b/inputs/slti/slti-1.instr.txt similarity index 100% rename from inputs/slti/slti-1.txt rename to inputs/slti/slti-1.instr.txt diff --git a/inputs/sltiu/sltiu-1.txt b/inputs/sltiu/sltiu-1.instr.txt similarity index 100% rename from inputs/sltiu/sltiu-1.txt rename to inputs/sltiu/sltiu-1.instr.txt diff --git a/inputs/sltu/sltu-1.txt b/inputs/sltu/sltu-1.instr.txt similarity index 100% rename from inputs/sltu/sltu-1.txt rename to inputs/sltu/sltu-1.instr.txt diff --git a/inputs/sra/sra-1.txt b/inputs/sra/sra-1.instr.txt similarity index 100% rename from inputs/sra/sra-1.txt rename to inputs/sra/sra-1.instr.txt diff --git a/inputs/srav/srav-1.txt b/inputs/srav/srav-1.instr.txt similarity index 100% rename from inputs/srav/srav-1.txt rename to inputs/srav/srav-1.instr.txt diff --git a/inputs/srl/srl-1.txt b/inputs/srl/srl-1.instr.txt similarity index 100% rename from inputs/srl/srl-1.txt rename to inputs/srl/srl-1.instr.txt diff --git a/inputs/srlv/srlv-1.txt b/inputs/srlv/srlv-1.instr.txt similarity index 100% rename from inputs/srlv/srlv-1.txt rename to inputs/srlv/srlv-1.instr.txt diff --git a/inputs/subu/subu-1.txt b/inputs/subu/subu-1.instr.txt similarity index 100% rename from inputs/subu/subu-1.txt rename to inputs/subu/subu-1.instr.txt diff --git a/inputs/sw/sw-1.txt b/inputs/sw/sw-1.instr.txt similarity index 100% rename from inputs/sw/sw-1.txt rename to inputs/sw/sw-1.instr.txt diff --git a/inputs/sw/sw-2.txt b/inputs/sw/sw-2.instr.txt similarity index 100% rename from inputs/sw/sw-2.txt rename to inputs/sw/sw-2.instr.txt diff --git a/inputs/xor/xor-1.txt b/inputs/xor/xor-1.instr.txt similarity index 100% rename from inputs/xor/xor-1.txt rename to inputs/xor/xor-1.instr.txt diff --git a/inputs/xor/xor-2.txt b/inputs/xor/xor-2.instr.txt similarity index 100% rename from inputs/xor/xor-2.txt rename to inputs/xor/xor-2.instr.txt diff --git a/inputs/xori/xori-1.txt b/inputs/xori/xori-1.instr.txt similarity index 100% rename from inputs/xori/xori-1.txt rename to inputs/xori/xori-1.instr.txt diff --git a/inputs/xori/xori-2.txt b/inputs/xori/xori-2.instr.txt similarity index 100% rename from inputs/xori/xori-2.txt rename to inputs/xori/xori-2.instr.txt diff --git a/test/test_mips_cpu_bus.sh b/test/test_mips_cpu_bus.sh index 9a30aa6..117b933 100755 --- a/test/test_mips_cpu_bus.sh +++ b/test/test_mips_cpu_bus.sh @@ -1,7 +1,7 @@ #!/bin/bash SRC_DIR=${1?Error: no source directory given in argument}; -SRC=$(find ./${SRC_DIR}/*); +SRC=$(find ${SRC_DIR}/*); SRC_TEMP=""; for src in ${SRC} do @@ -23,7 +23,7 @@ then TESTCASE=$([[ ${TESTCASE} =~ /([^./]+)\. ]] && echo "${BASH_REMATCH[1]}"); iverilog -Wall -g2012 \ -s mips_cpu_bus_tb \ - -P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.txt\" \ + -P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.instr.txt\" \ -P mips_cpu_bus_tb.DATA_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.data.txt\" \ -o exec/mips_cpu_bus_tb_${TESTCASE} testbench/mips_cpu_bus_tb.v testbench/mips_cpu_bus_memory.v \ ${SRC} 2> inputs/${DIR}/${TESTCASE}.stderr.txt @@ -44,7 +44,7 @@ else TESTCASE=$([[ ${TESTCASE} =~ /([^./]+)\. ]] && echo "${BASH_REMATCH[1]}"); iverilog -Wall -g2012 \ -s mips_cpu_bus_tb \ - -P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.txt\" \ + -P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.instr.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 testbench/mips_cpu_bus_memory.v \ ${SRC} 2> inputs/${INSTR}/${TESTCASE}.stderr.txt diff --git a/test/test_mips_cpu_harvard.sh b/test/test_mips_cpu_harvard.sh index e470480..980dbdf 100755 --- a/test/test_mips_cpu_harvard.sh +++ b/test/test_mips_cpu_harvard.sh @@ -23,7 +23,7 @@ then TESTCASE=$([[ ${TESTCASE} =~ /([^./]+)\. ]] && echo "${BASH_REMATCH[1]}"); iverilog -Wall -g2012 \ -s mips_cpu_harvard_tb \ - -P mips_cpu_harvard_tb.INSTR_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.txt\" \ + -P mips_cpu_harvard_tb.INSTR_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.instr.txt\" \ -P mips_cpu_harvard_tb.DATA_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.data.txt\" \ -o exec/mips_cpu_harvard_tb_${TESTCASE} testbench/mips_cpu_harvard_tb.v testbench/mips_cpu_harvard_memory.v\ ${SRC} 2> inputs/${DIR}/${TESTCASE}.stderr.txt @@ -44,7 +44,7 @@ else TESTCASE=$([[ ${TESTCASE} =~ /([^./]+)\. ]] && echo "${BASH_REMATCH[1]}"); iverilog -Wall -g2012 \ -s mips_cpu_harvard_tb \ - -P mips_cpu_harvard_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.txt\" \ + -P mips_cpu_harvard_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.instr.txt\" \ -P mips_cpu_harvard_tb.DATA_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.data.txt\" \ -o exec/mips_cpu_harvard_tb_${TESTCASE} testbench/mips_cpu_harvard_tb.v testbench/mips_cpu_harvard_memory.v\ ${SRC} 2> inputs/${INSTR}/${TESTCASE}.stderr.txt