From aa3d1adbbd1c07765cdfbf74a5b273f330952779 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Sun, 11 Nov 2018 18:51:08 -0400
Subject: [PATCH] Implemented the rest of the bitwise operations

---
 include/sirit/sirit.h | 20 +++++++++++++++
 src/insts/bit.cpp     | 59 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/include/sirit/sirit.h b/include/sirit/sirit.h
index b4429b2..e16aa04 100644
--- a/include/sirit/sirit.h
+++ b/include/sirit/sirit.h
@@ -280,10 +280,30 @@ class Module {
     /// The least-significant bits will be zero filled.
     Id OpShiftLeftLogical(Id result_type, Id base, Id shift);
 
+    /// Does a bitwise Or between operands 1 and 2.
+    Id OpBitwiseOr(Id result_type, Id operand_1, Id operand_2);
+
+    /// Does a bitwise Xor between operands 1 and 2.
+    Id OpBitwiseXor(Id result_type, Id operand_1, Id operand_2);
+
     /// Result is 1 if both Operand 1 and Operand 2 are 1. Result is 0 if either
     /// Operand 1 or Operand 2 are 0.
     Id OpBitwiseAnd(Id result_type, Id operand_1, Id operand_2);
 
+    /// Does a bitwise Not on the operand.
+    Id OpNot(Id result_type, Id operand);
+
+    Id OpBitFieldInsert(Id result_type, Id base, Id insert, Id offset,
+                        Id count);
+
+    Id OpBitFieldSExtract(Id result_type, Id base, Id offset, Id count);
+
+    Id OpBitFieldUExtract(Id result_type, Id base, Id offset, Id count);
+
+    Id OpBitReverse(Id result_type, Id base);
+
+    Id OpBitCount(Id result_type, Id base);
+
     // Arithmetic
 
     /// Floating-point subtract of Operand from zero.
diff --git a/src/insts/bit.cpp b/src/insts/bit.cpp
index 2497f21..32483fe 100644
--- a/src/insts/bit.cpp
+++ b/src/insts/bit.cpp
@@ -35,6 +35,20 @@ Id Module::OpShiftLeftLogical(Id result_type, Id base, Id shift) {
     return AddCode(std::move(op));
 }
 
+Id Module::OpBitwiseOr(Id result_type, Id operand_1, Id operand_2) {
+    auto op{std::make_unique<Op>(spv::Op::OpBitwiseOr, bound++, result_type)};
+    op->Add(operand_1);
+    op->Add(operand_2);
+    return AddCode(std::move(op));
+}
+
+Id Module::OpBitwiseXor(Id result_type, Id operand_1, Id operand_2) {
+    auto op{std::make_unique<Op>(spv::Op::OpBitwiseXor, bound++, result_type)};
+    op->Add(operand_1);
+    op->Add(operand_2);
+    return AddCode(std::move(op));
+}
+
 Id Module::OpBitwiseAnd(Id result_type, Id operand_1, Id operand_2) {
     auto op{std::make_unique<Op>(spv::Op::OpBitwiseAnd, bound++, result_type)};
     op->Add(operand_1);
@@ -42,4 +56,47 @@ Id Module::OpBitwiseAnd(Id result_type, Id operand_1, Id operand_2) {
     return AddCode(std::move(op));
 }
 
-} // namespace Sirit
\ No newline at end of file
+Id Module::OpNot(Id result_type, Id operand) {
+    auto op{std::make_unique<Op>(spv::Op::OpNot, bound++, result_type)};
+    op->Add(operand);
+    return AddCode(std::move(op));
+}
+
+Id Module::OpBitFieldInsert(Id result_type, Id base, Id insert, Id offset, Id count) {
+    auto op{std::make_unique<Op>(spv::Op::OpBitFieldInsert, bound++, result_type)};
+    op->Add(base);
+    op->Add(insert);
+    op->Add(offset);
+    op->Add(count);
+    return AddCode(std::move(op));
+}
+
+Id Module::OpBitFieldSExtract(Id result_type, Id base, Id offset, Id count) {
+    auto op{std::make_unique<Op>(spv::Op::OpBitFieldSExtract, bound++, result_type)};
+    op->Add(base);
+    op->Add(offset);
+    op->Add(count);
+    return AddCode(std::move(op));
+}
+
+Id Module::OpBitFieldUExtract(Id result_type, Id base, Id offset, Id count) {
+    auto op{std::make_unique<Op>(spv::Op::OpBitFieldUExtract, bound++, result_type)};
+    op->Add(base);
+    op->Add(offset);
+    op->Add(count);
+    return AddCode(std::move(op));
+}
+
+Id Module::OpBitReverse(Id result_type, Id base) {
+    auto op{std::make_unique<Op>(spv::Op::OpBitReverse, bound++, result_type)};
+    op->Add(base);
+    return AddCode(std::move(op));
+}
+
+Id Module::OpBitCount(Id result_type, Id base) {
+    auto op{std::make_unique<Op>(spv::Op::OpBitCount, bound++, result_type)};
+    op->Add(base);
+    return AddCode(std::move(op));
+}
+
+} // namespace Sirit