aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShreesha Srinath2017-06-12 14:21:15 -0700
committerJack Koenig2017-06-12 14:21:15 -0700
commit50fb23572c78463d44a071d575c8f2212a048f8e (patch)
tree97161bbe1bf270e7b223d8c1e2ed80d49dffbc9a /src
parentfb26097de2d4ee535783eb575ad04e6a410a5e46 (diff)
Fixes a typo in the verilog `elsif code generation (#603)
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/firrtl/Emitter.scala12
-rw-r--r--src/test/scala/firrtlTests/AttachSpec.scala4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/scala/firrtl/Emitter.scala b/src/main/scala/firrtl/Emitter.scala
index d5b0eee6..00b5137e 100644
--- a/src/main/scala/firrtl/Emitter.scala
+++ b/src/main/scala/firrtl/Emitter.scala
@@ -352,7 +352,7 @@ class VerilogEmitter extends SeqTransform with Emitter {
Seq(a0, "[", low, ":", 0, "]")
}
}
-
+
def emit_verilog(m: Module, moduleMap: Map[String, DefModule])(implicit w: Writer): DefModule = {
val netlist = mutable.LinkedHashMap[WrappedExpression, Expression]()
val addrRegs = mutable.HashSet[WrappedExpression]()
@@ -375,7 +375,7 @@ class VerilogEmitter extends SeqTransform with Emitter {
sx
case sx => sx
}
-
+
val portdefs = ArrayBuffer[Seq[Any]]()
val declares = ArrayBuffer[Seq[Any]]()
val instdeclares = ArrayBuffer[Seq[Any]]()
@@ -642,7 +642,7 @@ class VerilogEmitter extends SeqTransform with Emitter {
else
garbageAssign(data, memPort, garbageGuard)
}
-
+
for (w <- sx.writers) {
val data = memPortField(sx, w, "data")
val addr = memPortField(sx, w, "addr")
@@ -673,7 +673,7 @@ class VerilogEmitter extends SeqTransform with Emitter {
sx
case sx => sx
}
-
+
def emit_streams() {
emit(Seq("module ", m.name, "("))
for ((x, i) <- portdefs.zipWithIndex) {
@@ -691,7 +691,7 @@ class VerilogEmitter extends SeqTransform with Emitter {
if (attachAliases.nonEmpty) {
emit(Seq("`ifdef SYNTHESIS"))
for (x <- attachSynAssigns) emit(Seq(tab, x))
- emit(Seq("`elseif verilator"))
+ emit(Seq("`elsif verilator"))
emit(Seq(tab, "`error \"Verilator does not support alias and thus cannot arbirarily connect bidirectional wires and ports\""))
emit(Seq("`else"))
for (x <- attachAliases) emit(Seq(tab, x))
@@ -711,7 +711,7 @@ class VerilogEmitter extends SeqTransform with Emitter {
emit(Seq(" end"))
emit(Seq("`endif // RANDOMIZE"))
}
-
+
for (clk_stream <- at_clock if clk_stream._2.nonEmpty) {
emit(Seq(tab, "always @(posedge ", clk_stream._1, ") begin"))
for (x <- clk_stream._2) emit(Seq(tab, tab, x))
diff --git a/src/test/scala/firrtlTests/AttachSpec.scala b/src/test/scala/firrtlTests/AttachSpec.scala
index 93a36f70..6e5883d7 100644
--- a/src/test/scala/firrtlTests/AttachSpec.scala
+++ b/src/test/scala/firrtlTests/AttachSpec.scala
@@ -129,7 +129,7 @@ class InoutVerilogSpec extends FirrtlFlatSpec {
| assign a2 = x;
| assign a1 = a2;
| assign a2 = a1;
- | `elseif verilator
+ | `elsif verilator
| `error "Verilator does not support alias and thus cannot arbirarily connect bidirectional wires and ports"
| `else
| alias x = a1 = a2;
@@ -147,7 +147,7 @@ class InoutVerilogSpec extends FirrtlFlatSpec {
| input foo : { b : UInt<3>, a : Analog<3> }
| output bar : { b : UInt<3>, a : Analog<3> }
| bar <- foo""".stripMargin
- // Omitting `ifdef SYNTHESIS and `elseif verilator since it's tested above
+ // Omitting `ifdef SYNTHESIS and `elsif verilator since it's tested above
val check =
"""module Attaching(
| input [2:0] foo_b,