diff options
| author | jackbackrack | 2015-04-29 11:14:17 -0700 |
|---|---|---|
| committer | jackbackrack | 2015-04-29 11:14:17 -0700 |
| commit | 8f8c9859813aadd16011b214f58b5acc0164ef36 (patch) | |
| tree | fb40702c7faffc07060d8bc8c41db678460f0b34 /src | |
| parent | 23b13f098819f1eb7518cff47d83056f657003e0 (diff) | |
change growing arithmetic names
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/Core.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/scala/Core.scala b/src/main/scala/Core.scala index 7c9ccfde..e70d88de 100644 --- a/src/main/scala/Core.scala +++ b/src/main/scala/Core.scala @@ -584,10 +584,10 @@ abstract class Bits(dirArg: Direction, width: Int) extends Element(dirArg, width } def unary_- = bits_unop(NegOp) - def +e (other: Bits) = bits_binop_pad(AddOp, other) + def +& (other: Bits) = bits_binop_pad(AddOp, other) def + (other: Bits) = this +% other def +% (other: Bits) = bits_binop_pad(AddModOp, other) - def -e (other: Bits) = bits_binop_pad(SubOp, other) + def -& (other: Bits) = bits_binop_pad(SubOp, other) def -% (other: Bits) = bits_binop_pad(SubModOp, other) def - (other: Bits) = this -% other def * (other: Bits) = bits_binop_pad(TimesOp, other) @@ -714,10 +714,10 @@ class UInt(dir: Direction, width: Int) extends Bits(dir, width) with Num[UInt] { } override def unary_- = uint_unop(NegOp) - def +e (other: UInt) = uint_binop_pad(AddOp, other) + def +& (other: UInt) = uint_binop_pad(AddOp, other) def + (other: UInt) = this +% other def +% (other: UInt) = uint_binop_pad(AddModOp, other) - def -e (other: UInt) = uint_binop_pad(SubOp, other) + def -& (other: UInt) = uint_binop_pad(SubOp, other) def - (other: UInt) = this -% other def -% (other: UInt) = uint_binop_pad(SubModOp, other) def * (other: UInt) = uint_binop_pad(TimesOp, other) @@ -809,9 +809,9 @@ class SInt(dir: Direction, width: Int) extends Bits(dir, width) with Num[SInt] { } override def unary_- = sint_unop(NegOp) - def +e (other: SInt) = sint_binop_pad(AddOp, other) + def +& (other: SInt) = sint_binop_pad(AddOp, other) def + (other: SInt) = sint_binop_pad(AddModOp, other) - def -e (other: SInt) = sint_binop_pad(SubOp, other) + def -& (other: SInt) = sint_binop_pad(SubOp, other) def - (other: SInt) = sint_binop_pad(SubModOp, other) def * (other: SInt) = sint_binop_pad(TimesOp, other) def / (other: SInt) = sint_binop_pad(DivideOp, other) |