From 33e90d106a782f0f1075b0fab8ac344503a6cadf Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Sat, 5 Mar 2016 21:40:14 -0800 Subject: Actually parse "--targetDir" I'm trying to get RocketChip to work with Chisel3 again, and we need to run in multiple directories. This fixes the workaround I made earlier to actually parse the passed command-line arguments so I can emit FIRRTL in the correct directory. --- src/main/scala/Chisel/Driver.scala | 11 +++++++++-- src/main/scala/Chisel/Main.scala | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/scala/Chisel/Driver.scala b/src/main/scala/Chisel/Driver.scala index a6f61f69..61b74dcd 100644 --- a/src/main/scala/Chisel/Driver.scala +++ b/src/main/scala/Chisel/Driver.scala @@ -114,6 +114,13 @@ object Driver extends BackendCompilationUtilities { f } - // FIXME: This is hard coded and should come in from a command-line argument - def targetDir(): String = { "vsim/generated-src" } + private var target_dir: Option[String] = None + def parseArgs(args: Array[String]): Unit = { + for (i <- 0 until args.size) { + if (args(i) == "--targetDir") + target_dir = Some(args(i+1)) + } + } + + def targetDir(): String = { target_dir.get } } diff --git a/src/main/scala/Chisel/Main.scala b/src/main/scala/Chisel/Main.scala index 750e8712..349f8b18 100644 --- a/src/main/scala/Chisel/Main.scala +++ b/src/main/scala/Chisel/Main.scala @@ -11,6 +11,7 @@ import java.io.File def run[T <: Module] (args: Array[String], gen: () => T) = { def circuit = Driver.elaborate(gen) def output_file = new File(Driver.targetDir + "/" + circuit.name + ".fir") + Driver.parseArgs(args) Driver.dumpFirrtl(circuit, Option(output_file)) } } -- cgit v1.2.3