Merge branch 'master' into release

Author: ucbjrl

ChangeLog

@@ -1,5 +1,4 @@
-ChangeLog for Chisel v2.2.37
+ChangeLog for Chisel v2.2.38
 
-#740 Wide rom fix
- Remove Getting Started and refer to Chisel3.
- Update README.md (point to Chisel3, add Resolvers to getting started build.sbt
+Move {as,to}{U,S}Int definitions to Node.scala, and add them as Bundle key words.
+Update deprecated Fill() usage in FillApp.scala.

ReleaseNotes

@@ -1,6 +1,6 @@
-ReleaseNotes for Chisel v2.2.37
+ReleaseNotes for Chisel v2.2.38
 
-This release of Chisel is a maintenance release, incorporating a bug fix for issue #740 - unable to create a ROM with datawidth more than 64 bits.
+This release of Chisel is a maintenance release, incorporating support for Chisel3's {as,to}{U,S}Int methods in all Chisel Data types.
 
 We will be removing support for Scala 2.10 in future Chisel
 releases. Please verify your code compiles and runs correctly under

build.sbt

@@ -2,8 +2,8 @@ def versionToArray(v: String): Array[String] = v.split('.')
 
 lazy val chiselBuildSettings = Seq (
     organization := "edu.berkeley.cs",
-    // version := "2.2.37",
-    version := "2.2.37",
+    // version := "2.2.38",
+    version := "2.2.38",
     name := "Chisel",
     scalaVersion := "2.11.7",
     crossScalaVersions := Seq("2.10.6", "2.11.7"),

src/main/scala/Bits.scala

@@ -72,14 +72,8 @@ abstract class Bits extends Data with proc {
   }
 
   def fromInt(x: Int): this.type
-  def toSInt(): SInt = chiselCast(this){SInt()}
-  def toUInt(): UInt = chiselCast(this){UInt()}
   override def getNode: Node = if (procAssigned) this else super.getNode
 
-  // Chisel3 - rename these to make the reinterpret cast more explicit
-  final def asUInt() = toUInt
-  final def asSInt() = toSInt
-
   // internal, non user exposed connectors
   private var assigned = false
   private def checkAssign(src: Node) = {

src/main/scala/Bundle.scala

@@ -35,7 +35,7 @@ object Bundle {
   val keywords = Set("elements", "flip", "toString",
     "flatten", "binding", "asInput", "asOutput", "unary_$tilde",
     "unary_$bang", "unary_$minus", "clone", "cloneType", "toUInt", "toBits",
-    "toBool", "toSInt", "asDirectionless")
+    "toBool", "toSInt", "asDirectionless", "asUInt", "asSInt")
 
   def apply[T <: Bundle](b: => T)(implicit p: Parameters): T = {
     Driver.parStack.push(p.push)

src/main/scala/Node.scala

@@ -439,9 +439,14 @@ abstract class Node extends Nameable {
     if (!isTypeNode || inputs.isEmpty) this
     else inputs(0).getNode
 
-  // TODO: change function name to toUInt?
   /** @return This node as a UInt */
   def toBits(): UInt = chiselCast(this){UInt()}
+  def toSInt(): SInt = chiselCast(this){SInt()}
+  def toUInt(): UInt = chiselCast(this){UInt()}
+
+  // Chisel3 - rename these to make the reinterpret cast more explicit
+  final def asUInt() = toUInt()
+  final def asSInt() = toSInt()
 
   /** @return This node */
   def toNode: Node = this

src/test/scala/FillApp.scala

@@ -42,7 +42,7 @@ class FillSuite extends TestSuite {
       val io = new Bundle {
         val a = UInt(INPUT, 4)
       }
-      val f = Fill(UInt(1,1), 3)
+      val f = Fill(3, UInt(1,1))
     }
 
     val testArgs = chiselEnvironmentArguments() ++ Array("--targetDir", dir.getPath.toString(),