Merge branch 'master' into release

Author: ucbjrl

build.sbt

@@ -32,7 +32,7 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
 
 lazy val commonSettings = Seq (
   organization := "edu.berkeley.cs",
-  version := "3.0-SNAPSHOT_2017-09-14",
+  version := "3.0-SNAPSHOT_2017-09-27",
   git.remoteRepo := "[email protected]:freechipsproject/chisel3.git",
   autoAPIMappings := true,
   scalaVersion := "2.11.11",
@@ -92,7 +92,7 @@ lazy val publishSettings = Seq (
   }
 )
 
-val defaultVersions = Map("firrtl" -> "1.0-SNAPSHOT_2017-09-14")
+val defaultVersions = Map("firrtl" -> "1.0-SNAPSHOT_2017-09-27")
 
 lazy val chiselSettings = Seq (
   name := "chisel3",
@@ -140,9 +140,7 @@ lazy val chisel = (project in file(".")).
   // Prevent separate JARs from being generated for coreMacros and chiselFrontend.
   dependsOn(coreMacros % "compile-internal;test-internal").
   dependsOn(chiselFrontend % "compile-internal;test-internal").
-  // The following is required until sbt-scoverage correctly deals with inDependencies
-  // Unfortunately, it also revives publishing of the subproject jars. Disable until the latter is resolved (again).
-  //aggregate(coreMacros, chiselFrontend).
+  aggregate(coreMacros, chiselFrontend).
   settings(
     scalacOptions in Test ++= Seq("-language:reflectiveCalls"),
     scalacOptions in Compile in doc ++= Seq(
@@ -152,7 +150,13 @@ lazy val chisel = (project in file(".")).
       "-doc-title", name.value,
       "-doc-root-content", baseDirectory.value+"/root-doc.txt"
     ),
-    aggregate in doc := false,
+    // Disable aggregation in general, but enable it for specific tasks.
+    // Otherwise we get separate Jar files for each subproject and we
+    //  go to great pains to package all chisel3 core code in a single Jar.
+    // If you get errors indicating coverageReport is undefined, be sure
+    //  you have sbt-scoverage in project/plugins.sbt
+    aggregate := false,
+    aggregate in coverageReport := true,
     // Include macro classes, resources, and sources main JAR.
     mappings in (Compile, packageBin) ++= (mappings in (coreMacros, Compile, packageBin)).value,
     mappings in (Compile, packageSrc) ++= (mappings in (coreMacros, Compile, packageSrc)).value,

chiselFrontend/src/main/scala/chisel3/core/Binding.scala

@@ -88,11 +88,14 @@ sealed trait ConstrainedBinding extends TopBinding {
   def location = Some(enclosure)
 }
 
+// A binding representing a data that cannot be (re)assigned to.
+sealed trait ReadOnlyBinding extends TopBinding
+
 // TODO literal info here
-case class LitBinding() extends UnconstrainedBinding
+case class LitBinding() extends UnconstrainedBinding with ReadOnlyBinding
 // TODO(twigg): Ops between unenclosed nodes can also be unenclosed
 // However, Chisel currently binds all op results to a module
-case class OpBinding(enclosure: UserModule) extends ConstrainedBinding
+case class OpBinding(enclosure: UserModule) extends ConstrainedBinding with ReadOnlyBinding
 case class MemoryPortBinding(enclosure: UserModule) extends ConstrainedBinding
 case class PortBinding(enclosure: BaseModule) extends ConstrainedBinding
 case class RegBinding(enclosure: UserModule) extends ConstrainedBinding

chiselFrontend/src/main/scala/chisel3/core/Data.scala

@@ -267,6 +267,10 @@ abstract class Data extends HasId {
     if (connectCompileOptions.checkSynthesizable) {
       requireIsHardware(this, "data to be connected")
       requireIsHardware(that, "data to be connected")
+      this.topBinding match {
+        case _: ReadOnlyBinding => throwException(s"Cannot reassign to read-only $this")
+        case _ =>  // fine
+      }
       try {
         MonoConnect.connect(sourceInfo, connectCompileOptions, this, that, Builder.forcedUserModule)
       } catch {
@@ -283,6 +287,10 @@ abstract class Data extends HasId {
     if (connectCompileOptions.checkSynthesizable) {
       requireIsHardware(this, s"data to be bulk-connected")
       requireIsHardware(that, s"data to be bulk-connected")
+      (this.topBinding, that.topBinding) match {
+        case (_: ReadOnlyBinding, _: ReadOnlyBinding) => throwException(s"Both $this and $that are read-only")
+        case _ =>  // fine
+      }
       try {
         BiConnect.connect(sourceInfo, connectCompileOptions, this, that, Builder.forcedUserModule)
       } catch {

src/test/scala/chiselTests/MultiAssign.scala

@@ -26,21 +26,42 @@ class LastAssignTester() extends BasicTester {
   }
 }
 
-class ReassignmentTester() extends BasicTester {
-  val test = 15.U
-  test := 7.U
-}
-
 class MultiAssignSpec extends ChiselFlatSpec {
   "The last assignment" should "be used when multiple assignments happen" in {
     assertTesterPasses{ new LastAssignTester }
   }
 }
 
 class IllegalAssignSpec extends ChiselFlatSpec {
-  "Reassignments to non-wire types" should "be disallowed" in {
+  "Reassignments to literals" should "be disallowed" in {
+    intercept[chisel3.internal.ChiselException] {
+      elaborate{ new BasicTester {
+        15.U := 7.U
+      }}
+    }
+  }
+  
+  "Reassignments to ops" should "be disallowed" in {
+    intercept[chisel3.internal.ChiselException] {
+      elaborate{ new BasicTester {
+        (15.U + 1.U) := 7.U
+      }}
+    }
+  }
+  
+  "Reassignments to bit slices" should "be disallowed" in {
+    intercept[chisel3.internal.ChiselException] {
+      elaborate{ new BasicTester {
+        (15.U)(1, 0) := 7.U
+      }}
+    }
+  }
+  
+  "Bulk-connecting two read-only nodes" should "be disallowed" in {
     intercept[chisel3.internal.ChiselException] {
-      assertTesterFails{ new ReassignmentTester }
+      elaborate{ new BasicTester {
+        (15.U + 1.U) <> 7.U
+      }}
     }
   }
 }