diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/Chisel/Core.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/Chisel/Parameters.scala | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala index ad938085..3d39b403 100644 --- a/src/main/scala/Chisel/Core.scala +++ b/src/main/scala/Chisel/Core.scala @@ -791,7 +791,7 @@ class Bundle extends Aggregate(NO_DIR) { Builder.error(s"Parameterized Bundle ${this.getClass} needs cloneType method. You are probably using an anonymous Bundle object that captures external state and hence is un-cloneTypeable") this } - case _: java.lang.reflect.InvocationTargetException => + case _: java.lang.reflect.InvocationTargetException | _: java.lang.IllegalArgumentException => Builder.error(s"Parameterized Bundle ${this.getClass} needs cloneType method") this } diff --git a/src/main/scala/Chisel/Parameters.scala b/src/main/scala/Chisel/Parameters.scala index cc1fe0be..c2d32fbd 100644 --- a/src/main/scala/Chisel/Parameters.scala +++ b/src/main/scala/Chisel/Parameters.scala @@ -160,7 +160,11 @@ class ParameterDump { def apply[T](key:Any,value:T):T = {addToDump(key,value); value} def apply[T](knob:Knob[T]):Knob[T] = {knobList += knob.name; knob} def addToDump(key:Any,value:Any) = dump += ((key,value)) - def getDump:String = dump.map(_.toString).reduce(_+"\n"+_) + "\n" + def getDump:String = if (!dump.isEmpty) { + dump.map(_.toString).reduce(_+"\n"+_) + "\n" + } else { + "" + } } // objects given to the user in mask functions (site,here,up) |