diff --git a/design/project/project/target/config-classes/$11a24688b8328723cd4a.class b/design/project/project/target/config-classes/$11a24688b8328723cd4a.class deleted file mode 100644 index e7de5a66..00000000 Binary files a/design/project/project/target/config-classes/$11a24688b8328723cd4a.class and /dev/null differ diff --git a/design/project/project/target/config-classes/$11a24688b8328723cd4a$.class b/design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed$.class similarity index 84% rename from design/project/project/target/config-classes/$11a24688b8328723cd4a$.class rename to design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed$.class index 21314f4d..0b955694 100644 Binary files a/design/project/project/target/config-classes/$11a24688b8328723cd4a$.class and b/design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed$.class differ diff --git a/design/project/project/target/config-classes/$11a24688b8328723cd4a.cache b/design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed.cache similarity index 100% rename from design/project/project/target/config-classes/$11a24688b8328723cd4a.cache rename to design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed.cache diff --git a/design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed.class b/design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed.class new file mode 100644 index 00000000..9d5113af Binary files /dev/null and b/design/project/project/target/config-classes/$8ef94e2e53e0940cf4ed.class differ diff --git a/design/project/target/config-classes/$04b0ea8a85f2d3c5b201.class b/design/project/target/config-classes/$04b0ea8a85f2d3c5b201.class deleted file mode 100644 index 882fa41e..00000000 Binary files a/design/project/target/config-classes/$04b0ea8a85f2d3c5b201.class and /dev/null differ diff --git a/design/project/target/config-classes/$0852019624a9baefe513.class b/design/project/target/config-classes/$0852019624a9baefe513.class deleted file mode 100644 index 086c9e8a..00000000 Binary files a/design/project/target/config-classes/$0852019624a9baefe513.class and /dev/null differ diff --git a/design/project/target/config-classes/$0a951d39e75735de8e65.class b/design/project/target/config-classes/$0a951d39e75735de8e65.class deleted file mode 100644 index b3354fba..00000000 Binary files a/design/project/target/config-classes/$0a951d39e75735de8e65.class and /dev/null differ diff --git a/design/project/target/config-classes/$62b2b6adc434dee94f5a$.class b/design/project/target/config-classes/$1079b598c034169f0fb2$.class similarity index 68% rename from design/project/target/config-classes/$62b2b6adc434dee94f5a$.class rename to design/project/target/config-classes/$1079b598c034169f0fb2$.class index 77cbf1b8..d528c055 100644 Binary files a/design/project/target/config-classes/$62b2b6adc434dee94f5a$.class and b/design/project/target/config-classes/$1079b598c034169f0fb2$.class differ diff --git a/design/project/target/config-classes/$04b0ea8a85f2d3c5b201.cache b/design/project/target/config-classes/$1079b598c034169f0fb2.cache similarity index 100% rename from design/project/target/config-classes/$04b0ea8a85f2d3c5b201.cache rename to design/project/target/config-classes/$1079b598c034169f0fb2.cache diff --git a/design/project/target/config-classes/$1079b598c034169f0fb2.class b/design/project/target/config-classes/$1079b598c034169f0fb2.class new file mode 100644 index 00000000..165ee780 Binary files /dev/null and b/design/project/target/config-classes/$1079b598c034169f0fb2.class differ diff --git a/design/project/target/config-classes/$196903bbd62aff04c011$.class b/design/project/target/config-classes/$10e71b8fba83eda9d450$.class similarity index 83% rename from design/project/target/config-classes/$196903bbd62aff04c011$.class rename to design/project/target/config-classes/$10e71b8fba83eda9d450$.class index 9d01afe7..4520030b 100644 Binary files a/design/project/target/config-classes/$196903bbd62aff04c011$.class and b/design/project/target/config-classes/$10e71b8fba83eda9d450$.class differ diff --git a/design/project/target/config-classes/$0852019624a9baefe513.cache b/design/project/target/config-classes/$10e71b8fba83eda9d450.cache similarity index 100% rename from design/project/target/config-classes/$0852019624a9baefe513.cache rename to design/project/target/config-classes/$10e71b8fba83eda9d450.cache diff --git a/design/project/target/config-classes/$10e71b8fba83eda9d450.class b/design/project/target/config-classes/$10e71b8fba83eda9d450.class new file mode 100644 index 00000000..18403a8d Binary files /dev/null and b/design/project/target/config-classes/$10e71b8fba83eda9d450.class differ diff --git a/design/project/target/config-classes/$196903bbd62aff04c011.class b/design/project/target/config-classes/$196903bbd62aff04c011.class deleted file mode 100644 index 25c06c1f..00000000 Binary files a/design/project/target/config-classes/$196903bbd62aff04c011.class and /dev/null differ diff --git a/design/project/target/config-classes/$306d8bedb9f082dd0f38.class b/design/project/target/config-classes/$306d8bedb9f082dd0f38.class deleted file mode 100644 index 907d8755..00000000 Binary files a/design/project/target/config-classes/$306d8bedb9f082dd0f38.class and /dev/null differ diff --git a/design/project/target/config-classes/$04b0ea8a85f2d3c5b201$.class b/design/project/target/config-classes/$548fecca897cc60ba15b$.class similarity index 87% rename from design/project/target/config-classes/$04b0ea8a85f2d3c5b201$.class rename to design/project/target/config-classes/$548fecca897cc60ba15b$.class index d79a0ee0..e16d616f 100644 Binary files a/design/project/target/config-classes/$04b0ea8a85f2d3c5b201$.class and b/design/project/target/config-classes/$548fecca897cc60ba15b$.class differ diff --git a/design/project/target/config-classes/$0a951d39e75735de8e65.cache b/design/project/target/config-classes/$548fecca897cc60ba15b.cache similarity index 100% rename from design/project/target/config-classes/$0a951d39e75735de8e65.cache rename to design/project/target/config-classes/$548fecca897cc60ba15b.cache diff --git a/design/project/target/config-classes/$548fecca897cc60ba15b.class b/design/project/target/config-classes/$548fecca897cc60ba15b.class new file mode 100644 index 00000000..85be18ab Binary files /dev/null and b/design/project/target/config-classes/$548fecca897cc60ba15b.class differ diff --git a/design/project/target/config-classes/$e1b3d700190c784e124b$.class b/design/project/target/config-classes/$5d1056f970ae70521795$.class similarity index 85% rename from design/project/target/config-classes/$e1b3d700190c784e124b$.class rename to design/project/target/config-classes/$5d1056f970ae70521795$.class index 35828bda..82c9e229 100644 Binary files a/design/project/target/config-classes/$e1b3d700190c784e124b$.class and b/design/project/target/config-classes/$5d1056f970ae70521795$.class differ diff --git a/design/project/target/config-classes/$196903bbd62aff04c011.cache b/design/project/target/config-classes/$5d1056f970ae70521795.cache similarity index 100% rename from design/project/target/config-classes/$196903bbd62aff04c011.cache rename to design/project/target/config-classes/$5d1056f970ae70521795.cache diff --git a/design/project/target/config-classes/$5d1056f970ae70521795.class b/design/project/target/config-classes/$5d1056f970ae70521795.class new file mode 100644 index 00000000..dcaabd60 Binary files /dev/null and b/design/project/target/config-classes/$5d1056f970ae70521795.class differ diff --git a/design/project/target/config-classes/$62b2b6adc434dee94f5a.class b/design/project/target/config-classes/$62b2b6adc434dee94f5a.class deleted file mode 100644 index 0ebe5503..00000000 Binary files a/design/project/target/config-classes/$62b2b6adc434dee94f5a.class and /dev/null differ diff --git a/design/project/target/config-classes/$6c52c7359b327f3d10d8.class b/design/project/target/config-classes/$6c52c7359b327f3d10d8.class deleted file mode 100644 index bad463d6..00000000 Binary files a/design/project/target/config-classes/$6c52c7359b327f3d10d8.class and /dev/null differ diff --git a/design/project/target/config-classes/$306d8bedb9f082dd0f38$.class b/design/project/target/config-classes/$6eaf63d00f8d8e10bc87$.class similarity index 83% rename from design/project/target/config-classes/$306d8bedb9f082dd0f38$.class rename to design/project/target/config-classes/$6eaf63d00f8d8e10bc87$.class index 7f25c2af..7c0f5ed2 100644 Binary files a/design/project/target/config-classes/$306d8bedb9f082dd0f38$.class and b/design/project/target/config-classes/$6eaf63d00f8d8e10bc87$.class differ diff --git a/design/project/target/config-classes/$306d8bedb9f082dd0f38.cache b/design/project/target/config-classes/$6eaf63d00f8d8e10bc87.cache similarity index 100% rename from design/project/target/config-classes/$306d8bedb9f082dd0f38.cache rename to design/project/target/config-classes/$6eaf63d00f8d8e10bc87.cache diff --git a/design/project/target/config-classes/$6eaf63d00f8d8e10bc87.class b/design/project/target/config-classes/$6eaf63d00f8d8e10bc87.class new file mode 100644 index 00000000..0ea3bb2c Binary files /dev/null and b/design/project/target/config-classes/$6eaf63d00f8d8e10bc87.class differ diff --git a/design/project/target/config-classes/$6c52c7359b327f3d10d8$.class b/design/project/target/config-classes/$9d020d76fb098e921b72$.class similarity index 85% rename from design/project/target/config-classes/$6c52c7359b327f3d10d8$.class rename to design/project/target/config-classes/$9d020d76fb098e921b72$.class index 86c69605..e0386bb1 100644 Binary files a/design/project/target/config-classes/$6c52c7359b327f3d10d8$.class and b/design/project/target/config-classes/$9d020d76fb098e921b72$.class differ diff --git a/design/project/target/config-classes/$62b2b6adc434dee94f5a.cache b/design/project/target/config-classes/$9d020d76fb098e921b72.cache similarity index 100% rename from design/project/target/config-classes/$62b2b6adc434dee94f5a.cache rename to design/project/target/config-classes/$9d020d76fb098e921b72.cache diff --git a/design/project/target/config-classes/$9d020d76fb098e921b72.class b/design/project/target/config-classes/$9d020d76fb098e921b72.class new file mode 100644 index 00000000..b810f175 Binary files /dev/null and b/design/project/target/config-classes/$9d020d76fb098e921b72.class differ diff --git a/design/project/target/config-classes/$23bedd6bbac4e1c6419d$.class b/design/project/target/config-classes/$b433d2d5b77242c44994$.class similarity index 94% rename from design/project/target/config-classes/$23bedd6bbac4e1c6419d$.class rename to design/project/target/config-classes/$b433d2d5b77242c44994$.class index 12ccb7fd..e3194d14 100644 Binary files a/design/project/target/config-classes/$23bedd6bbac4e1c6419d$.class and b/design/project/target/config-classes/$b433d2d5b77242c44994$.class differ diff --git a/design/project/target/config-classes/$23bedd6bbac4e1c6419d.cache b/design/project/target/config-classes/$b433d2d5b77242c44994.cache similarity index 100% rename from design/project/target/config-classes/$23bedd6bbac4e1c6419d.cache rename to design/project/target/config-classes/$b433d2d5b77242c44994.cache diff --git a/design/project/target/config-classes/$23bedd6bbac4e1c6419d.class b/design/project/target/config-classes/$b433d2d5b77242c44994.class similarity index 73% rename from design/project/target/config-classes/$23bedd6bbac4e1c6419d.class rename to design/project/target/config-classes/$b433d2d5b77242c44994.class index a06c83ca..42ea7119 100644 Binary files a/design/project/target/config-classes/$23bedd6bbac4e1c6419d.class and b/design/project/target/config-classes/$b433d2d5b77242c44994.class differ diff --git a/design/project/target/config-classes/$0a951d39e75735de8e65$.class b/design/project/target/config-classes/$d04b7aee140c70413daa$.class similarity index 91% rename from design/project/target/config-classes/$0a951d39e75735de8e65$.class rename to design/project/target/config-classes/$d04b7aee140c70413daa$.class index 37130e9f..aa2f7ad7 100644 Binary files a/design/project/target/config-classes/$0a951d39e75735de8e65$.class and b/design/project/target/config-classes/$d04b7aee140c70413daa$.class differ diff --git a/design/project/target/config-classes/$6c52c7359b327f3d10d8.cache b/design/project/target/config-classes/$d04b7aee140c70413daa.cache similarity index 100% rename from design/project/target/config-classes/$6c52c7359b327f3d10d8.cache rename to design/project/target/config-classes/$d04b7aee140c70413daa.cache diff --git a/design/project/target/config-classes/$d04b7aee140c70413daa.class b/design/project/target/config-classes/$d04b7aee140c70413daa.class new file mode 100644 index 00000000..78c5d617 Binary files /dev/null and b/design/project/target/config-classes/$d04b7aee140c70413daa.class differ diff --git a/design/project/target/config-classes/$db0ff82aa16445f1f5f0.class b/design/project/target/config-classes/$db0ff82aa16445f1f5f0.class deleted file mode 100644 index 5571d005..00000000 Binary files a/design/project/target/config-classes/$db0ff82aa16445f1f5f0.class and /dev/null differ diff --git a/design/project/target/config-classes/$e1b3d700190c784e124b.class b/design/project/target/config-classes/$e1b3d700190c784e124b.class deleted file mode 100644 index de0cb0ad..00000000 Binary files a/design/project/target/config-classes/$e1b3d700190c784e124b.class and /dev/null differ diff --git a/design/project/target/config-classes/$db0ff82aa16445f1f5f0$.class b/design/project/target/config-classes/$ec8120051ea3b3088272$.class similarity index 83% rename from design/project/target/config-classes/$db0ff82aa16445f1f5f0$.class rename to design/project/target/config-classes/$ec8120051ea3b3088272$.class index 7d346984..26702137 100644 Binary files a/design/project/target/config-classes/$db0ff82aa16445f1f5f0$.class and b/design/project/target/config-classes/$ec8120051ea3b3088272$.class differ diff --git a/design/project/target/config-classes/$db0ff82aa16445f1f5f0.cache b/design/project/target/config-classes/$ec8120051ea3b3088272.cache similarity index 100% rename from design/project/target/config-classes/$db0ff82aa16445f1f5f0.cache rename to design/project/target/config-classes/$ec8120051ea3b3088272.cache diff --git a/design/project/target/config-classes/$ec8120051ea3b3088272.class b/design/project/target/config-classes/$ec8120051ea3b3088272.class new file mode 100644 index 00000000..5d471f41 Binary files /dev/null and b/design/project/target/config-classes/$ec8120051ea3b3088272.class differ diff --git a/design/project/target/config-classes/$0852019624a9baefe513$.class b/design/project/target/config-classes/$ecdc0a2105f33773a1bf$.class similarity index 88% rename from design/project/target/config-classes/$0852019624a9baefe513$.class rename to design/project/target/config-classes/$ecdc0a2105f33773a1bf$.class index 4f4a083e..971fcab5 100644 Binary files a/design/project/target/config-classes/$0852019624a9baefe513$.class and b/design/project/target/config-classes/$ecdc0a2105f33773a1bf$.class differ diff --git a/design/project/target/config-classes/$e1b3d700190c784e124b.cache b/design/project/target/config-classes/$ecdc0a2105f33773a1bf.cache similarity index 100% rename from design/project/target/config-classes/$e1b3d700190c784e124b.cache rename to design/project/target/config-classes/$ecdc0a2105f33773a1bf.cache diff --git a/design/project/target/config-classes/$ecdc0a2105f33773a1bf.class b/design/project/target/config-classes/$ecdc0a2105f33773a1bf.class new file mode 100644 index 00000000..b4187129 Binary files /dev/null and b/design/project/target/config-classes/$ecdc0a2105f33773a1bf.class differ diff --git a/design/project/target/config-classes/$f8acbb999b9697e8aaa5.class b/design/project/target/config-classes/$f8acbb999b9697e8aaa5.class deleted file mode 100644 index bf07a427..00000000 Binary files a/design/project/target/config-classes/$f8acbb999b9697e8aaa5.class and /dev/null differ diff --git a/design/project/target/config-classes/$f8acbb999b9697e8aaa5$.class b/design/project/target/config-classes/$fd41a1331dab09ba5369$.class similarity index 85% rename from design/project/target/config-classes/$f8acbb999b9697e8aaa5$.class rename to design/project/target/config-classes/$fd41a1331dab09ba5369$.class index 49a395a3..53bf5efd 100644 Binary files a/design/project/target/config-classes/$f8acbb999b9697e8aaa5$.class and b/design/project/target/config-classes/$fd41a1331dab09ba5369$.class differ diff --git a/design/project/target/config-classes/$f8acbb999b9697e8aaa5.cache b/design/project/target/config-classes/$fd41a1331dab09ba5369.cache similarity index 100% rename from design/project/target/config-classes/$f8acbb999b9697e8aaa5.cache rename to design/project/target/config-classes/$fd41a1331dab09ba5369.cache diff --git a/design/project/target/config-classes/$fd41a1331dab09ba5369.class b/design/project/target/config-classes/$fd41a1331dab09ba5369.class new file mode 100644 index 00000000..e3659dfa Binary files /dev/null and b/design/project/target/config-classes/$fd41a1331dab09ba5369.class differ diff --git a/design/project/target/streams/compile/_global/_global/compileOutputs/previous b/design/project/target/streams/compile/_global/_global/compileOutputs/previous index b347b117..ca66e732 100644 --- a/design/project/target/streams/compile/_global/_global/compileOutputs/previous +++ b/design/project/target/streams/compile/_global/_global/compileOutputs/previous @@ -1 +1 @@ -["sbt.Task[scala.collection.Seq[java.nio.file.Path]]",["/home/users/scratch/komal.javed.data/Quasar/quasar2/design/project/target/streams/compile/compileOutputs/_global/streams/inc_compile_2.12.zip"]] \ No newline at end of file +["sbt.Task[scala.collection.Seq[java.nio.file.Path]]",["/home/users/scratch/komal.javed.data/Quasar/k_se_quasar/design/project/target/streams/compile/compileOutputs/_global/streams/inc_compile_2.12.zip"]] \ No newline at end of file diff --git a/design/project/target/streams/compile/compileIncremental/_global/streams/out b/design/project/target/streams/compile/compileIncremental/_global/streams/out index 6db8e09d..a24bed6f 100644 --- a/design/project/target/streams/compile/compileIncremental/_global/streams/out +++ b/design/project/target/streams/compile/compileIncremental/_global/streams/out @@ -1 +1 @@ -[debug] Full compilation, no sources in previous analysis. +[debug] Full compilation, no sources in previous analysis. diff --git a/design/project/target/streams/compile/copyResources/_global/streams/out b/design/project/target/streams/compile/copyResources/_global/streams/out index f25042f2..49995276 100644 --- a/design/project/target/streams/compile/copyResources/_global/streams/out +++ b/design/project/target/streams/compile/copyResources/_global/streams/out @@ -1,2 +1,2 @@ -[debug] Copy resource mappings:  -[debug]   +[debug] Copy resource mappings: +[debug] diff --git a/design/project/target/streams/compile/exportedProducts/_global/streams/export b/design/project/target/streams/compile/exportedProducts/_global/streams/export index bace10da..a78b8f94 100644 --- a/design/project/target/streams/compile/exportedProducts/_global/streams/export +++ b/design/project/target/streams/compile/exportedProducts/_global/streams/export @@ -1 +1 @@ -/home/users/scratch/komal.javed.data/Quasar/quasar2/design/project/target/scala-2.12/sbt-1.0/classes +/home/users/scratch/komal.javed.data/Quasar/k_se_quasar/design/project/target/scala-2.12/sbt-1.0/classes diff --git a/design/project/target/streams/runtime/dependencyClasspath/_global/streams/export b/design/project/target/streams/runtime/dependencyClasspath/_global/streams/export index bace10da..a78b8f94 100644 --- a/design/project/target/streams/runtime/dependencyClasspath/_global/streams/export +++ b/design/project/target/streams/runtime/dependencyClasspath/_global/streams/export @@ -1 +1 @@ -/home/users/scratch/komal.javed.data/Quasar/quasar2/design/project/target/scala-2.12/sbt-1.0/classes +/home/users/scratch/komal.javed.data/Quasar/k_se_quasar/design/project/target/scala-2.12/sbt-1.0/classes diff --git a/design/project/target/streams/runtime/exportedProducts/_global/streams/export b/design/project/target/streams/runtime/exportedProducts/_global/streams/export index bace10da..a78b8f94 100644 --- a/design/project/target/streams/runtime/exportedProducts/_global/streams/export +++ b/design/project/target/streams/runtime/exportedProducts/_global/streams/export @@ -1 +1 @@ -/home/users/scratch/komal.javed.data/Quasar/quasar2/design/project/target/scala-2.12/sbt-1.0/classes +/home/users/scratch/komal.javed.data/Quasar/k_se_quasar/design/project/target/scala-2.12/sbt-1.0/classes diff --git a/design/project/target/streams/runtime/fullClasspath/_global/streams/export b/design/project/target/streams/runtime/fullClasspath/_global/streams/export index bace10da..a78b8f94 100644 --- a/design/project/target/streams/runtime/fullClasspath/_global/streams/export +++ b/design/project/target/streams/runtime/fullClasspath/_global/streams/export @@ -1 +1 @@ -/home/users/scratch/komal.javed.data/Quasar/quasar2/design/project/target/scala-2.12/sbt-1.0/classes +/home/users/scratch/komal.javed.data/Quasar/k_se_quasar/design/project/target/scala-2.12/sbt-1.0/classes diff --git a/design/project/target/streams/runtime/internalDependencyClasspath/_global/streams/export b/design/project/target/streams/runtime/internalDependencyClasspath/_global/streams/export index bace10da..a78b8f94 100644 --- a/design/project/target/streams/runtime/internalDependencyClasspath/_global/streams/export +++ b/design/project/target/streams/runtime/internalDependencyClasspath/_global/streams/export @@ -1 +1 @@ -/home/users/scratch/komal.javed.data/Quasar/quasar2/design/project/target/scala-2.12/sbt-1.0/classes +/home/users/scratch/komal.javed.data/Quasar/k_se_quasar/design/project/target/scala-2.12/sbt-1.0/classes diff --git a/design/target/scala-2.12/quasar_2.12-3.3.0.jar b/design/target/scala-2.12/quasar_2.12-3.3.0.jar index 1d1ada0f..6c429ae3 100644 Binary files a/design/target/scala-2.12/quasar_2.12-3.3.0.jar and b/design/target/scala-2.12/quasar_2.12-3.3.0.jar differ diff --git a/tools/Makefile b/tools/Makefile index 918f91f0..0d22fd8d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -55,22 +55,24 @@ endif HEX_DIR = ${TBDIR}/hex -# provide specific link file -ifeq (,$(wildcard $(TEST_DIR)/$(TEST).ld)) - LINK = $(BUILD_DIR)/link.ld -else - LINK = $(TEST_DIR)/$(TEST).ld -endif - OFILES = $(TEST).o OFILES_PATH = ${RV_ROOT}/verif/sim ifdef debug DEBUG_PLUS = +dumpon + IRUN_DEBUG = -access +rc + IRUN_DEBUG_RUN = -input ${RV_ROOT}/testbench/input.tcl VCS_DEBUG = -debug_access VERILATOR_DEBUG = --trace endif +# provide specific link file +ifeq (,$(wildcard $(TEST_DIR)/$(TEST).ld)) + LINK = $(BUILD_DIR)/link.ld +else + LINK = $(TEST_DIR)/$(TEST).ld +endif + VPATH = $(TEST_DIR) $(BUILD_DIR) $(TBDIR) -include $(TEST_DIR)/$(TEST).mki @@ -122,9 +124,9 @@ vcs-build: ${TBFILES} conf ############ TEST Simulation ############################### -vcs: program.hex vcs-build +vcs: program.hex vcs-build ./simv $(DEBUG_PLUS) +vcs+lic+wait -l $(OFILES_PATH)/vcs.log - @rm -rf program.hex $(addprefix $(OFILES_PATH)/,csrc simv* vc_hdrs.h ucli.key console.log *.csv) + @rm -rf program.hex $(addprefix $(OFILES_PATH)/,csrc simv* vc_hdrs.h ucli.key console.log *.csv obj_dir) @mv csrc simv* vc_hdrs.h ucli.key console.log *.csv $(OFILES_PATH) @mv *.log ${RV_ROOT}/tracer_logs @@ -140,7 +142,7 @@ endif verilator: program.hex verilator-build ./obj_dir/Vtb_top - @rm -rf program.hex $(addprefix $(OFILES_PATH)/,csrc simv* vc_hdrs.h ucli.key console.log *.csv) + @rm -rf program.hex $(addprefix $(OFILES_PATH)/,csrc simv* vc_hdrs.h ucli.key console.log *.csv obj_dir) @mv console.log *.csv obj_dir $(OFILES_PATH) @mv *.log ${RV_ROOT}/tracer_logs @@ -155,12 +157,11 @@ ifneq (,$(wildcard $(TEST_DIR)/$(TEST).makefile)) program.hex: @echo Building $(TEST) via $(TEST_DIR)/$(TEST).makefile $(MAKE) -f $(TEST_DIR)/$(TEST).makefile -else +else program.hex: $(OFILES) $(LINK) @echo Building $(TEST) - $(GCC_PREFIX)-gcc -Wl,-m,elf32lriscv -Wl,--discard-none -T$(LINK) -o $(OFILES_PATH)/$(TEST).exe \ - $(addprefix $(OFILES_PATH)/,$(OFILES)) \ - -nostartfiles -nostdlib $(TEST_LIBS) + cd $(OFILES_PATH) && $(GCC_PREFIX)-gcc -Wl,-m,elf32lriscv -Wl,--discard-none -T$(LINK) -o $(TEST).exe $(OFILES) \ + -nostartfiles -nostdlib $(TEST_LIBS) $(GCC_PREFIX)-objcopy -O verilog $(OFILES_PATH)/$(TEST).exe program.hex $(GCC_PREFIX)-objdump -S $(OFILES_PATH)/$(TEST).exe > $(OFILES_PATH)/$(TEST).dis @echo Completed building $(TEST)