diff options
| author | Donggyu Kim | 2016-08-30 16:10:26 -0700 |
|---|---|---|
| committer | Donggyu Kim | 2016-09-07 11:54:15 -0700 |
| commit | 8bb62b613956cff472cc89b28013b3f4af254224 (patch) | |
| tree | d2e9786ddc1aabc2b7e4627b8dd0be4b21b4771f /src/main/scala/firrtl/passes | |
| parent | b0d28b951ac2d443570135c4788e785756aeb457 (diff) | |
remove Utils.ONE
Diffstat (limited to 'src/main/scala/firrtl/passes')
| -rw-r--r-- | src/main/scala/firrtl/passes/Passes.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/scala/firrtl/passes/Passes.scala b/src/main/scala/firrtl/passes/Passes.scala index ae3d722a..6b6dc811 100644 --- a/src/main/scala/firrtl/passes/Passes.scala +++ b/src/main/scala/firrtl/passes/Passes.scala @@ -549,8 +549,8 @@ object InferWidths extends Pass { def get_constraints_e (e:Expression) : Expression = { (e map (get_constraints_e)) match { case (e:Mux) => { - constrain(width_BANG(e.cond),ONE) - constrain(ONE,width_BANG(e.cond)) + constrain(width_BANG(e.cond),IntWidth(1)) + constrain(IntWidth(1),width_BANG(e.cond)) e } case (e) => e }} def get_constraints (s:Statement) : Statement = { @@ -576,13 +576,13 @@ object InferWidths extends Pass { case Flip => constrain(width_BANG(expx),width_BANG(locx)) }} s } case (s:DefRegister) => { - constrain(width_BANG(s.reset),ONE) - constrain(ONE,width_BANG(s.reset)) + constrain(width_BANG(s.reset),IntWidth(1)) + constrain(IntWidth(1),width_BANG(s.reset)) get_constraints_t(s.tpe,s.init.tpe,Default) s } case (s:Conditionally) => { - v += WGeq(width_BANG(s.pred),ONE) - v += WGeq(ONE,width_BANG(s.pred)) + v += WGeq(width_BANG(s.pred),IntWidth(1)) + v += WGeq(IntWidth(1),width_BANG(s.pred)) s map (get_constraints) } case (s) => s map (get_constraints) }} |
