Cross compilation fixes

Author: adkian-sifive

core/src/main/scala-2/chisel3/experimental/dataview/ChiselSubtypeOf.scala

@@ -27,6 +27,8 @@ import scala.reflect.macros.blackbox.Context
   */
 sealed trait ChiselSubtypeOf[A, B]
 
+
+// return an empty tree here instead of a quasiquote for scala3 compatibility
 object ChiselSubtypeOf {
   // TODO return an empty tree here instead of a quasiquote for scala3 compatibility
   def genChiselSubtypeOf[A: c.WeakTypeTag, B: c.WeakTypeTag](c: Context): c.Tree = {

core/src/main/scala/chisel3/BitsImpl.scala

@@ -23,15 +23,15 @@ private[chisel3] trait BitsImpl extends Element { self: Bits =>
   // Only used for in a few cases, hopefully to be removed
   private[chisel3] def cloneTypeWidth(width: Width): this.type
 
-  def cloneType: this.type = cloneTypeWidth(width)
+  def cloneType: this.type = cloneTypeWidth(this.width)
 
   /** A non-ambiguous name of this `Bits` instance for use in generated Verilog names
     * Inserts the width directly after the typeName, e.g. UInt4, SInt1
     */
-  override def typeName: String = s"${simpleClassName(this.getClass)}$width"
+  override def typeName: String = s"${simpleClassName(this.getClass)}${this.width}"
 
   protected def _tailImpl(n: Int)(implicit sourceInfo: SourceInfo): UInt = {
-    val w = width match {
+    val w = this.width match {
       case KnownWidth(x) =>
         require(x >= n, s"Can't tail($n) for width $x < $n")
         Width(x - n)
@@ -99,7 +99,7 @@ private[chisel3] trait BitsImpl extends Element { self: Bits =>
   }
 
   protected def _applyImpl(x: UInt)(implicit sourceInfo: SourceInfo): Bool =
-    do_extract(x)
+    extract(x)
 
   protected def _applyImpl(x: Int, y: Int)(implicit sourceInfo: SourceInfo): UInt = {
     if ((x < y && !(x == -1 && y == 0)) || y < 0) {
@@ -330,15 +330,15 @@ private[chisel3] trait UIntImpl extends BitsImpl with Num[UInt] { self: UInt =>
   protected def _rotateLeftImpl(n: Int)(implicit sourceInfo: SourceInfo): UInt = width match {
     case _ if (n == 0)             => this
     case KnownWidth(w) if (w <= 1) => this
-    case KnownWidth(w) if n >= w   => do_rotateLeft(n % w)
-    case _ if (n < 0)              => do_rotateRight(-n)
+    case KnownWidth(w) if n >= w   => rotateLeft(n % w)
+    case _ if (n < 0)              => rotateRight(-n)
     case _                         => tail(n) ## head(n)
   }
 
   protected def _rotateRightImpl(n: Int)(implicit sourceInfo: SourceInfo): UInt = width match {
-    case _ if (n <= 0)             => do_rotateLeft(-n)
+    case _ if (n <= 0)             => rotateLeft(-n)
     case KnownWidth(w) if (w <= 1) => this
-    case KnownWidth(w) if n >= w   => do_rotateRight(n % w)
+    case KnownWidth(w) if n >= w   => rotateRight(n % w)
     case _                         => this(n - 1, 0) ## (this >> n)
   }
 

core/src/main/scala/chisel3/ChiselEnumImpl.scala

@@ -70,8 +70,8 @@ private[chisel3] abstract class EnumTypeImpl(private[chisel3] val factory: Chise
             _wire := this.asUInt
             _wire
         }
-        _padded.do_asTypeOf(that)
-      case None => super.do_asTypeOf(that)
+        _padded.asTypeOf(that)
+      case None => super.asTypeOf(that)
     }
   }
 
@@ -154,7 +154,7 @@ private[chisel3] abstract class EnumTypeImpl(private[chisel3] val factory: Chise
   }
 
   // This function conducts a depth-wise search to find all enum-type fields within a vector or bundle (or vector of bundles)
-  private def enumFields(d: Aggregate): Seq[Seq[String]] = d match {
+  private def enumFields(d: Data): Seq[Seq[String]] = d match {
     case v: Vec[_] =>
       v.sample_element match {
         case b: Bundle => enumFields(b)
@@ -222,7 +222,15 @@ private[chisel3] abstract class EnumTypeImpl(private[chisel3] val factory: Chise
     for ((name, value) <- allNamesPadded) {
       when(this === value) {
         for ((r, c) <- result.zip(name)) {
-          r := c.toChar.U
+          // todo: this doesn't work in scala3
+          // r := c.toChar.U
+          //      ^^^^^^^^^^
+          //      value U is not a member of Char.
+          //      An extension method was tried,
+          //      but could not be fully constructed:
+          // 
+          //          chisel3.fromLongToLiteral(c.toChar)
+          // r := c.toChar.U
         }
       }
     }
@@ -355,7 +363,8 @@ private[chisel3] trait ChiselEnumImpl { self: ChiselEnum =>
 // This is an enum type that can be connected directly to UInts. It is used as a "glue" to cast non-literal UInts
 // to enums.
 private[chisel3] class UnsafeEnum(override val width: Width) extends EnumType(UnsafeEnum, selfAnnotating = false) {
-  override def cloneType: this.type = new UnsafeEnum(width).asInstanceOf[this.type]
+
+  override def _cloneType: Data = new UnsafeEnum(width)
 }
 private object UnsafeEnum extends ChiselEnum
 

core/src/main/scala/chisel3/experimental/dataview/DataView.scala

@@ -7,7 +7,6 @@ import chisel3.reflect.DataMirror.internal.chiselTypeClone
 import chisel3.experimental.{HWTuple10, HWTuple2, HWTuple3, HWTuple4, HWTuple5, HWTuple6, HWTuple7, HWTuple8, HWTuple9}
 import chisel3.experimental.{ChiselSubtypeOf, SourceInfo, UnlocatableSourceInfo}
 
-import scala.reflect.runtime.universe.WeakTypeTag
 import annotation.implicitNotFound
 
 /** Mapping between a target type `T` and a view type `V`

core/src/main/scala/chisel3/experimental/dataview/package.scala

@@ -73,7 +73,7 @@ package object dataview {
 
     /** View a [[Bundle]] or [[Record]] as a parent type (upcast) */
     def viewAsSupertype[V <: Record](proto: V)(implicit ev: ChiselSubtypeOf[T, V], sourceInfo: SourceInfo): V = {
-      implicit val dataView = PartialDataView.supertype[T, V](_ => proto)
+      implicit val dataView: DataView[T, V] = PartialDataView.supertype[T, V](_ => proto)
       target.viewAs[V]
     }
   }

core/src/main/scala/chisel3/experimental/hierarchy/InstantiateImpl.scala

@@ -91,9 +91,6 @@ package object experimental {
   @deprecated("FlatIO has moved to package chisel3", "Chisel 6.0")
   val FlatIO = chisel3.FlatIO
 
-  class dump extends chisel3.internal.naming.dump
-  class treedump extends chisel3.internal.naming.treedump
-
   /** Generate prefixes from values of this type in the Chisel compiler plugin
     *
     * Users can mixin this trait to tell the Chisel compiler plugin to include the names of
@@ -132,7 +129,8 @@ package object experimental {
   object BundleLiterals {
     implicit class AddBundleLiteralConstructor[T <: Record](x: T) {
       def Lit(elems: (T => (Data, Data))*)(implicit sourceInfo: SourceInfo): T = {
-        x._makeLit(elems: _*)
+        val fs = elems.map(_.asInstanceOf[Data => (Data, Data)])
+        x._makeLit(fs: _*).asInstanceOf[T]
       }
     }
   }

core/src/main/scala/chisel3/experimental/package.scala

@@ -12,7 +12,6 @@ import scala.annotation.{nowarn, tailrec}
 /** This package contains the main chisel3 API.
   */
 package object chisel3 {
-  import internal.chiselRuntimeDeprecated
   import experimental.{DeprecatedSourceInfo, UnlocatableSourceInfo}
   import internal.firrtl.ir.Port
   import internal.Builder

core/src/main/scala/chisel3/package.scala

@@ -10,7 +10,6 @@ import chisel3.internal.binding._
 import chisel3.internal.firrtl.{ir, Converter}
 import chisel3.experimental.{prefix, requireIsHardware, Analog, SourceInfo}
 import chisel3.experimental.hierarchy.Instance
-import scala.reflect.runtime.universe.{typeOf, TypeTag}
 import scala.annotation.{implicitAmbiguous, implicitNotFound}
 import chisel3.experimental.BaseModule
 import chisel3.internal.NamedComponent
@@ -278,18 +277,8 @@ sealed trait Property[T] extends Element { self =>
 
   /** Clone type by simply constructing a new Property[T].
     */
-  override def cloneType: this.type = new Property[T] {
+  override def _cloneType: Data = new Property[T] {
     val tpe = self.tpe
-  }.asInstanceOf[this.type]
-
-  /** Clone type with extra information preserved.
-    *
-    * The only extra information present on a Property type is directionality.
-    */
-  private[chisel3] override def cloneTypeFull: this.type = {
-    val clone = this.cloneType
-    clone.specifiedDirection = specifiedDirection
-    clone
   }
 
   /** Get the IR PropertyType for this Property.