diff options
| author | jackbackrack | 2015-05-20 04:44:41 -0700 |
|---|---|---|
| committer | jackbackrack | 2015-05-20 04:44:41 -0700 |
| commit | 3918a0499ab8cb39e305e551a5ea810d9c0de49f (patch) | |
| tree | faf8bd455e07684bdeaf715e319a1b3980229bde | |
| parent | eadbae932cb44a826437ca32fac313c93b32a08a (diff) | |
make pad be op and adjust firrtl args
| -rwxr-xr-x | bin/fir2flo.sh | 2 | ||||
| -rw-r--r-- | src/main/scala/Core.scala | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/bin/fir2flo.sh b/bin/fir2flo.sh index d97036a9..57dd8e74 100755 --- a/bin/fir2flo.sh +++ b/bin/fir2flo.sh @@ -1,4 +1,4 @@ #!/bin/bash -$HOME/bar/firrtl/utils/bin/firrtl -i $1.fir -o $1.flo -x X # -p c # tkwTgc +$HOME/bar/firrtl/utils/bin/firrtl -i $1.fir -o $1.flo -X flo # -x X # -p c # tkwTgc $HOME/bar/chisel3/bin/filter < $1.flo > tmp; mv tmp $1.flo diff --git a/src/main/scala/Core.scala b/src/main/scala/Core.scala index 03fe4ac3..258e42b6 100644 --- a/src/main/scala/Core.scala +++ b/src/main/scala/Core.scala @@ -139,7 +139,7 @@ object PrimOp { val GreaterEqOp = PrimOp("geq") val EqualOp = PrimOp("eq") val PatternEqualOp = PrimOp("pattern-equal") - val PadOp = PrimOp("Pad") + val PadOp = PrimOp("pad") val NotEqualOp = PrimOp("neq") val NegOp = PrimOp("neg") val MultiplexOp = PrimOp("mux") @@ -161,13 +161,6 @@ abstract class Arg extends Immediate { def name: String } -case class Pad(val x: Immediate, val amount: Int) extends Arg { - def padIt(s: String) = "Pad(" + s + (if (amount == -1) ",?" else ("," + amount)) + ")" - def fullname: String = padIt(x.fullname) - def name: String = padIt(x.name) - override def debugName: String = padIt(x.debugName) -} - case class Alias(val id: String) extends Arg { def fullname = getRefForId(id).fullname def name = getRefForId(id).name |