add ior/xor operators to IR::Constant (#1594)

* add ior/xor operators to IR::Constant

Author: zma-barefoot

.gitignore

@@ -26,6 +26,11 @@ build/
 .project
 .settings
 
+#vim swaps
+.*.swp
+.*.swo
+.*.swa
+
 # emacs backup
 *~
 

ir/expression.cpp

@@ -125,6 +125,20 @@ IR::Constant::operator&(const IR::Constant &c) const {
   return IR::Constant(v);
 }
 
+IR::Constant
+IR::Constant::operator|(const IR::Constant &c) const {
+  mpz_class v;
+  mpz_ior(v.get_mpz_t(), value.get_mpz_t(), c.value.get_mpz_t());
+  return IR::Constant(v);
+}
+
+IR::Constant
+IR::Constant::operator^(const IR::Constant &c) const {
+  mpz_class v;
+  mpz_xor(v.get_mpz_t(), value.get_mpz_t(), c.value.get_mpz_t());
+  return IR::Constant(v);
+}
+
 IR::Constant
 IR::Constant::operator-(const IR::Constant &c) const {
   mpz_class v;

ir/expression.def

@@ -213,6 +213,8 @@ class Constant : Literal {
     Constant operator<<(const unsigned &shift) const;
     Constant operator>>(const unsigned &shift) const;
     Constant operator&(const Constant &c) const;
+    Constant operator|(const Constant &c) const;
+    Constant operator^(const Constant &c) const;
     Constant operator-(const Constant &c) const;
     Constant operator-() const;
 #end

test/gtest/constant_expr_test.cpp

@@ -115,5 +115,30 @@ TEST_F(ConstantExpr, TestUint64) {
     EXPECT_EQ(res, val);
 }
 
+TEST_F(ConstantExpr, TestIntegerFuncs) {
+    unsigned int val1 = 0x03030303U;
+    unsigned int val2 = 0x06060606U;
+
+    IR::Constant c1(val1);
+    IR::Constant c2(val2);
+
+    auto lsh_res = c1 << 1;
+    auto rsh_res = c2 >> 1;
+    auto and_res = c1 & c2;
+    auto ior_res = c1 | c2;
+    auto xor_res = c1 ^ c2;
+    auto sub_res = c2 - c1;
+
+    EXPECT_EQ(lsh_res.asUnsigned(), 0x06060606U);
+    EXPECT_EQ(rsh_res.asUnsigned(), 0x03030303U);
+    EXPECT_EQ(and_res.asUnsigned(), 0x02020202U);
+    EXPECT_EQ(ior_res.asUnsigned(), 0x07070707U);
+    EXPECT_EQ(xor_res.asUnsigned(), 0x05050505U);
+    EXPECT_EQ(sub_res.asUnsigned(), 0x03030303U);
+
+    IR::Constant c(int(123));
+    auto neg_res = -c;
+    EXPECT_EQ(neg_res.asInt(), -123);
+}
 
 }  // namespace Test