Merge branch 'infer-types' of github.com:ucb-bar/firrtl

1 files changed, 72 insertions, 10 deletions

diff --git a/src/main/stanza/firrtl-ir.stanza b/src/main/stanza/firrtl-ir.stanza
index 259bba10..206401d8 100644
--- a/src/main/stanza/firrtl-ir.stanza
+++ b/src/main/stanza/firrtl-ir.stanza
@@ -14,27 +14,89 @@ public defstruct IntWidth <: Width :
 
 public defstruct PrimOp
 public val ADD-OP = PrimOp()
-public val ADD-MOD-OP = PrimOp()
+public val ADD-UU-OP = PrimOp()
+public val ADD-US-OP = PrimOp()
+public val ADD-SU-OP = PrimOp()
+public val ADD-SS-OP = PrimOp()
 public val SUB-OP = PrimOp()
-public val SUB-MOD-OP = PrimOp()
+public val SUB-UU-OP = PrimOp()
+public val SUB-US-OP = PrimOp()
+public val SUB-SU-OP = PrimOp()
+public val SUB-SS-OP = PrimOp()
 public val TIMES-OP = PrimOp()
+public val TIMES-UU-OP = PrimOp()
+public val TIMES-US-OP = PrimOp()
+public val TIMES-SU-OP = PrimOp()
+public val TIMES-SS-OP = PrimOp()
 public val DIVIDE-OP = PrimOp()
+public val DIVIDE-UU-OP = PrimOp()
+public val DIVIDE-US-OP = PrimOp()
+public val DIVIDE-SU-OP = PrimOp()
+public val DIVIDE-SS-OP = PrimOp()
 public val MOD-OP = PrimOp()
-public val SHIFT-LEFT-OP = PrimOp()
-public val SHIFT-RIGHT-OP = PrimOp()
+public val MOD-UU-OP = PrimOp()
+public val MOD-US-OP = PrimOp()
+public val MOD-SU-OP = PrimOp()
+public val MOD-SS-OP = PrimOp()
+public val ADD-WRAP-OP = PrimOp()
+public val ADD-WRAP-UU-OP = PrimOp()
+public val ADD-WRAP-US-OP = PrimOp()
+public val ADD-WRAP-SU-OP = PrimOp()
+public val ADD-WRAP-SS-OP = PrimOp()
+public val SUB-WRAP-OP = PrimOp()
+public val SUB-WRAP-UU-OP = PrimOp()
+public val SUB-WRAP-US-OP = PrimOp()
+public val SUB-WRAP-SU-OP = PrimOp()
+public val SUB-WRAP-SS-OP = PrimOp()
+public val LESS-OP = PrimOp()
+public val LESS-UU-OP = PrimOp()
+public val LESS-US-OP = PrimOp()
+public val LESS-SU-OP = PrimOp()
+public val LESS-SS-OP = PrimOp()
+public val LESS-EQ-OP = PrimOp()
+public val LESS-EQ-UU-OP = PrimOp()
+public val LESS-EQ-US-OP = PrimOp()
+public val LESS-EQ-SU-OP = PrimOp()
+public val LESS-EQ-SS-OP = PrimOp()
+public val GREATER-OP = PrimOp()
+public val GREATER-UU-OP = PrimOp()
+public val GREATER-US-OP = PrimOp()
+public val GREATER-SU-OP = PrimOp()
+public val GREATER-SS-OP = PrimOp()
+public val GREATER-EQ-OP = PrimOp()
+public val GREATER-EQ-UU-OP = PrimOp()
+public val GREATER-EQ-US-OP = PrimOp()
+public val GREATER-EQ-SU-OP = PrimOp()
+public val GREATER-EQ-SS-OP = PrimOp()
+public val EQUAL-OP = PrimOp()
+public val EQUAL-UU-OP = PrimOp()
+public val EQUAL-SS-OP = PrimOp()
+public val MULTIPLEX-OP = PrimOp()
+public val MULTIPLEX-UU-OP = PrimOp()
+public val MULTIPLEX-SS-OP = PrimOp()
 public val PAD-OP = PrimOp()
+public val PAD-U-OP = PrimOp()
+public val PAD-S-OP = PrimOp()
+public val AS-UINT-OP = PrimOp()
+public val AS-UINT-U-OP = PrimOp()
+public val AS-UINT-S-OP = PrimOp()
+public val AS-SINT-OP = PrimOp()
+public val AS-SINT-U-OP = PrimOp()
+public val AS-SINT-S-OP = PrimOp()
+public val SHIFT-LEFT-OP = PrimOp()
+public val SHIFT-LEFT-U-OP = PrimOp()
+public val SHIFT-LEFT-S-OP = PrimOp()
+public val SHIFT-RIGHT-U-OP = PrimOp()
+public val SHIFT-RIGHT-S-OP = PrimOp()
+public val CONVERT-OP = PrimOp()
+public val CONVERT-U-OP = PrimOp()
+public val CONVERT-S-OP = PrimOp()
 public val BIT-AND-OP = PrimOp()
 public val BIT-OR-OP = PrimOp()
 public val BIT-XOR-OP = PrimOp()
 public val CONCAT-OP = PrimOp()
 public val BIT-SELECT-OP = PrimOp()
 public val BITS-SELECT-OP = PrimOp()
-public val MULTIPLEX-OP = PrimOp()
-public val LESS-OP = PrimOp()
-public val LESS-EQ-OP = PrimOp()
-public val GREATER-OP = PrimOp()
-public val GREATER-EQ-OP = PrimOp()
-public val EQUAL-OP = PrimOp()
 
 public definterface Expression
 public defmulti type (e:Expression) -> Type