diff options
| author | jackbackrack | 2015-04-29 08:34:31 -0700 |
|---|---|---|
| committer | jackbackrack | 2015-04-29 08:34:31 -0700 |
| commit | 23b13f098819f1eb7518cff47d83056f657003e0 (patch) | |
| tree | 3988ecf6f77f5da1e93b1e0ae589b54baa70205b /src | |
| parent | 727e95b2be9f852fd54259b7eccd85f70fd61c24 (diff) | |
change arithmetic defaults to wrap
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/Core.scala | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/main/scala/Core.scala b/src/main/scala/Core.scala index e85fb12f..7c9ccfde 100644 --- a/src/main/scala/Core.scala +++ b/src/main/scala/Core.scala @@ -584,10 +584,12 @@ abstract class Bits(dirArg: Direction, width: Int) extends Element(dirArg, width } def unary_- = bits_unop(NegOp) - def + (other: Bits) = bits_binop_pad(AddOp, other) + def +e (other: Bits) = bits_binop_pad(AddOp, other) + def + (other: Bits) = this +% other def +% (other: Bits) = bits_binop_pad(AddModOp, other) - def - (other: Bits) = bits_binop_pad(SubOp, other) + def -e (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) def / (other: Bits) = bits_binop_pad(DivideOp, other) def % (other: Bits) = bits_binop_pad(ModOp, other) @@ -712,9 +714,11 @@ class UInt(dir: Direction, width: Int) extends Bits(dir, width) with Num[UInt] { } override def unary_- = uint_unop(NegOp) - def + (other: UInt) = uint_binop_pad(AddOp, other) + def +e (other: UInt) = uint_binop_pad(AddOp, other) + def + (other: UInt) = this +% other def +% (other: UInt) = uint_binop_pad(AddModOp, other) - def - (other: UInt) = uint_binop_pad(SubOp, other) + def -e (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) def / (other: UInt) = uint_binop_pad(DivideOp, other) @@ -805,10 +809,10 @@ class SInt(dir: Direction, width: Int) extends Bits(dir, width) with Num[SInt] { } override def unary_- = sint_unop(NegOp) - def + (other: SInt) = sint_binop_pad(AddOp, other) - def +% (other: SInt) = sint_binop_pad(AddModOp, other) - def - (other: SInt) = sint_binop_pad(SubOp, other) - def -% (other: SInt) = sint_binop_pad(SubModOp, other) + def +e (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(SubModOp, other) def * (other: SInt) = sint_binop_pad(TimesOp, other) def / (other: SInt) = sint_binop_pad(DivideOp, other) def % (other: SInt) = sint_binop_pad(ModOp, other) |