diff options
| author | Donggyu Kim | 2016-09-07 21:03:07 -0700 |
|---|---|---|
| committer | Donggyu Kim | 2016-09-13 13:34:15 -0700 |
| commit | 590c3f2cd959c3c125c6511287294aec8409b57b (patch) | |
| tree | 1ec4b2b434e01ea86a7db19af830b82b7ac61d78 /src/main/scala/firrtl/passes | |
| parent | a38930a841cf4f328c81bd65844eee5e0fa24b54 (diff) | |
remove Utils.get_type
Diffstat (limited to 'src/main/scala/firrtl/passes')
| -rw-r--r-- | src/main/scala/firrtl/passes/InferTypes.scala | 10 | ||||
| -rw-r--r-- | src/main/scala/firrtl/passes/Uniquify.scala | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/scala/firrtl/passes/InferTypes.scala b/src/main/scala/firrtl/passes/InferTypes.scala index a652ed01..79200a58 100644 --- a/src/main/scala/firrtl/passes/InferTypes.scala +++ b/src/main/scala/firrtl/passes/InferTypes.scala @@ -66,16 +66,16 @@ object InferTypes extends Pass { types(s.name) = t s copy (tpe = t) case s: DefWire => - val t = remove_unknowns(get_type(s)) + val t = remove_unknowns(s.tpe) types(s.name) = t s copy (tpe = t) case s: DefNode => - val sx = s map infer_types_e(types) - val t = remove_unknowns(get_type(sx)) + val sx = (s map infer_types_e(types)).asInstanceOf[DefNode] + val t = remove_unknowns(sx.value.tpe) types(s.name) = t sx map infer_types_e(types) case s: DefRegister => - val t = remove_unknowns(get_type(s)) + val t = remove_unknowns(s.tpe) types(s.name) = t s copy (tpe = t) map infer_types_e(types) case s: DefMemory => @@ -128,7 +128,7 @@ object CInferTypes extends Pass { types(s.name) = s.tpe s case (s: DefNode) => - types(s.name) = get_type(s) + types(s.name) = s.value.tpe s case (s: DefMemory) => types(s.name) = MemPortUtils.memType(s) diff --git a/src/main/scala/firrtl/passes/Uniquify.scala b/src/main/scala/firrtl/passes/Uniquify.scala index 8ea5eb40..758791b2 100644 --- a/src/main/scala/firrtl/passes/Uniquify.scala +++ b/src/main/scala/firrtl/passes/Uniquify.scala @@ -242,7 +242,7 @@ object Uniquify extends Pass { ) flatMap (recStmtToType) Seq(Field(s.name, Default, BundleType(newFields))) } - case s: DefNode => Seq(Field(s.name, Default, get_type(s))) + case s: DefNode => Seq(Field(s.name, Default, s.value.tpe)) case s: Conditionally => recStmtToType(s.conseq) ++ recStmtToType(s.alt) case s: Block => (s.stmts map (recStmtToType)).flatten case s => Seq() |