Merge pull request #1 from ucb-bar/packagedir

Packagedir

14 files changed, 8 insertions, 6 deletions

diff --git a/src/main/scala/Backend.scala b/src/main/scala/Chisel/Backend.scala
index 9b8bfb6d..9b8bfb6d 100644
--- a/src/main/scala/Backend.scala
+++ b/src/main/scala/Chisel/Backend.scala
diff --git a/src/main/scala/Core.scala b/src/main/scala/Chisel/Core.scala
index 8236c154..1bdf6d3a 100644
--- a/src/main/scala/Core.scala
+++ b/src/main/scala/Chisel/Core.scala
@@ -451,7 +451,7 @@ class SeqMem[T <: Data](t: T, n: Int) {
 }
 
 object Vec {
-  def apply[T <: Data](gen: => T, n: Int): Vec[T] = 
+  def apply[T <: Data](gen: T, n: Int): Vec[T] = 
     new Vec((0 until n).map(i => gen.cloneType))
   def apply[T <: Data](elts: Iterable[T]): Vec[T] = {
     val vec = new Vec[T](elts.map(e => elts.head.cloneType))
@@ -957,7 +957,7 @@ object Cat {
 object Bundle {
   val keywords = HashSet[String]("elements", "flip", "toString",
     "flatten", "binding", "asInput", "asOutput", "unary_$tilde",
-    "unary_$bang", "unary_$minus", "cloneType", "doCloneType", 
+    "unary_$bang", "unary_$minus", "cloneType", "doCloneType", "clone",
     "toUInt", "toBits",
     "toBool", "toSInt", "asDirectionless")
   def apply[T <: Bundle](b: => T)(implicit p: Parameters): T = {
diff --git a/src/main/scala/Driver.scala b/src/main/scala/Chisel/Driver.scala
index c4a26221..1dcfa82a 100644
--- a/src/main/scala/Driver.scala
+++ b/src/main/scala/Chisel/Driver.scala
@@ -167,6 +167,8 @@ object Driver extends FileSystemUtilities{
   }
 
   private def test[T <: Module](mod: T, ftester: T => Tester[T]): Unit = {
+    // We shouldn't have to do this. There should be a class of Builder that doesn't pushCommand.
+    Builder.pushCommands
     var res = false
     var tester: Tester[T] = null
     try {
diff --git a/src/main/scala/Enum.scala b/src/main/scala/Chisel/Enum.scala
index 3bc24220..3bc24220 100644
--- a/src/main/scala/Enum.scala
+++ b/src/main/scala/Chisel/Enum.scala
diff --git a/src/main/scala/Error.scala b/src/main/scala/Chisel/Error.scala
index 1ad5414d..1ad5414d 100644
--- a/src/main/scala/Error.scala
+++ b/src/main/scala/Chisel/Error.scala
diff --git a/src/main/scala/FP.scala b/src/main/scala/Chisel/FP.scala
index c22ee475..c22ee475 100644
--- a/src/main/scala/FP.scala
+++ b/src/main/scala/Chisel/FP.scala
diff --git a/src/main/scala/ImplicitConversions.scala b/src/main/scala/Chisel/ImplicitConversions.scala
index c67efb7e..c67efb7e 100644
--- a/src/main/scala/ImplicitConversions.scala
+++ b/src/main/scala/Chisel/ImplicitConversions.scala
diff --git a/src/main/scala/JHFormat.scala b/src/main/scala/Chisel/JHFormat.scala
index e177835e..e177835e 100644
--- a/src/main/scala/JHFormat.scala
+++ b/src/main/scala/Chisel/JHFormat.scala
diff --git a/src/main/scala/Literal.scala b/src/main/scala/Chisel/Literal.scala
index fff2780b..fff2780b 100644
--- a/src/main/scala/Literal.scala
+++ b/src/main/scala/Chisel/Literal.scala
diff --git a/src/main/scala/Log2.scala b/src/main/scala/Chisel/Log2.scala
index fe1c1372..fe1c1372 100644
--- a/src/main/scala/Log2.scala
+++ b/src/main/scala/Chisel/Log2.scala
diff --git a/src/main/scala/Parameters.scala b/src/main/scala/Chisel/Parameters.scala
index 9a117ee0..9a117ee0 100644
--- a/src/main/scala/Parameters.scala
+++ b/src/main/scala/Chisel/Parameters.scala
diff --git a/src/main/scala/Params.scala b/src/main/scala/Chisel/Params.scala
index 9f98c336..9f98c336 100644
--- a/src/main/scala/Params.scala
+++ b/src/main/scala/Chisel/Params.scala
diff --git a/src/main/scala/Tester.scala b/src/main/scala/Chisel/Tester.scala
index bdeb0f68..cf7c7b1c 100644
--- a/src/main/scala/Tester.scala
+++ b/src/main/scala/Chisel/Tester.scala
@@ -357,9 +357,9 @@ class ManualTester[+T <: Module]
 
   def start(): Process = {
     val n = Driver.appendString(Some(c.name),Driver.chiselConfigClassName)
-    val target = Driver.targetDir + "/" + n
+    val target = "cd " + Driver.targetDir + " && ./" + n
     val cmd = target
-    println("OPENING " + cmd)
+    println("RUNNING " + cmd)
     /*
       (if (Driver.backend.isInstanceOf[FloBackend]) {
          val dir = Driver.backend.asInstanceOf[FloBackend].floDir
@@ -373,8 +373,8 @@ class ManualTester[+T <: Module]
       })
      */
     println("SEED " + Driver.testerSeed)
-    println("STARTING " + cmd)
-    val processBuilder = Process(cmd)
+    println("STARTING " + n)
+    val processBuilder = Process(Seq("bash", "-c", cmd))
     val pio = new ProcessIO(in => testOut = in, out => testIn = out, err => testErr = err)
     process = processBuilder.run(pio)
     waitForStreams()
diff --git a/src/main/scala/utils.scala b/src/main/scala/Chisel/utils.scala
index 3bbea34a..3bbea34a 100644
--- a/src/main/scala/utils.scala
+++ b/src/main/scala/Chisel/utils.scala