Implement arithmetic and logical operations.
Bug swiftshader:15
Change-Id: I27f7c2b9d87841a1eae0d9bc92fbe79b28c65982
Reviewed-on: https://swiftshader-review.googlesource.com/7773
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-on: https://swiftshader-review.googlesource.com/8146
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Reactor/SubzeroReactor.cpp b/src/Reactor/SubzeroReactor.cpp
index 54a4bfa..fa55b44 100644
--- a/src/Reactor/SubzeroReactor.cpp
+++ b/src/Reactor/SubzeroReactor.cpp
@@ -2419,12 +2419,12 @@
RValue<Byte8> operator+(RValue<Byte8> lhs, RValue<Byte8> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Byte8>(V(nullptr));
+ return RValue<Byte8>(Nucleus::createAdd(lhs.value, rhs.value));
}
RValue<Byte8> operator-(RValue<Byte8> lhs, RValue<Byte8> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Byte8>(V(nullptr));
+ return RValue<Byte8>(Nucleus::createSub(lhs.value, rhs.value));
}
// RValue<Byte8> operator*(RValue<Byte8> lhs, RValue<Byte8> rhs)
@@ -2444,17 +2444,17 @@
RValue<Byte8> operator&(RValue<Byte8> lhs, RValue<Byte8> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Byte8>(V(nullptr));
+ return RValue<Byte8>(Nucleus::createAnd(lhs.value, rhs.value));
}
RValue<Byte8> operator|(RValue<Byte8> lhs, RValue<Byte8> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Byte8>(V(nullptr));
+ return RValue<Byte8>(Nucleus::createOr(lhs.value, rhs.value));
}
RValue<Byte8> operator^(RValue<Byte8> lhs, RValue<Byte8> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Byte8>(V(nullptr));
+ return RValue<Byte8>(Nucleus::createXor(lhs.value, rhs.value));
}
// RValue<Byte8> operator<<(RValue<Byte8> lhs, unsigned char rhs)
@@ -2642,12 +2642,12 @@
RValue<SByte8> operator+(RValue<SByte8> lhs, RValue<SByte8> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<SByte8>(V(nullptr));
+ return RValue<SByte8>(Nucleus::createAdd(lhs.value, rhs.value));
}
RValue<SByte8> operator-(RValue<SByte8> lhs, RValue<SByte8> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<SByte8>(V(nullptr));
+ return RValue<SByte8>(Nucleus::createSub(lhs.value, rhs.value));
}
// RValue<SByte8> operator*(RValue<SByte8> lhs, RValue<SByte8> rhs)
@@ -3007,17 +3007,17 @@
RValue<Short4> operator+(RValue<Short4> lhs, RValue<Short4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Short4>(V(nullptr));
+ return RValue<Short4>(Nucleus::createAdd(lhs.value, rhs.value));
}
RValue<Short4> operator-(RValue<Short4> lhs, RValue<Short4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Short4>(V(nullptr));
+ return RValue<Short4>(Nucleus::createSub(lhs.value, rhs.value));
}
RValue<Short4> operator*(RValue<Short4> lhs, RValue<Short4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Short4>(V(nullptr));
+ return RValue<Short4>(Nucleus::createMul(lhs.value, rhs.value));
}
// RValue<Short4> operator/(RValue<Short4> lhs, RValue<Short4> rhs)
@@ -3032,17 +3032,17 @@
RValue<Short4> operator&(RValue<Short4> lhs, RValue<Short4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Short4>(V(nullptr));
+ return RValue<Short4>(Nucleus::createAnd(lhs.value, rhs.value));
}
RValue<Short4> operator|(RValue<Short4> lhs, RValue<Short4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Short4>(V(nullptr));
+ return RValue<Short4>(Nucleus::createOr(lhs.value, rhs.value));
}
RValue<Short4> operator^(RValue<Short4> lhs, RValue<Short4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Short4>(V(nullptr));
+ return RValue<Short4>(Nucleus::createXor(lhs.value, rhs.value));
}
RValue<Short4> operator<<(RValue<Short4> lhs, unsigned char rhs)
@@ -3363,32 +3363,32 @@
RValue<UShort4> operator+(RValue<UShort4> lhs, RValue<UShort4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UShort4>(V(nullptr));
+ return RValue<Short4>(Nucleus::createAdd(lhs.value, rhs.value));
}
RValue<UShort4> operator-(RValue<UShort4> lhs, RValue<UShort4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UShort4>(V(nullptr));
+ return RValue<UShort4>(Nucleus::createSub(lhs.value, rhs.value));
}
RValue<UShort4> operator*(RValue<UShort4> lhs, RValue<UShort4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UShort4>(V(nullptr));
+ return RValue<UShort4>(Nucleus::createMul(lhs.value, rhs.value));
}
RValue<UShort4> operator&(RValue<UShort4> lhs, RValue<UShort4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UShort4>(V(nullptr));
+ return RValue<UShort4>(Nucleus::createAnd(lhs.value, rhs.value));
}
RValue<UShort4> operator|(RValue<UShort4> lhs, RValue<UShort4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UShort4>(V(nullptr));
+ return RValue<UShort4>(Nucleus::createOr(lhs.value, rhs.value));
}
RValue<UShort4> operator^(RValue<UShort4> lhs, RValue<UShort4> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UShort4>(V(nullptr));
+ return RValue<UShort4>(Nucleus::createXor(lhs.value, rhs.value));
}
RValue<UShort4> operator<<(RValue<UShort4> lhs, unsigned char rhs)
@@ -4481,12 +4481,12 @@
RValue<Int2> operator+(RValue<Int2> lhs, RValue<Int2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Int2>(V(nullptr));
+ return RValue<Int2>(Nucleus::createAdd(lhs.value, rhs.value));
}
RValue<Int2> operator-(RValue<Int2> lhs, RValue<Int2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Int2>(V(nullptr));
+ return RValue<Int2>(Nucleus::createSub(lhs.value, rhs.value));
}
// RValue<Int2> operator*(RValue<Int2> lhs, RValue<Int2> rhs)
@@ -4506,17 +4506,17 @@
RValue<Int2> operator&(RValue<Int2> lhs, RValue<Int2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Int2>(V(nullptr));
+ return RValue<Int2>(Nucleus::createAnd(lhs.value, rhs.value));
}
RValue<Int2> operator|(RValue<Int2> lhs, RValue<Int2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Int2>(V(nullptr));
+ return RValue<Int2>(Nucleus::createOr(lhs.value, rhs.value));
}
RValue<Int2> operator^(RValue<Int2> lhs, RValue<Int2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Int2>(V(nullptr));
+ return RValue<Int2>(Nucleus::createXor(lhs.value, rhs.value));
}
RValue<Int2> operator<<(RValue<Int2> lhs, unsigned char rhs)
@@ -4700,12 +4700,12 @@
RValue<UInt2> operator+(RValue<UInt2> lhs, RValue<UInt2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UInt2>(V(nullptr));
+ return RValue<UInt2>(Nucleus::createAdd(lhs.value, rhs.value));
}
RValue<UInt2> operator-(RValue<UInt2> lhs, RValue<UInt2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UInt2>(V(nullptr));
+ return RValue<UInt2>(Nucleus::createSub(lhs.value, rhs.value));
}
// RValue<UInt2> operator*(RValue<UInt2> lhs, RValue<UInt2> rhs)
@@ -4725,17 +4725,17 @@
RValue<UInt2> operator&(RValue<UInt2> lhs, RValue<UInt2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UInt2>(V(nullptr));
+ return RValue<UInt2>(Nucleus::createAnd(lhs.value, rhs.value));
}
RValue<UInt2> operator|(RValue<UInt2> lhs, RValue<UInt2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UInt2>(V(nullptr));
+ return RValue<UInt2>(Nucleus::createOr(lhs.value, rhs.value));
}
RValue<UInt2> operator^(RValue<UInt2> lhs, RValue<UInt2> rhs)
{
- assert(false && "UNIMPLEMENTED"); return RValue<UInt2>(V(nullptr));
+ return RValue<UInt2>(Nucleus::createXor(lhs.value, rhs.value));
}
RValue<UInt2> operator<<(RValue<UInt2> lhs, unsigned char rhs)
