Emit no width instead of <?> for unknown width UInt and SInt literals and types

2 files changed, 5 insertions, 5 deletions

diff --git a/src/main/scala/Chisel/Bits.scala b/src/main/scala/Chisel/Bits.scala
index b800644d..8f2e1b09 100644
--- a/src/main/scala/Chisel/Bits.scala
+++ b/src/main/scala/Chisel/Bits.scala
@@ -280,7 +280,7 @@ sealed class UInt private[Chisel] (dir: Direction, width: Width, lit: Option[ULi
     extends Bits(dir, width, lit) with Num[UInt] {
   private[Chisel] override def cloneTypeWidth(w: Width): this.type =
     new UInt(dir, w).asInstanceOf[this.type]
-  private[Chisel] def toType = s"UInt<$width>"
+  private[Chisel] def toType = s"UInt$width"
 
   override private[Chisel] def fromInt(value: BigInt): this.type = UInt(value).asInstanceOf[this.type]
 
@@ -412,7 +412,7 @@ sealed class SInt private (dir: Direction, width: Width, lit: Option[SLit] = Non
     extends Bits(dir, width, lit) with Num[SInt] {
   private[Chisel] override def cloneTypeWidth(w: Width): this.type =
     new SInt(dir, w).asInstanceOf[this.type]
-  private[Chisel] def toType = s"SInt<$width>"
+  private[Chisel] def toType = s"SInt$width"
 
   override def := (that: Data): Unit = that match {
     case _: SInt => this connect that
diff --git a/src/main/scala/Chisel/internal/firrtl/IR.scala b/src/main/scala/Chisel/internal/firrtl/IR.scala
index 6946652f..60a38a08 100644
--- a/src/main/scala/Chisel/internal/firrtl/IR.scala
+++ b/src/main/scala/Chisel/internal/firrtl/IR.scala
@@ -66,7 +66,7 @@ case class ILit(n: BigInt) extends Arg {
 }
 
 case class ULit(n: BigInt, w: Width) extends LitArg(n, w) {
-  def name: String = "UInt<" + width + ">(\"h0" + num.toString(16) + "\")"
+  def name: String = "UInt" + width + "(\"h0" + num.toString(16) + "\")"
   def minWidth: Int = 1 max n.bitLength
 
   require(n >= 0, s"UInt literal ${n} is negative")
@@ -117,7 +117,7 @@ sealed case class UnknownWidth() extends Width {
   def known: Boolean = false
   def get: Int = None.get
   def op(that: Width, f: (W, W) => W): Width = this
-  override def toString: String = "?"
+  override def toString: String = ""
 }
 
 sealed case class KnownWidth(value: Int) extends Width {
@@ -128,7 +128,7 @@ sealed case class KnownWidth(value: Int) extends Width {
     case KnownWidth(x) => KnownWidth(f(value, x))
     case _ => that
   }
-  override def toString: String = value.toString
+  override def toString: String = s"<${value.toString}>"
 }
 
 sealed abstract class MemPortDirection(name: String) {