aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/firrtl/passes
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/firrtl/passes')
-rw-r--r--src/main/scala/firrtl/passes/Checks.scala2
-rw-r--r--src/main/scala/firrtl/passes/ExpandWhens.scala8
-rw-r--r--src/main/scala/firrtl/passes/Inline.scala2
-rw-r--r--src/main/scala/firrtl/passes/LowerTypes.scala12
-rw-r--r--src/main/scala/firrtl/passes/Passes.scala28
-rw-r--r--src/main/scala/firrtl/passes/SplitExpressions.scala4
-rw-r--r--src/main/scala/firrtl/passes/Uniquify.scala2
7 files changed, 29 insertions, 29 deletions
diff --git a/src/main/scala/firrtl/passes/Checks.scala b/src/main/scala/firrtl/passes/Checks.scala
index b9096e1e..94d509ed 100644
--- a/src/main/scala/firrtl/passes/Checks.scala
+++ b/src/main/scala/firrtl/passes/Checks.scala
@@ -619,7 +619,7 @@ object CheckGenders extends Pass {
check_gender(s.info,genders,MALE)(s.en)
check_gender(s.info,genders,MALE)(s.clk)
}
- case (_:Begin|_:IsInvalid) => false
+ case (_:Block | _:IsInvalid) => false
}
s
}
diff --git a/src/main/scala/firrtl/passes/ExpandWhens.scala b/src/main/scala/firrtl/passes/ExpandWhens.scala
index b6e090f4..6df7664b 100644
--- a/src/main/scala/firrtl/passes/ExpandWhens.scala
+++ b/src/main/scala/firrtl/passes/ExpandWhens.scala
@@ -73,12 +73,12 @@ object ExpandWhens extends Pass {
}
private def squashEmpty(s: Statement): Statement = {
s map squashEmpty match {
- case Begin(stmts) =>
+ case Block(stmts) =>
val newStmts = stmts filter (_ != EmptyStmt)
newStmts.size match {
case 0 => EmptyStmt
case 1 => newStmts.head
- case _ => Begin(newStmts)
+ case _ => Block(newStmts)
}
case s => s
}
@@ -157,7 +157,7 @@ object ExpandWhens extends Pass {
memos += memoNode
netlist(lvalue) = memoExpr
}
- Begin(Seq(conseqStmt, altStmt) ++ memos)
+ Block(Seq(conseqStmt, altStmt) ++ memos)
case s: Print =>
if(weq(p, one)) {
@@ -191,7 +191,7 @@ object ExpandWhens extends Pass {
case m: ExtModule => m
case m: Module =>
val (netlist, simlist, bodyx) = expandWhens(m)
- val newBody = Begin(Seq(bodyx map squashEmpty) ++ expandNetlist(netlist) ++ simlist)
+ val newBody = Block(Seq(bodyx map squashEmpty) ++ expandNetlist(netlist) ++ simlist)
Module(m.info, m.name, m.ports, newBody)
}
}
diff --git a/src/main/scala/firrtl/passes/Inline.scala b/src/main/scala/firrtl/passes/Inline.scala
index 786de0eb..3801f8cb 100644
--- a/src/main/scala/firrtl/passes/Inline.scala
+++ b/src/main/scala/firrtl/passes/Inline.scala
@@ -145,7 +145,7 @@ object InlineInstances extends Transform {
stmts += DefWire(p.info, rename(p.name), p.tpe)
}
stmts += renameStmt(instInModule.body)
- Begin(stmts.toSeq)
+ Block(stmts.toSeq)
} else s
}
case s => s map onExp map onStmt
diff --git a/src/main/scala/firrtl/passes/LowerTypes.scala b/src/main/scala/firrtl/passes/LowerTypes.scala
index b86b0651..7ab3333a 100644
--- a/src/main/scala/firrtl/passes/LowerTypes.scala
+++ b/src/main/scala/firrtl/passes/LowerTypes.scala
@@ -163,7 +163,7 @@ object LowerTypes extends Pass {
} else {
val exps = create_exps(s.name, s.tpe)
val stmts = exps map (e => DefWire(s.info, loweredName(e), tpe(e)))
- Begin(stmts)
+ Block(stmts)
}
case s: DefRegister =>
sinfo = s.info
@@ -177,7 +177,7 @@ object LowerTypes extends Pass {
val stmts = es zip inits map { case (e, i) =>
DefRegister(s.info, loweredName(e), tpe(e), clock, reset, i)
}
- Begin(stmts)
+ Block(stmts)
}
// Could instead just save the type of each Module as it gets processed
case s: WDefInstance =>
@@ -206,7 +206,7 @@ object LowerTypes extends Pass {
s.writeLatency, s.readLatency, s.readers, s.writers,
s.readwriters)
}
- Begin(stmts)
+ Block(stmts)
}
// wire foo : { a , b }
// node x = foo
@@ -222,13 +222,13 @@ object LowerTypes extends Pass {
val stmts = names zip exps map { case (n, e) =>
DefNode(s.info, loweredName(n), e)
}
- Begin(stmts)
+ Block(stmts)
case s: IsInvalid =>
sinfo = s.info
kind(s.expr) match {
case k: MemKind =>
val exps = lowerTypesMemExp(s.expr)
- Begin(exps map (exp => IsInvalid(s.info, exp)))
+ Block(exps map (exp => IsInvalid(s.info, exp)))
case _ => s map (lowerTypesExp)
}
case s: Connect =>
@@ -237,7 +237,7 @@ object LowerTypes extends Pass {
case k: MemKind =>
val exp = lowerTypesExp(s.expr)
val locs = lowerTypesMemExp(s.loc)
- Begin(locs map (loc => Connect(s.info, loc, exp)))
+ Block(locs map (loc => Connect(s.info, loc, exp)))
case _ => s map (lowerTypesExp)
}
case s => s map (lowerTypesExp)
diff --git a/src/main/scala/firrtl/passes/Passes.scala b/src/main/scala/firrtl/passes/Passes.scala
index 6b88c514..44de3542 100644
--- a/src/main/scala/firrtl/passes/Passes.scala
+++ b/src/main/scala/firrtl/passes/Passes.scala
@@ -690,7 +690,7 @@ object ExpandConnects extends Pass {
EmptyStmt
} else if (invalids.length == 1) {
invalids(0)
- } else Begin(invalids)
+ } else Block(invalids)
}
case (s:Connect) => {
val n = get_size(tpe(s.loc))
@@ -706,7 +706,7 @@ object ExpandConnects extends Pass {
}
connects += sx
}
- Begin(connects)
+ Block(connects)
}
case (s:PartialConnect) => {
val ls = get_valid_points(tpe(s.loc),tpe(s.expr),Default,Default)
@@ -722,7 +722,7 @@ object ExpandConnects extends Pass {
}
connects += sx
}}
- Begin(connects)
+ Block(connects)
}
case (s) => s map (expand_s)
}
@@ -873,7 +873,7 @@ object RemoveAccesses extends Pass {
case (s) => s map (remove_e) map (remove_s)
}
stmts += sx
- if (stmts.size != 1) Begin(stmts) else stmts(0)
+ if (stmts.size != 1) Block(stmts) else stmts(0)
}
Module(m.info,m.name,m.ports,remove_s(m.body))
}
@@ -1053,7 +1053,7 @@ object CInferTypes extends Pass {
def infer_types (m:DefModule) : DefModule = {
val types = LinkedHashMap[String,Type]()
def infer_types_e (e:Expression) : Expression = {
- (e map (infer_types_e)) match {
+ e map infer_types_e match {
case (e:Reference) => Reference(e.name, types.getOrElse(e.name,UnknownType))
case (e:SubField) => SubField(e.expr,e.name,field_type(tpe(e.expr),e.name))
case (e:SubIndex) => SubIndex(e.expr,e.value,sub_type(tpe(e.expr)))
@@ -1065,10 +1065,10 @@ object CInferTypes extends Pass {
}
}
def infer_types_s (s:Statement) : Statement = {
- (s) match {
+ s match {
case (s:DefRegister) => {
types(s.name) = s.tpe
- s map (infer_types_e)
+ s map infer_types_e
s
}
case (s:DefWire) => {
@@ -1076,7 +1076,7 @@ object CInferTypes extends Pass {
s
}
case (s:DefNode) => {
- val sx = s map (infer_types_e)
+ val sx = s map infer_types_e
val t = get_type(sx)
types(s.name) = t
sx
@@ -1098,13 +1098,13 @@ object CInferTypes extends Pass {
types(s.name) = module_types.getOrElse(s.module,UnknownType)
s
}
- case (s) => s map(infer_types_s) map (infer_types_e)
+ case (s) => s map infer_types_s map infer_types_e
}
}
for (p <- m.ports) {
types(p.name) = p.tpe
}
- (m) match {
+ m match {
case (m:Module) => Module(m.info,m.name,m.ports,infer_types_s(m.body))
case (m:ExtModule) => m
}
@@ -1287,7 +1287,7 @@ object RemoveCHIRRTL extends Pass {
set_write(rws,"data","mask")
val read_l = if (s.seq) 1 else 0
val mem = DefMemory(s.info,s.name,s.tpe,s.size,1,read_l,rds.map(_.name),wrs.map(_.name),rws.map(_.name))
- Begin(Seq(mem,Begin(stmts)))
+ Block(Seq(mem,Block(stmts)))
}
case (s:CDefMPort) => {
mport_types(s.name) = mport_types(s.mem)
@@ -1327,7 +1327,7 @@ object RemoveCHIRRTL extends Pass {
for (x <- ens ) {
stmts += Connect(s.info,SubField(SubField(Reference(s.mem,ut),s.name,ut),x,ut),one)
}
- Begin(stmts)
+ Block(stmts)
}
case (s) => s map (collect_refs)
}
@@ -1383,7 +1383,7 @@ object RemoveCHIRRTL extends Pass {
stmts += Connect(s.info,wmode,one)
}
}
- if (stmts.size > 1) Begin(stmts)
+ if (stmts.size > 1) Block(stmts)
else stmts(0)
}
case (s:PartialConnect) => {
@@ -1403,7 +1403,7 @@ object RemoveCHIRRTL extends Pass {
stmts += Connect(s.info,wmode,one)
}
}
- if (stmts.size > 1) Begin(stmts)
+ if (stmts.size > 1) Block(stmts)
else stmts(0)
}
case (s) => s map (remove_chirrtl_s) map (remove_chirrtl_e(MALE))
diff --git a/src/main/scala/firrtl/passes/SplitExpressions.scala b/src/main/scala/firrtl/passes/SplitExpressions.scala
index 973e1be9..1c9674e1 100644
--- a/src/main/scala/firrtl/passes/SplitExpressions.scala
+++ b/src/main/scala/firrtl/passes/SplitExpressions.scala
@@ -45,11 +45,11 @@ object SplitExpressions extends Pass {
}
val x = s map onExp
x match {
- case x: Begin => x map onStmt
+ case x: Block => x map onStmt
case EmptyStmt => x
case x => {
v += x
- if (v.size > 1) Begin(v.toVector)
+ if (v.size > 1) Block(v.toVector)
else v(0)
}
}
diff --git a/src/main/scala/firrtl/passes/Uniquify.scala b/src/main/scala/firrtl/passes/Uniquify.scala
index aa2c1d5d..b1a20fdd 100644
--- a/src/main/scala/firrtl/passes/Uniquify.scala
+++ b/src/main/scala/firrtl/passes/Uniquify.scala
@@ -244,7 +244,7 @@ object Uniquify extends Pass {
}
case s: DefNode => Seq(Field(s.name, Default, get_type(s)))
case s: Conditionally => recStmtToType(s.conseq) ++ recStmtToType(s.alt)
- case s: Begin => (s.stmts map (recStmtToType)).flatten
+ case s: Block => (s.stmts map (recStmtToType)).flatten
case s => Seq()
}
BundleType(recStmtToType(s))
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-09 03:36:29 +0000