OSDN Git Service

Fix Frac() returning 1.0.
[android-x86/external-swiftshader.git] / src / Reactor / LLVMReactor.cpp
index fb1cf03..d8bda70 100644 (file)
 #include "Memory.hpp"
 #include "MutexLock.hpp"
 
-#include <xmmintrin.h>
 #include <fstream>
 
+#if defined(__i386__) || defined(__x86_64__)
+#include <xmmintrin.h>
+#endif
+
 #if defined(__x86_64__) && defined(_WIN32)
 extern "C" void X86CompilationCallback()
 {
@@ -68,7 +71,7 @@ namespace
        llvm::Module *module = nullptr;
        llvm::Function *function = nullptr;
 
-       sw::BackoffLock codegenMutex;
+       sw::MutexLock codegenMutex;
 }
 
 namespace sw
@@ -79,7 +82,7 @@ namespace sw
 
        class Type : public llvm::Type {};
        class Value : public llvm::Value {};
-       class Constant : public llvm::Constant {};
+       class SwitchCases : public llvm::SwitchInst {};
        class BasicBlock : public llvm::BasicBlock {};
 
        inline Type *T(llvm::Type *t)
@@ -97,11 +100,6 @@ namespace sw
                return reinterpret_cast<std::vector<llvm::Type*>&>(t);
        }
 
-       inline Constant *C(llvm::Constant *c)
-       {
-               return reinterpret_cast<Constant*>(c);
-       }
-
        inline BasicBlock *B(llvm::BasicBlock *t)
        {
                return reinterpret_cast<BasicBlock*>(t);
@@ -292,11 +290,6 @@ namespace sw
                return ::builder->SetInsertPoint(basicBlock);
        }
 
-       BasicBlock *Nucleus::getPredecessor(BasicBlock *basicBlock)
-       {
-               return B(*pred_begin(basicBlock));
-       }
-
        void Nucleus::createFunction(Type *ReturnType, std::vector<Type*> &Params)
        {
                llvm::FunctionType *functionType = llvm::FunctionType::get(ReturnType, T(Params), false);
@@ -319,28 +312,28 @@ namespace sw
                return V(&*args);
        }
 
-       Value *Nucleus::createRetVoid()
+       void Nucleus::createRetVoid()
        {
                x86::emms();
 
-               return V(::builder->CreateRetVoid());
+               ::builder->CreateRetVoid();
        }
 
-       Value *Nucleus::createRet(Value *v)
+       void Nucleus::createRet(Value *v)
        {
                x86::emms();
 
-               return V(::builder->CreateRet(v));
+               ::builder->CreateRet(v);
        }
 
-       Value *Nucleus::createBr(BasicBlock *dest)
+       void Nucleus::createBr(BasicBlock *dest)
        {
-               return V(::builder->CreateBr(dest));
+               ::builder->CreateBr(dest);
        }
 
-       Value *Nucleus::createCondBr(Value *cond, BasicBlock *ifTrue, BasicBlock *ifFalse)
+       void Nucleus::createCondBr(Value *cond, BasicBlock *ifTrue, BasicBlock *ifFalse)
        {
-               return V(::builder->CreateCondBr(cond, ifTrue, ifFalse));
+               ::builder->CreateCondBr(cond, ifTrue, ifFalse);
        }
 
        Value *Nucleus::createAdd(Value *lhs, Value *rhs)
@@ -448,23 +441,27 @@ namespace sw
                return V(::builder->CreateNot(v));
        }
 
-       Value *Nucleus::createLoad(Value *ptr, bool isVolatile, unsigned int align)
+       Value *Nucleus::createLoad(Value *ptr, Type *type, bool isVolatile, unsigned int align)
        {
+               assert(ptr->getType()->getContainedType(0) == type);
                return V(::builder->Insert(new LoadInst(ptr, "", isVolatile, align)));
        }
 
-       Value *Nucleus::createStore(Value *value, Value *ptr, bool isVolatile, unsigned int align)
+       Value *Nucleus::createStore(Value *value, Value *ptr, Type *type, bool isVolatile, unsigned int align)
        {
-               return V(::builder->Insert(new StoreInst(value, ptr, isVolatile, align)));
+               assert(ptr->getType()->getContainedType(0) == type);
+               ::builder->Insert(new StoreInst(value, ptr, isVolatile, align));
+               return value;
        }
 
-       Value *Nucleus::createStore(Constant *constant, Value *ptr, bool isVolatile, unsigned int align)
+       Value *Nucleus::createGEP(Value *ptr, Type *type, Value *index, bool unsignedIndex)
        {
-               return V(::builder->Insert(new StoreInst(constant, ptr, isVolatile, align)));
-       }
+               if(unsignedIndex && sizeof(void*) == 8)
+               {
+                       index = createZExt(index, Long::getType());
+               }
 
-       Value *Nucleus::createGEP(Value *ptr, Value *index)
-       {
+               assert(ptr->getType()->getContainedType(0) == type);
                return V(::builder->CreateGEP(ptr, index));
        }
 
@@ -493,11 +490,6 @@ namespace sw
                return V(::builder->CreateFPToSI(v, destType));
        }
 
-       Value *Nucleus::createUIToFP(Value *v, Type *destType)
-       {
-               return V(::builder->CreateUIToFP(v, destType));
-       }
-
        Value *Nucleus::createSIToFP(Value *v, Type *destType)
        {
                return V(::builder->CreateSIToFP(v, destType));
@@ -513,26 +505,11 @@ namespace sw
                return V(::builder->CreateFPExt(v, destType));
        }
 
-       Value *Nucleus::createPtrToInt(Value *v, Type *destType)
-       {
-               return V(::builder->CreatePtrToInt(v, destType));
-       }
-
-       Value *Nucleus::createIntToPtr(Value *v, Type *destType)
-       {
-               return V(::builder->CreateIntToPtr(v, destType));
-       }
-
        Value *Nucleus::createBitCast(Value *v, Type *destType)
        {
                return V(::builder->CreateBitCast(v, destType));
        }
 
-       Value *Nucleus::createIntCast(Value *v, Type *destType, bool isSigned)
-       {
-               return V(::builder->CreateIntCast(v, destType, isSigned));
-       }
-
        Value *Nucleus::createICmpEQ(Value *lhs, Value *rhs)
        {
                return V(::builder->CreateICmpEQ(lhs, rhs));
@@ -653,8 +630,9 @@ namespace sw
                return V(::builder->CreateFCmpULE(lhs, rhs));
        }
 
-       Value *Nucleus::createExtractElement(Value *vector, int index)
+       Value *Nucleus::createExtractElement(Value *vector, Type *type, int index)
        {
+               assert(vector->getType()->getContainedType(0) == type);
                return V(::builder->CreateExtractElement(vector, createConstantInt(index)));
        }
 
@@ -663,9 +641,21 @@ namespace sw
                return V(::builder->CreateInsertElement(vector, element, createConstantInt(index)));
        }
 
-       Value *Nucleus::createShuffleVector(Value *V1, Value *V2, Value *mask)
+       Value *Nucleus::createShuffleVector(Value *V1, Value *V2, const int *select)
        {
-               return V(::builder->CreateShuffleVector(V1, V2, mask));
+               int size = llvm::cast<llvm::VectorType>(V1->getType())->getNumElements();
+               const int maxSize = 16;
+               llvm::Constant *swizzle[maxSize];
+               assert(size <= maxSize);
+
+               for(int i = 0; i < size; i++)
+               {
+                       swizzle[i] = llvm::ConstantInt::get(Type::getInt32Ty(*::context), select[i]);
+               }
+
+               llvm::Value *shuffle = llvm::ConstantVector::get(llvm::ArrayRef<llvm::Constant*>(swizzle, size));
+
+               return V(::builder->CreateShuffleVector(V1, V2, shuffle));
        }
 
        Value *Nucleus::createSelect(Value *C, Value *ifTrue, Value *ifFalse)
@@ -673,35 +663,35 @@ namespace sw
                return V(::builder->CreateSelect(C, ifTrue, ifFalse));
        }
 
-       Value *Nucleus::createSwitch(Value *v, BasicBlock *Dest, unsigned NumCases)
+       SwitchCases *Nucleus::createSwitch(Value *control, BasicBlock *defaultBranch, unsigned numCases)
        {
-               return V(::builder->CreateSwitch(v, Dest, NumCases));
+               return reinterpret_cast<SwitchCases*>(::builder->CreateSwitch(control, defaultBranch, numCases));
        }
 
-       void Nucleus::addSwitchCase(Value *Switch, int Case, BasicBlock *Branch)
+       void Nucleus::addSwitchCase(SwitchCases *switchCases, int label, BasicBlock *branch)
        {
-               reinterpret_cast<SwitchInst*>(Switch)->addCase(llvm::ConstantInt::get(Type::getInt32Ty(*::context), Case, true), Branch);
+               switchCases->addCase(llvm::ConstantInt::get(Type::getInt32Ty(*::context), label, true), branch);
        }
 
-       Value *Nucleus::createUnreachable()
+       void Nucleus::createUnreachable()
        {
-               return V(::builder->CreateUnreachable());
+               ::builder->CreateUnreachable();
        }
 
-       Value *Nucleus::createSwizzle(Value *val, unsigned char select)
+       static Value *createSwizzle4(Value *val, unsigned char select)
        {
-               Constant *swizzle[4];
-               swizzle[0] = Nucleus::createConstantInt((select >> 0) & 0x03);
-               swizzle[1] = Nucleus::createConstantInt((select >> 2) & 0x03);
-               swizzle[2] = Nucleus::createConstantInt((select >> 4) & 0x03);
-               swizzle[3] = Nucleus::createConstantInt((select >> 6) & 0x03);
-
-               Value *shuffle = Nucleus::createShuffleVector(val, V(UndefValue::get(val->getType())), V(Nucleus::createConstantVector(swizzle, 4)));
+               int swizzle[4] =
+               {
+                       (select >> 0) & 0x03,
+                       (select >> 2) & 0x03,
+                       (select >> 4) & 0x03,
+                       (select >> 6) & 0x03,
+               };
 
-               return shuffle;
+               return Nucleus::createShuffleVector(val, val, swizzle);
        }
 
-       Value *Nucleus::createMask(Value *lhs, Value *rhs, unsigned char select)
+       static Value *createMask4(Value *lhs, Value *rhs, unsigned char select)
        {
                bool mask[4] = {false, false, false, false};
 
@@ -710,33 +700,15 @@ namespace sw
                mask[(select >> 4) & 0x03] = true;
                mask[(select >> 6) & 0x03] = true;
 
-               Constant *swizzle[4];
-               swizzle[0] = Nucleus::createConstantInt(mask[0] ? 4 : 0);
-               swizzle[1] = Nucleus::createConstantInt(mask[1] ? 5 : 1);
-               swizzle[2] = Nucleus::createConstantInt(mask[2] ? 6 : 2);
-               swizzle[3] = Nucleus::createConstantInt(mask[3] ? 7 : 3);
-
-               Value *shuffle = Nucleus::createShuffleVector(lhs, rhs, V(Nucleus::createConstantVector(swizzle, 4)));
-
-               return shuffle;
-       }
-
-       Constant *Nucleus::createConstantPointer(const void *address, Type *Ty, bool isConstant, unsigned int Align)
-       {
-               const GlobalValue *existingGlobal = ::executionEngine->getGlobalValueAtAddress(const_cast<void*>(address));   // FIXME: Const
-
-               if(existingGlobal)
+               int swizzle[4] =
                {
-                       return (Constant*)existingGlobal;
-               }
-
-               llvm::GlobalValue *global = new llvm::GlobalVariable(*::module, Ty, isConstant, llvm::GlobalValue::ExternalLinkage, 0, "");
-
-               global->setAlignment(Align);
-
-               ::executionEngine->addGlobalMapping(global, const_cast<void*>(address));
+                       mask[0] ? 4 : 0,
+                       mask[1] ? 5 : 1,
+                       mask[2] ? 6 : 2,
+                       mask[3] ? 7 : 3,
+               };
 
-               return C(global);
+               return Nucleus::createShuffleVector(lhs, rhs, swizzle);
        }
 
        Type *Nucleus::getPointerType(Type *ElementType)
@@ -744,97 +716,97 @@ namespace sw
                return T(llvm::PointerType::get(ElementType, 0));
        }
 
-       Constant *Nucleus::createNullValue(Type *Ty)
+       Value *Nucleus::createNullValue(Type *Ty)
        {
-               return C(llvm::Constant::getNullValue(Ty));
+               return V(llvm::Constant::getNullValue(Ty));
        }
 
-       Constant *Nucleus::createConstantInt(int64_t i)
+       Value *Nucleus::createConstantLong(int64_t i)
        {
-               return C(llvm::ConstantInt::get(Type::getInt64Ty(*::context), i, true));
+               return V(llvm::ConstantInt::get(Type::getInt64Ty(*::context), i, true));
        }
 
-       Constant *Nucleus::createConstantInt(int i)
+       Value *Nucleus::createConstantInt(int i)
        {
-               return C(llvm::ConstantInt::get(Type::getInt32Ty(*::context), i, true));
+               return V(llvm::ConstantInt::get(Type::getInt32Ty(*::context), i, true));
        }
 
-       Constant *Nucleus::createConstantInt(unsigned int i)
+       Value *Nucleus::createConstantInt(unsigned int i)
        {
-               return C(llvm::ConstantInt::get(Type::getInt32Ty(*::context), i, false));
+               return V(llvm::ConstantInt::get(Type::getInt32Ty(*::context), i, false));
        }
 
-       Constant *Nucleus::createConstantBool(bool b)
+       Value *Nucleus::createConstantBool(bool b)
        {
-               return C(llvm::ConstantInt::get(Type::getInt1Ty(*::context), b));
+               return V(llvm::ConstantInt::get(Type::getInt1Ty(*::context), b));
        }
 
-       Constant *Nucleus::createConstantByte(signed char i)
+       Value *Nucleus::createConstantByte(signed char i)
        {
-               return C(llvm::ConstantInt::get(Type::getInt8Ty(*::context), i, true));
+               return V(llvm::ConstantInt::get(Type::getInt8Ty(*::context), i, true));
        }
 
-       Constant *Nucleus::createConstantByte(unsigned char i)
+       Value *Nucleus::createConstantByte(unsigned char i)
        {
-               return C(llvm::ConstantInt::get(Type::getInt8Ty(*::context), i, false));
+               return V(llvm::ConstantInt::get(Type::getInt8Ty(*::context), i, false));
        }
 
-       Constant *Nucleus::createConstantShort(short i)
+       Value *Nucleus::createConstantShort(short i)
        {
-               return C(llvm::ConstantInt::get(Type::getInt16Ty(*::context), i, true));
+               return V(llvm::ConstantInt::get(Type::getInt16Ty(*::context), i, true));
        }
 
-       Constant *Nucleus::createConstantShort(unsigned short i)
+       Value *Nucleus::createConstantShort(unsigned short i)
        {
-               return C(llvm::ConstantInt::get(Type::getInt16Ty(*::context), i, false));
+               return V(llvm::ConstantInt::get(Type::getInt16Ty(*::context), i, false));
        }
 
-       Constant *Nucleus::createConstantFloat(float x)
+       Value *Nucleus::createConstantFloat(float x)
        {
-               return C(ConstantFP::get(Float::getType(), x));
+               return V(llvm::ConstantFP::get(Float::getType(), x));
        }
 
-       Constant *Nucleus::createNullPointer(Type *Ty)
+       Value *Nucleus::createNullPointer(Type *Ty)
        {
-               return C(llvm::ConstantPointerNull::get(llvm::PointerType::get(Ty, 0)));
+               return V(llvm::ConstantPointerNull::get(llvm::PointerType::get(Ty, 0)));
        }
 
-       Constant *Nucleus::createConstantVector(Constant *const *Vals, unsigned NumVals)
+       Value *Nucleus::createConstantVector(const int64_t *constants, Type *type)
        {
-               return C(llvm::ConstantVector::get(llvm::ArrayRef<llvm::Constant*>(reinterpret_cast<llvm::Constant *const*>(Vals), NumVals)));
-       }
+               assert(llvm::isa<VectorType>(type));
+               const int numConstants = llvm::cast<VectorType>(type)->getNumElements();
+               assert(numConstants <= 16);
+               llvm::Constant *constantVector[16];
 
-       Type *Void::getType()
-       {
-               return T(llvm::Type::getVoidTy(*::context));
-       }
+               for(int i = 0; i < numConstants; i++)
+               {
+                       constantVector[i] = llvm::ConstantInt::get(type->getContainedType(0), constants[i]);
+               }
 
-       LValue::LValue(Type *type, int arraySize)
-       {
-               address = Nucleus::allocateStackVariable(type, arraySize);
+               return V(llvm::ConstantVector::get(llvm::ArrayRef<llvm::Constant*>(constantVector, numConstants)));
        }
 
-       Value *LValue::loadValue(unsigned int alignment) const
+       Value *Nucleus::createConstantVector(const double *constants, Type *type)
        {
-               return Nucleus::createLoad(address, false, alignment);
-       }
+               assert(llvm::isa<VectorType>(type));
+               const int numConstants = llvm::cast<VectorType>(type)->getNumElements();
+               assert(numConstants <= 8);
+               llvm::Constant *constantVector[8];
 
-       Value *LValue::storeValue(Value *value, unsigned int alignment) const
-       {
-               return Nucleus::createStore(value, address, false, alignment);
-       }
+               for(int i = 0; i < numConstants; i++)
+               {
+                       constantVector[i] = llvm::ConstantFP::get(type->getContainedType(0), constants[i]);
+               }
 
-       Value *LValue::storeValue(Constant *constant, unsigned int alignment) const
-       {
-               return Nucleus::createStore(constant, address, false, alignment);
+               return V(llvm::ConstantVector::get(llvm::ArrayRef<llvm::Constant*>(constantVector, numConstants)));
        }
 
-       Value *LValue::getAddress(Value *index) const
+       Type *Void::getType()
        {
-               return Nucleus::createGEP(address, index);
+               return T(llvm::Type::getVoidTy(*::context));
        }
 
-       class MMX : public Variable<MMX>
+       class MMX : public LValue<MMX>
        {
        public:
                static Type *getType();
@@ -850,10 +822,6 @@ namespace sw
                storeValue(argument.value);
        }
 
-       Bool::Bool()
-       {
-       }
-
        Bool::Bool(bool x)
        {
                storeValue(Nucleus::createConstantBool(x));
@@ -876,14 +844,14 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<Bool> Bool::operator=(RValue<Bool> rhs) const
+       RValue<Bool> Bool::operator=(RValue<Bool> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Bool> Bool::operator=(const Bool &rhs) const
+       RValue<Bool> Bool::operator=(const Bool &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -891,7 +859,7 @@ namespace sw
                return RValue<Bool>(value);
        }
 
-       RValue<Bool> Bool::operator=(const Reference<Bool> &rhs) const
+       RValue<Bool> Bool::operator=(const Reference<Bool> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -945,10 +913,6 @@ namespace sw
                storeValue(integer);
        }
 
-       Byte::Byte()
-       {
-       }
-
        Byte::Byte(int x)
        {
                storeValue(Nucleus::createConstantByte((unsigned char)x));
@@ -976,14 +940,14 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<Byte> Byte::operator=(RValue<Byte> rhs) const
+       RValue<Byte> Byte::operator=(RValue<Byte> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Byte> Byte::operator=(const Byte &rhs) const
+       RValue<Byte> Byte::operator=(const Byte &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -991,7 +955,7 @@ namespace sw
                return RValue<Byte>(value);
        }
 
-       RValue<Byte> Byte::operator=(const Reference<Byte> &rhs) const
+       RValue<Byte> Byte::operator=(const Reference<Byte> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -1049,52 +1013,52 @@ namespace sw
                return RValue<Byte>(Nucleus::createLShr(lhs.value, rhs.value));
        }
 
-       RValue<Byte> operator+=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator+=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Byte> operator-=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator-=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<Byte> operator*=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator*=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<Byte> operator/=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator/=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs / rhs;
        }
 
-       RValue<Byte> operator%=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator%=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs % rhs;
        }
 
-       RValue<Byte> operator&=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator&=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<Byte> operator|=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator|=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<Byte> operator^=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator^=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<Byte> operator<<=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator<<=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<Byte> operator>>=(const Byte &lhs, RValue<Byte> rhs)
+       RValue<Byte> operator>>=(Byte &lhs, RValue<Byte> rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -1114,7 +1078,7 @@ namespace sw
                return RValue<Byte>(Nucleus::createNot(val.value));
        }
 
-       RValue<Byte> operator++(const Byte &val, int)   // Post-increment
+       RValue<Byte> operator++(Byte &val, int)   // Post-increment
        {
                RValue<Byte> res = val;
 
@@ -1124,7 +1088,7 @@ namespace sw
                return res;
        }
 
-       const Byte &operator++(const Byte &val)   // Pre-increment
+       const Byte &operator++(Byte &val)   // Pre-increment
        {
                Value *inc = Nucleus::createAdd(val.loadValue(), V(Nucleus::createConstantByte((unsigned char)1)));
                val.storeValue(inc);
@@ -1132,7 +1096,7 @@ namespace sw
                return val;
        }
 
-       RValue<Byte> operator--(const Byte &val, int)   // Post-decrement
+       RValue<Byte> operator--(Byte &val, int)   // Post-decrement
        {
                RValue<Byte> res = val;
 
@@ -1142,7 +1106,7 @@ namespace sw
                return res;
        }
 
-       const Byte &operator--(const Byte &val)   // Pre-decrement
+       const Byte &operator--(Byte &val)   // Pre-decrement
        {
                Value *inc = Nucleus::createSub(val.loadValue(), V(Nucleus::createConstantByte((unsigned char)1)));
                val.storeValue(inc);
@@ -1204,10 +1168,6 @@ namespace sw
                storeValue(integer);
        }
 
-       SByte::SByte()
-       {
-       }
-
        SByte::SByte(signed char x)
        {
                storeValue(Nucleus::createConstantByte(x));
@@ -1230,14 +1190,14 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<SByte> SByte::operator=(RValue<SByte> rhs) const
+       RValue<SByte> SByte::operator=(RValue<SByte> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<SByte> SByte::operator=(const SByte &rhs) const
+       RValue<SByte> SByte::operator=(const SByte &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -1245,7 +1205,7 @@ namespace sw
                return RValue<SByte>(value);
        }
 
-       RValue<SByte> SByte::operator=(const Reference<SByte> &rhs) const
+       RValue<SByte> SByte::operator=(const Reference<SByte> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -1303,52 +1263,52 @@ namespace sw
                return RValue<SByte>(Nucleus::createAShr(lhs.value, rhs.value));
        }
 
-       RValue<SByte> operator+=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator+=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<SByte> operator-=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator-=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<SByte> operator*=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator*=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<SByte> operator/=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator/=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs / rhs;
        }
 
-       RValue<SByte> operator%=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator%=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs % rhs;
        }
 
-       RValue<SByte> operator&=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator&=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<SByte> operator|=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator|=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<SByte> operator^=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator^=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<SByte> operator<<=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator<<=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<SByte> operator>>=(const SByte &lhs, RValue<SByte> rhs)
+       RValue<SByte> operator>>=(SByte &lhs, RValue<SByte> rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -1368,7 +1328,7 @@ namespace sw
                return RValue<SByte>(Nucleus::createNot(val.value));
        }
 
-       RValue<SByte> operator++(const SByte &val, int)   // Post-increment
+       RValue<SByte> operator++(SByte &val, int)   // Post-increment
        {
                RValue<SByte> res = val;
 
@@ -1378,7 +1338,7 @@ namespace sw
                return res;
        }
 
-       const SByte &operator++(const SByte &val)   // Pre-increment
+       const SByte &operator++(SByte &val)   // Pre-increment
        {
                Value *inc = Nucleus::createAdd(val.loadValue(), V(Nucleus::createConstantByte((signed char)1)));
                val.storeValue(inc);
@@ -1386,7 +1346,7 @@ namespace sw
                return val;
        }
 
-       RValue<SByte> operator--(const SByte &val, int)   // Post-decrement
+       RValue<SByte> operator--(SByte &val, int)   // Post-decrement
        {
                RValue<SByte> res = val;
 
@@ -1396,7 +1356,7 @@ namespace sw
                return res;
        }
 
-       const SByte &operator--(const SByte &val)   // Pre-decrement
+       const SByte &operator--(SByte &val)   // Pre-decrement
        {
                Value *inc = Nucleus::createSub(val.loadValue(), V(Nucleus::createConstantByte((signed char)1)));
                val.storeValue(inc);
@@ -1451,10 +1411,6 @@ namespace sw
                storeValue(integer);
        }
 
-       Short::Short()
-       {
-       }
-
        Short::Short(short x)
        {
                storeValue(Nucleus::createConstantShort(x));
@@ -1477,14 +1433,14 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<Short> Short::operator=(RValue<Short> rhs) const
+       RValue<Short> Short::operator=(RValue<Short> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Short> Short::operator=(const Short &rhs) const
+       RValue<Short> Short::operator=(const Short &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -1492,7 +1448,7 @@ namespace sw
                return RValue<Short>(value);
        }
 
-       RValue<Short> Short::operator=(const Reference<Short> &rhs) const
+       RValue<Short> Short::operator=(const Reference<Short> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -1550,52 +1506,52 @@ namespace sw
                return RValue<Short>(Nucleus::createAShr(lhs.value, rhs.value));
        }
 
-       RValue<Short> operator+=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator+=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Short> operator-=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator-=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<Short> operator*=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator*=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<Short> operator/=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator/=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs / rhs;
        }
 
-       RValue<Short> operator%=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator%=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs % rhs;
        }
 
-       RValue<Short> operator&=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator&=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<Short> operator|=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator|=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<Short> operator^=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator^=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<Short> operator<<=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator<<=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<Short> operator>>=(const Short &lhs, RValue<Short> rhs)
+       RValue<Short> operator>>=(Short &lhs, RValue<Short> rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -1615,7 +1571,7 @@ namespace sw
                return RValue<Short>(Nucleus::createNot(val.value));
        }
 
-       RValue<Short> operator++(const Short &val, int)   // Post-increment
+       RValue<Short> operator++(Short &val, int)   // Post-increment
        {
                RValue<Short> res = val;
 
@@ -1625,7 +1581,7 @@ namespace sw
                return res;
        }
 
-       const Short &operator++(const Short &val)   // Pre-increment
+       const Short &operator++(Short &val)   // Pre-increment
        {
                Value *inc = Nucleus::createAdd(val.loadValue(), V(Nucleus::createConstantShort((short)1)));
                val.storeValue(inc);
@@ -1633,7 +1589,7 @@ namespace sw
                return val;
        }
 
-       RValue<Short> operator--(const Short &val, int)   // Post-decrement
+       RValue<Short> operator--(Short &val, int)   // Post-decrement
        {
                RValue<Short> res = val;
 
@@ -1643,7 +1599,7 @@ namespace sw
                return res;
        }
 
-       const Short &operator--(const Short &val)   // Pre-decrement
+       const Short &operator--(Short &val)   // Pre-decrement
        {
                Value *inc = Nucleus::createSub(val.loadValue(), V(Nucleus::createConstantShort((short)1)));
                val.storeValue(inc);
@@ -1705,10 +1661,6 @@ namespace sw
                storeValue(integer);
        }
 
-       UShort::UShort()
-       {
-       }
-
        UShort::UShort(unsigned short x)
        {
                storeValue(Nucleus::createConstantShort(x));
@@ -1731,14 +1683,14 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<UShort> UShort::operator=(RValue<UShort> rhs) const
+       RValue<UShort> UShort::operator=(RValue<UShort> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<UShort> UShort::operator=(const UShort &rhs) const
+       RValue<UShort> UShort::operator=(const UShort &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -1746,7 +1698,7 @@ namespace sw
                return RValue<UShort>(value);
        }
 
-       RValue<UShort> UShort::operator=(const Reference<UShort> &rhs) const
+       RValue<UShort> UShort::operator=(const Reference<UShort> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -1804,52 +1756,52 @@ namespace sw
                return RValue<UShort>(Nucleus::createLShr(lhs.value, rhs.value));
        }
 
-       RValue<UShort> operator+=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator+=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<UShort> operator-=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator-=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<UShort> operator*=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator*=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<UShort> operator/=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator/=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs / rhs;
        }
 
-       RValue<UShort> operator%=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator%=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs % rhs;
        }
 
-       RValue<UShort> operator&=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator&=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<UShort> operator|=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator|=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<UShort> operator^=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator^=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<UShort> operator<<=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator<<=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<UShort> operator>>=(const UShort &lhs, RValue<UShort> rhs)
+       RValue<UShort> operator>>=(UShort &lhs, RValue<UShort> rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -1869,7 +1821,7 @@ namespace sw
                return RValue<UShort>(Nucleus::createNot(val.value));
        }
 
-       RValue<UShort> operator++(const UShort &val, int)   // Post-increment
+       RValue<UShort> operator++(UShort &val, int)   // Post-increment
        {
                RValue<UShort> res = val;
 
@@ -1879,7 +1831,7 @@ namespace sw
                return res;
        }
 
-       const UShort &operator++(const UShort &val)   // Pre-increment
+       const UShort &operator++(UShort &val)   // Pre-increment
        {
                Value *inc = Nucleus::createAdd(val.loadValue(), V(Nucleus::createConstantShort((unsigned short)1)));
                val.storeValue(inc);
@@ -1887,7 +1839,7 @@ namespace sw
                return val;
        }
 
-       RValue<UShort> operator--(const UShort &val, int)   // Post-decrement
+       RValue<UShort> operator--(UShort &val, int)   // Post-decrement
        {
                RValue<UShort> res = val;
 
@@ -1897,7 +1849,7 @@ namespace sw
                return res;
        }
 
-       const UShort &operator--(const UShort &val)   // Pre-decrement
+       const UShort &operator--(UShort &val)   // Pre-decrement
        {
                Value *inc = Nucleus::createSub(val.loadValue(), V(Nucleus::createConstantShort((unsigned short)1)));
                val.storeValue(inc);
@@ -1940,6 +1892,17 @@ namespace sw
                return T(llvm::Type::getInt16Ty(*::context));
        }
 
+       Byte4::Byte4(RValue<Byte8> cast)
+       {
+               storeValue(Nucleus::createTrunc(Nucleus::createBitCast(cast.value, Long::getType()), Int::getType()));
+       }
+
+       Byte4::Byte4(const Reference<Byte4> &rhs)
+       {
+               Value *value = rhs.loadValue();
+               storeValue(value);
+       }
+
        Type *Byte4::getType()
        {
                #if 0
@@ -1958,78 +1921,39 @@ namespace sw
                #endif
        }
 
-       Byte8::Byte8()
-       {
-       //      xyzw.parent = this;
-       }
-
        Byte8::Byte8(uint8_t x0, uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4, uint8_t x5, uint8_t x6, uint8_t x7)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[8];
-               constantVector[0] = Nucleus::createConstantByte(x0);
-               constantVector[1] = Nucleus::createConstantByte(x1);
-               constantVector[2] = Nucleus::createConstantByte(x2);
-               constantVector[3] = Nucleus::createConstantByte(x3);
-               constantVector[4] = Nucleus::createConstantByte(x4);
-               constantVector[5] = Nucleus::createConstantByte(x5);
-               constantVector[6] = Nucleus::createConstantByte(x6);
-               constantVector[7] = Nucleus::createConstantByte(x7);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 8));
-
-               storeValue(Nucleus::createBitCast(vector, getType()));
-       }
-
-       Byte8::Byte8(int64_t x)
-       {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[8];
-               constantVector[0] = Nucleus::createConstantByte((unsigned char)(x >>  0));
-               constantVector[1] = Nucleus::createConstantByte((unsigned char)(x >>  8));
-               constantVector[2] = Nucleus::createConstantByte((unsigned char)(x >> 16));
-               constantVector[3] = Nucleus::createConstantByte((unsigned char)(x >> 24));
-               constantVector[4] = Nucleus::createConstantByte((unsigned char)(x >> 32));
-               constantVector[5] = Nucleus::createConstantByte((unsigned char)(x >> 40));
-               constantVector[6] = Nucleus::createConstantByte((unsigned char)(x >> 48));
-               constantVector[7] = Nucleus::createConstantByte((unsigned char)(x >> 56));
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 8));
+               int64_t constantVector[8] = {x0, x1, x2, x3, x4, x5, x6, x7};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(Byte::getType(), 8))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        Byte8::Byte8(RValue<Byte8> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        Byte8::Byte8(const Byte8 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Byte8::Byte8(const Reference<Byte8> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
-       RValue<Byte8> Byte8::operator=(RValue<Byte8> rhs) const
+       RValue<Byte8> Byte8::operator=(RValue<Byte8> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Byte8> Byte8::operator=(const Byte8 &rhs) const
+       RValue<Byte8> Byte8::operator=(const Byte8 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2037,7 +1961,7 @@ namespace sw
                return RValue<Byte8>(value);
        }
 
-       RValue<Byte8> Byte8::operator=(const Reference<Byte8> &rhs) const
+       RValue<Byte8> Byte8::operator=(const Reference<Byte8> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2130,52 +2054,52 @@ namespace sw
 //             return RValue<Byte8>(Nucleus::createLShr(lhs.value, rhs.value));
 //     }
 
-       RValue<Byte8> operator+=(const Byte8 &lhs, RValue<Byte8> rhs)
+       RValue<Byte8> operator+=(Byte8 &lhs, RValue<Byte8> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Byte8> operator-=(const Byte8 &lhs, RValue<Byte8> rhs)
+       RValue<Byte8> operator-=(Byte8 &lhs, RValue<Byte8> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-//     RValue<Byte8> operator*=(const Byte8 &lhs, RValue<Byte8> rhs)
+//     RValue<Byte8> operator*=(Byte8 &lhs, RValue<Byte8> rhs)
 //     {
 //             return lhs = lhs * rhs;
 //     }
 
-//     RValue<Byte8> operator/=(const Byte8 &lhs, RValue<Byte8> rhs)
+//     RValue<Byte8> operator/=(Byte8 &lhs, RValue<Byte8> rhs)
 //     {
 //             return lhs = lhs / rhs;
 //     }
 
-//     RValue<Byte8> operator%=(const Byte8 &lhs, RValue<Byte8> rhs)
+//     RValue<Byte8> operator%=(Byte8 &lhs, RValue<Byte8> rhs)
 //     {
 //             return lhs = lhs % rhs;
 //     }
 
-       RValue<Byte8> operator&=(const Byte8 &lhs, RValue<Byte8> rhs)
+       RValue<Byte8> operator&=(Byte8 &lhs, RValue<Byte8> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<Byte8> operator|=(const Byte8 &lhs, RValue<Byte8> rhs)
+       RValue<Byte8> operator|=(Byte8 &lhs, RValue<Byte8> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<Byte8> operator^=(const Byte8 &lhs, RValue<Byte8> rhs)
+       RValue<Byte8> operator^=(Byte8 &lhs, RValue<Byte8> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-//     RValue<Byte8> operator<<=(const Byte8 &lhs, RValue<Byte8> rhs)
+//     RValue<Byte8> operator<<=(Byte8 &lhs, RValue<Byte8> rhs)
 //     {
 //             return lhs = lhs << rhs;
 //     }
 
-//     RValue<Byte8> operator>>=(const Byte8 &lhs, RValue<Byte8> rhs)
+//     RValue<Byte8> operator>>=(Byte8 &lhs, RValue<Byte8> rhs)
 //     {
 //             return lhs = lhs >> rhs;
 //     }
@@ -2194,7 +2118,7 @@ namespace sw
        {
                if(CPUID::supportsMMX2())
                {
-                       return val ^ Byte8(0xFFFFFFFFFFFFFFFF);
+                       return val ^ Byte8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
                }
                else
                {
@@ -2220,6 +2144,14 @@ namespace sw
                return UnpackLow(RValue<Byte8>(byte8), RValue<Byte8>(byte8));
        }
 
+       RValue<Short4> Unpack(RValue<Byte4> x, RValue<Byte4> y)
+       {
+               Value *xx = Nucleus::createInsertElement(V(UndefValue::get(VectorType::get(Int::getType(), 2))), x.value, 0);
+               Value *yy = Nucleus::createInsertElement(V(UndefValue::get(VectorType::get(Int::getType(), 2))), y.value, 0);
+
+               return UnpackLow(As<Byte8>(xx), As<Byte8>(yy));
+       }
+
        RValue<Short4> UnpackLow(RValue<Byte8> x, RValue<Byte8> y)
        {
                if(CPUID::supportsMMX2())
@@ -2228,17 +2160,8 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[8];
-                       shuffle[0] = Nucleus::createConstantInt(0);
-                       shuffle[1] = Nucleus::createConstantInt(8);
-                       shuffle[2] = Nucleus::createConstantInt(1);
-                       shuffle[3] = Nucleus::createConstantInt(9);
-                       shuffle[4] = Nucleus::createConstantInt(2);
-                       shuffle[5] = Nucleus::createConstantInt(10);
-                       shuffle[6] = Nucleus::createConstantInt(3);
-                       shuffle[7] = Nucleus::createConstantInt(11);
-
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 8)));
+                       int shuffle[8] = {0, 8, 1, 9, 2, 10, 3, 11};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
                        return RValue<Short4>(Nucleus::createBitCast(packed, Short4::getType()));
                }
@@ -2252,17 +2175,8 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[8];
-                       shuffle[0] = Nucleus::createConstantInt(4);
-                       shuffle[1] = Nucleus::createConstantInt(12);
-                       shuffle[2] = Nucleus::createConstantInt(5);
-                       shuffle[3] = Nucleus::createConstantInt(13);
-                       shuffle[4] = Nucleus::createConstantInt(6);
-                       shuffle[5] = Nucleus::createConstantInt(14);
-                       shuffle[6] = Nucleus::createConstantInt(7);
-                       shuffle[7] = Nucleus::createConstantInt(15);
-
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 8)));
+                       int shuffle[8] = {4, 12, 5, 13, 6, 14, 7, 15};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
                        return RValue<Short4>(Nucleus::createBitCast(packed, Short4::getType()));
                }
@@ -2295,78 +2209,39 @@ namespace sw
                }
        }
 
-       SByte8::SByte8()
-       {
-       //      xyzw.parent = this;
-       }
-
        SByte8::SByte8(uint8_t x0, uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4, uint8_t x5, uint8_t x6, uint8_t x7)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[8];
-               constantVector[0] = Nucleus::createConstantByte(x0);
-               constantVector[1] = Nucleus::createConstantByte(x1);
-               constantVector[2] = Nucleus::createConstantByte(x2);
-               constantVector[3] = Nucleus::createConstantByte(x3);
-               constantVector[4] = Nucleus::createConstantByte(x4);
-               constantVector[5] = Nucleus::createConstantByte(x5);
-               constantVector[6] = Nucleus::createConstantByte(x6);
-               constantVector[7] = Nucleus::createConstantByte(x7);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 8));
-
-               storeValue(Nucleus::createBitCast(vector, getType()));
-       }
-
-       SByte8::SByte8(int64_t x)
-       {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[8];
-               constantVector[0] = Nucleus::createConstantByte((unsigned char)(x >>  0));
-               constantVector[1] = Nucleus::createConstantByte((unsigned char)(x >>  8));
-               constantVector[2] = Nucleus::createConstantByte((unsigned char)(x >> 16));
-               constantVector[3] = Nucleus::createConstantByte((unsigned char)(x >> 24));
-               constantVector[4] = Nucleus::createConstantByte((unsigned char)(x >> 32));
-               constantVector[5] = Nucleus::createConstantByte((unsigned char)(x >> 40));
-               constantVector[6] = Nucleus::createConstantByte((unsigned char)(x >> 48));
-               constantVector[7] = Nucleus::createConstantByte((unsigned char)(x >> 56));
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 8));
+               int64_t constantVector[8] = {x0, x1, x2, x3, x4, x5, x6, x7};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(SByte::getType(), 8))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        SByte8::SByte8(RValue<SByte8> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        SByte8::SByte8(const SByte8 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        SByte8::SByte8(const Reference<SByte8> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
-       RValue<SByte8> SByte8::operator=(RValue<SByte8> rhs) const
+       RValue<SByte8> SByte8::operator=(RValue<SByte8> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<SByte8> SByte8::operator=(const SByte8 &rhs) const
+       RValue<SByte8> SByte8::operator=(const SByte8 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2374,7 +2249,7 @@ namespace sw
                return RValue<SByte8>(value);
        }
 
-       RValue<SByte8> SByte8::operator=(const Reference<SByte8> &rhs) const
+       RValue<SByte8> SByte8::operator=(const Reference<SByte8> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2446,52 +2321,52 @@ namespace sw
 //             return RValue<SByte8>(Nucleus::createAShr(lhs.value, rhs.value));
 //     }
 
-       RValue<SByte8> operator+=(const SByte8 &lhs, RValue<SByte8> rhs)
+       RValue<SByte8> operator+=(SByte8 &lhs, RValue<SByte8> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<SByte8> operator-=(const SByte8 &lhs, RValue<SByte8> rhs)
+       RValue<SByte8> operator-=(SByte8 &lhs, RValue<SByte8> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-//     RValue<SByte8> operator*=(const SByte8 &lhs, RValue<SByte8> rhs)
+//     RValue<SByte8> operator*=(SByte8 &lhs, RValue<SByte8> rhs)
 //     {
 //             return lhs = lhs * rhs;
 //     }
 
-//     RValue<SByte8> operator/=(const SByte8 &lhs, RValue<SByte8> rhs)
+//     RValue<SByte8> operator/=(SByte8 &lhs, RValue<SByte8> rhs)
 //     {
 //             return lhs = lhs / rhs;
 //     }
 
-//     RValue<SByte8> operator%=(const SByte8 &lhs, RValue<SByte8> rhs)
+//     RValue<SByte8> operator%=(SByte8 &lhs, RValue<SByte8> rhs)
 //     {
 //             return lhs = lhs % rhs;
 //     }
 
-       RValue<SByte8> operator&=(const SByte8 &lhs, RValue<SByte8> rhs)
+       RValue<SByte8> operator&=(SByte8 &lhs, RValue<SByte8> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<SByte8> operator|=(const SByte8 &lhs, RValue<SByte8> rhs)
+       RValue<SByte8> operator|=(SByte8 &lhs, RValue<SByte8> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<SByte8> operator^=(const SByte8 &lhs, RValue<SByte8> rhs)
+       RValue<SByte8> operator^=(SByte8 &lhs, RValue<SByte8> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-//     RValue<SByte8> operator<<=(const SByte8 &lhs, RValue<SByte8> rhs)
+//     RValue<SByte8> operator<<=(SByte8 &lhs, RValue<SByte8> rhs)
 //     {
 //             return lhs = lhs << rhs;
 //     }
 
-//     RValue<SByte8> operator>>=(const SByte8 &lhs, RValue<SByte8> rhs)
+//     RValue<SByte8> operator>>=(SByte8 &lhs, RValue<SByte8> rhs)
 //     {
 //             return lhs = lhs >> rhs;
 //     }
@@ -2510,7 +2385,7 @@ namespace sw
        {
                if(CPUID::supportsMMX2())
                {
-                       return val ^ SByte8(0xFFFFFFFFFFFFFFFF);
+                       return val ^ SByte8(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
                }
                else
                {
@@ -2536,17 +2411,8 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[8];
-                       shuffle[0] = Nucleus::createConstantInt(0);
-                       shuffle[1] = Nucleus::createConstantInt(8);
-                       shuffle[2] = Nucleus::createConstantInt(1);
-                       shuffle[3] = Nucleus::createConstantInt(9);
-                       shuffle[4] = Nucleus::createConstantInt(2);
-                       shuffle[5] = Nucleus::createConstantInt(10);
-                       shuffle[6] = Nucleus::createConstantInt(3);
-                       shuffle[7] = Nucleus::createConstantInt(11);
-
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 8)));
+                       int shuffle[8] = {0, 8, 1, 9, 2, 10, 3, 11};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
                        return RValue<Short4>(Nucleus::createBitCast(packed, Short4::getType()));
                }
@@ -2560,17 +2426,8 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[8];
-                       shuffle[0] = Nucleus::createConstantInt(4);
-                       shuffle[1] = Nucleus::createConstantInt(12);
-                       shuffle[2] = Nucleus::createConstantInt(5);
-                       shuffle[3] = Nucleus::createConstantInt(13);
-                       shuffle[4] = Nucleus::createConstantInt(6);
-                       shuffle[5] = Nucleus::createConstantInt(14);
-                       shuffle[6] = Nucleus::createConstantInt(7);
-                       shuffle[7] = Nucleus::createConstantInt(15);
-
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 8)));
+                       int shuffle[8] = {4, 12, 5, 13, 6, 14, 7, 15};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
                        return RValue<Short4>(Nucleus::createBitCast(packed, Short4::getType()));
                }
@@ -2605,35 +2462,29 @@ namespace sw
 
        Byte16::Byte16(RValue<Byte16> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        Byte16::Byte16(const Byte16 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Byte16::Byte16(const Reference<Byte16> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
-       RValue<Byte16> Byte16::operator=(RValue<Byte16> rhs) const
+       RValue<Byte16> Byte16::operator=(RValue<Byte16> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Byte16> Byte16::operator=(const Byte16 &rhs) const
+       RValue<Byte16> Byte16::operator=(const Byte16 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2641,7 +2492,7 @@ namespace sw
                return RValue<Byte16>(value);
        }
 
-       RValue<Byte16> Byte16::operator=(const Reference<Byte16> &rhs) const
+       RValue<Byte16> Byte16::operator=(const Reference<Byte16> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2659,6 +2510,34 @@ namespace sw
                return T( VectorType::get(SByte::getType(), 16));
        }
 
+       Short2::Short2(RValue<Short4> cast)
+       {
+               storeValue(Nucleus::createTrunc(Nucleus::createBitCast(cast.value, Long::getType()), UInt::getType()));
+       }
+
+       Type *Short2::getType()
+       {
+               #if 0
+                       return T(VectorType::get(Short::getType(), 2));
+               #else
+                       return UInt::getType();   // FIXME: LLVM doesn't manipulate it as one 32-bit block
+               #endif
+       }
+
+       UShort2::UShort2(RValue<UShort4> cast)
+       {
+               storeValue(Nucleus::createTrunc(Nucleus::createBitCast(cast.value, Long::getType()), UInt::getType()));
+       }
+
+       Type *UShort2::getType()
+       {
+               #if 0
+                       return T(VectorType::get(UShort::getType(), 2));
+               #else
+                       return UInt::getType();   // FIXME: LLVM doesn't manipulate it as one 32-bit block
+               #endif
+       }
+
        Short4::Short4(RValue<Int> cast)
        {
                Value *extend = Nucleus::createZExt(cast.value, Long::getType());
@@ -2685,57 +2564,23 @@ namespace sw
                        // FIXME: Use Swizzle<Short8>
                        if(!CPUID::supportsSSSE3())
                        {
-                               Constant *pshuflw[8];
-                               pshuflw[0] = Nucleus::createConstantInt(0);
-                               pshuflw[1] = Nucleus::createConstantInt(2);
-                               pshuflw[2] = Nucleus::createConstantInt(0);
-                               pshuflw[3] = Nucleus::createConstantInt(2);
-                               pshuflw[4] = Nucleus::createConstantInt(4);
-                               pshuflw[5] = Nucleus::createConstantInt(5);
-                               pshuflw[6] = Nucleus::createConstantInt(6);
-                               pshuflw[7] = Nucleus::createConstantInt(7);
-
-                               Constant *pshufhw[8];
-                               pshufhw[0] = Nucleus::createConstantInt(0);
-                               pshufhw[1] = Nucleus::createConstantInt(1);
-                               pshufhw[2] = Nucleus::createConstantInt(2);
-                               pshufhw[3] = Nucleus::createConstantInt(3);
-                               pshufhw[4] = Nucleus::createConstantInt(4);
-                               pshufhw[5] = Nucleus::createConstantInt(6);
-                               pshufhw[6] = Nucleus::createConstantInt(4);
-                               pshufhw[7] = Nucleus::createConstantInt(6);
-
-                               Value *shuffle1 = Nucleus::createShuffleVector(short8, V(UndefValue::get(Short8::getType())), V(Nucleus::createConstantVector(pshuflw, 8)));
-                               Value *shuffle2 = Nucleus::createShuffleVector(shuffle1, V(UndefValue::get(Short8::getType())), V(Nucleus::createConstantVector(pshufhw, 8)));
+                               int pshuflw[8] = {0, 2, 0, 2, 4, 5, 6, 7};
+                               int pshufhw[8] = {0, 1, 2, 3, 4, 6, 4, 6};
+
+                               Value *shuffle1 = Nucleus::createShuffleVector(short8, short8, pshuflw);
+                               Value *shuffle2 = Nucleus::createShuffleVector(shuffle1, shuffle1, pshufhw);
                                Value *int4 = Nucleus::createBitCast(shuffle2, Int4::getType());
-                               packed = Nucleus::createSwizzle(int4, 0x88);
+                               packed = createSwizzle4(int4, 0x88);
                        }
                        else
                        {
-                               Constant *pshufb[16];
-                               pshufb[0] = Nucleus::createConstantInt(0);
-                               pshufb[1] = Nucleus::createConstantInt(1);
-                               pshufb[2] = Nucleus::createConstantInt(4);
-                               pshufb[3] = Nucleus::createConstantInt(5);
-                               pshufb[4] = Nucleus::createConstantInt(8);
-                               pshufb[5] = Nucleus::createConstantInt(9);
-                               pshufb[6] = Nucleus::createConstantInt(12);
-                               pshufb[7] = Nucleus::createConstantInt(13);
-                               pshufb[8] = Nucleus::createConstantInt(0);
-                               pshufb[9] = Nucleus::createConstantInt(1);
-                               pshufb[10] = Nucleus::createConstantInt(4);
-                               pshufb[11] = Nucleus::createConstantInt(5);
-                               pshufb[12] = Nucleus::createConstantInt(8);
-                               pshufb[13] = Nucleus::createConstantInt(9);
-                               pshufb[14] = Nucleus::createConstantInt(12);
-                               pshufb[15] = Nucleus::createConstantInt(13);
-
+                               int pshufb[16] = {0, 1, 4, 5, 8, 9, 12, 13, 0, 1, 4, 5, 8, 9, 12, 13};
                                Value *byte16 = Nucleus::createBitCast(cast.value, Byte16::getType());
-                               packed = Nucleus::createShuffleVector(byte16, V(UndefValue::get(Byte16::getType())), V(Nucleus::createConstantVector(pshufb, 16)));
+                               packed = Nucleus::createShuffleVector(byte16, byte16, pshufb);
                        }
 
                        #if 0   // FIXME: No optimal instruction selection
-                               Value *qword2 = Nucleus::createBitCast(packed, Long2::getType());
+                               Value *qword2 = Nucleus::createBitCast(packed, T(VectorType::get(Long::getType(), 2)));
                                Value *element = Nucleus::createExtractElement(qword2, 0);
                                Value *short4 = Nucleus::createBitCast(element, Short4::getType());
                        #else   // FIXME: Requires SSE
@@ -2759,91 +2604,62 @@ namespace sw
                storeValue(As<Short4>(Int2(v4i32)).value);
        }
 
-       Short4::Short4()
-       {
-       //      xyzw.parent = this;
-       }
-
        Short4::Short4(short xyzw)
        {
-               //      xyzw.parent = this;
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantShort(xyzw);
-               constantVector[1] = Nucleus::createConstantShort(xyzw);
-               constantVector[2] = Nucleus::createConstantShort(xyzw);
-               constantVector[3] = Nucleus::createConstantShort(xyzw);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 4));
+               int64_t constantVector[4] = {xyzw, xyzw, xyzw, xyzw};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(Short::getType(), 4))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        Short4::Short4(short x, short y, short z, short w)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantShort(x);
-               constantVector[1] = Nucleus::createConstantShort(y);
-               constantVector[2] = Nucleus::createConstantShort(z);
-               constantVector[3] = Nucleus::createConstantShort(w);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 4));
+               int64_t constantVector[4] = {x, y, z, w};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(Short::getType(), 4))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        Short4::Short4(RValue<Short4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        Short4::Short4(const Short4 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Short4::Short4(const Reference<Short4> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Short4::Short4(RValue<UShort4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        Short4::Short4(const UShort4 &rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.loadValue());
        }
 
        Short4::Short4(const Reference<UShort4> &rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.loadValue());
        }
 
-       RValue<Short4> Short4::operator=(RValue<Short4> rhs) const
+       RValue<Short4> Short4::operator=(RValue<Short4> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Short4> Short4::operator=(const Short4 &rhs) const
+       RValue<Short4> Short4::operator=(const Short4 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2851,7 +2667,7 @@ namespace sw
                return RValue<Short4>(value);
        }
 
-       RValue<Short4> Short4::operator=(const Reference<Short4> &rhs) const
+       RValue<Short4> Short4::operator=(const Reference<Short4> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2859,14 +2675,14 @@ namespace sw
                return RValue<Short4>(value);
        }
 
-       RValue<Short4> Short4::operator=(RValue<UShort4> rhs) const
+       RValue<Short4> Short4::operator=(RValue<UShort4> rhs)
        {
                storeValue(rhs.value);
 
                return RValue<Short4>(rhs);
        }
 
-       RValue<Short4> Short4::operator=(const UShort4 &rhs) const
+       RValue<Short4> Short4::operator=(const UShort4 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2874,7 +2690,7 @@ namespace sw
                return RValue<Short4>(value);
        }
 
-       RValue<Short4> Short4::operator=(const Reference<UShort4> &rhs) const
+       RValue<Short4> Short4::operator=(const Reference<UShort4> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -2978,76 +2794,52 @@ namespace sw
                return x86::psraw(lhs, rhs);
        }
 
-       RValue<Short4> operator<<(RValue<Short4> lhs, RValue<Long1> rhs)
-       {
-       //      return RValue<Short4>(Nucleus::createShl(lhs.value, rhs.value));
-
-               return x86::psllw(lhs, rhs);
-       }
-
-       RValue<Short4> operator>>(RValue<Short4> lhs, RValue<Long1> rhs)
-       {
-       //      return RValue<Short4>(Nucleus::createAShr(lhs.value, rhs.value));
-
-               return x86::psraw(lhs, rhs);
-       }
-
-       RValue<Short4> operator+=(const Short4 &lhs, RValue<Short4> rhs)
+       RValue<Short4> operator+=(Short4 &lhs, RValue<Short4> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Short4> operator-=(const Short4 &lhs, RValue<Short4> rhs)
+       RValue<Short4> operator-=(Short4 &lhs, RValue<Short4> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<Short4> operator*=(const Short4 &lhs, RValue<Short4> rhs)
+       RValue<Short4> operator*=(Short4 &lhs, RValue<Short4> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-//     RValue<Short4> operator/=(const Short4 &lhs, RValue<Short4> rhs)
+//     RValue<Short4> operator/=(Short4 &lhs, RValue<Short4> rhs)
 //     {
 //             return lhs = lhs / rhs;
 //     }
 
-//     RValue<Short4> operator%=(const Short4 &lhs, RValue<Short4> rhs)
+//     RValue<Short4> operator%=(Short4 &lhs, RValue<Short4> rhs)
 //     {
 //             return lhs = lhs % rhs;
 //     }
 
-       RValue<Short4> operator&=(const Short4 &lhs, RValue<Short4> rhs)
+       RValue<Short4> operator&=(Short4 &lhs, RValue<Short4> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<Short4> operator|=(const Short4 &lhs, RValue<Short4> rhs)
+       RValue<Short4> operator|=(Short4 &lhs, RValue<Short4> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<Short4> operator^=(const Short4 &lhs, RValue<Short4> rhs)
+       RValue<Short4> operator^=(Short4 &lhs, RValue<Short4> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<Short4> operator<<=(const Short4 &lhs, unsigned char rhs)
-       {
-               return lhs = lhs << rhs;
-       }
-
-       RValue<Short4> operator>>=(const Short4 &lhs, unsigned char rhs)
-       {
-               return lhs = lhs >> rhs;
-       }
-
-       RValue<Short4> operator<<=(const Short4 &lhs, RValue<Long1> rhs)
+       RValue<Short4> operator<<=(Short4 &lhs, unsigned char rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<Short4> operator>>=(const Short4 &lhs, RValue<Long1> rhs)
+       RValue<Short4> operator>>=(Short4 &lhs, unsigned char rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -3132,13 +2924,8 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[4];
-                       shuffle[0] = Nucleus::createConstantInt(0);
-                       shuffle[1] = Nucleus::createConstantInt(4);
-                       shuffle[2] = Nucleus::createConstantInt(1);
-                       shuffle[3] = Nucleus::createConstantInt(5);
-
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 4)));
+                       int shuffle[4] = {0, 4, 1, 5};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
                        return RValue<Int2>(Nucleus::createBitCast(packed, Int2::getType()));
                }
@@ -3152,13 +2939,8 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[4];
-                       shuffle[0] = Nucleus::createConstantInt(2);
-                       shuffle[1] = Nucleus::createConstantInt(6);
-                       shuffle[2] = Nucleus::createConstantInt(3);
-                       shuffle[3] = Nucleus::createConstantInt(7);
-
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 4)));
+                       int shuffle[4] = {2, 6, 3, 7};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
                        return RValue<Int2>(Nucleus::createBitCast(packed, Int2::getType()));
                }
@@ -3172,7 +2954,7 @@ namespace sw
                }
                else
                {
-                       return RValue<Short4>(Nucleus::createSwizzle(x.value, select));
+                       return RValue<Short4>(createSwizzle4(x.value, select));
                }
        }
 
@@ -3196,7 +2978,7 @@ namespace sw
                }
                else
                {
-                       return RValue<Short>(Nucleus::createExtractElement(val.value, i));
+                       return RValue<Short>(Nucleus::createExtractElement(val.value, Short::getType(), i));
                }
        }
 
@@ -3251,101 +3033,72 @@ namespace sw
 
                if(!saturate || !CPUID::supportsSSE4_1())
                {
-                       *this = Short4(Int4(int4));
+                       *this = Short4(int4);
                }
                else
                {
-                       *this = As<Short4>(Int2(As<Int4>(x86::packusdw(As<UInt4>(int4), As<UInt4>(int4)))));
+                       *this = As<Short4>(Int2(As<Int4>(x86::packusdw(int4, int4))));
                }
        }
 
-       UShort4::UShort4()
-       {
-       //      xyzw.parent = this;
-       }
-
        UShort4::UShort4(unsigned short xyzw)
        {
-               //      xyzw.parent = this;
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantShort(xyzw);
-               constantVector[1] = Nucleus::createConstantShort(xyzw);
-               constantVector[2] = Nucleus::createConstantShort(xyzw);
-               constantVector[3] = Nucleus::createConstantShort(xyzw);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 4));
+               int64_t constantVector[4] = {xyzw, xyzw, xyzw, xyzw};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(UShort::getType(), 4))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        UShort4::UShort4(unsigned short x, unsigned short y, unsigned short z, unsigned short w)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantShort(x);
-               constantVector[1] = Nucleus::createConstantShort(y);
-               constantVector[2] = Nucleus::createConstantShort(z);
-               constantVector[3] = Nucleus::createConstantShort(w);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 4));
+               int64_t constantVector[4] = {x, y, z, w};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(UShort::getType(), 4))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        UShort4::UShort4(RValue<UShort4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        UShort4::UShort4(const UShort4 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        UShort4::UShort4(const Reference<UShort4> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        UShort4::UShort4(RValue<Short4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        UShort4::UShort4(const Short4 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        UShort4::UShort4(const Reference<Short4> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
-       RValue<UShort4> UShort4::operator=(RValue<UShort4> rhs) const
+       RValue<UShort4> UShort4::operator=(RValue<UShort4> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<UShort4> UShort4::operator=(const UShort4 &rhs) const
+       RValue<UShort4> UShort4::operator=(const UShort4 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3353,7 +3106,7 @@ namespace sw
                return RValue<UShort4>(value);
        }
 
-       RValue<UShort4> UShort4::operator=(const Reference<UShort4> &rhs) const
+       RValue<UShort4> UShort4::operator=(const Reference<UShort4> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3361,14 +3114,14 @@ namespace sw
                return RValue<UShort4>(value);
        }
 
-       RValue<UShort4> UShort4::operator=(RValue<Short4> rhs) const
+       RValue<UShort4> UShort4::operator=(RValue<Short4> rhs)
        {
                storeValue(rhs.value);
 
                return RValue<UShort4>(rhs);
        }
 
-       RValue<UShort4> UShort4::operator=(const Short4 &rhs) const
+       RValue<UShort4> UShort4::operator=(const Short4 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3376,7 +3129,7 @@ namespace sw
                return RValue<UShort4>(value);
        }
 
-       RValue<UShort4> UShort4::operator=(const Reference<Short4> &rhs) const
+       RValue<UShort4> UShort4::operator=(const Reference<Short4> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3420,50 +3173,62 @@ namespace sw
                }
        }
 
-       RValue<UShort4> operator<<(RValue<UShort4> lhs, unsigned char rhs)
+       RValue<UShort4> operator&(RValue<UShort4> lhs, RValue<UShort4> rhs)
        {
-       //      return RValue<Short4>(Nucleus::createShl(lhs.value, rhs.value));
-
-               return As<UShort4>(x86::psllw(As<Short4>(lhs), rhs));
+               if(CPUID::supportsMMX2())
+               {
+                       return As<UShort4>(x86::pand(As<Short4>(lhs), As<Short4>(rhs)));
+               }
+               else
+               {
+                       return RValue<UShort4>(Nucleus::createAnd(lhs.value, rhs.value));
+               }
        }
 
-       RValue<UShort4> operator>>(RValue<UShort4> lhs, unsigned char rhs)
+       RValue<UShort4> operator|(RValue<UShort4> lhs, RValue<UShort4> rhs)
        {
-       //      return RValue<Short4>(Nucleus::createLShr(lhs.value, rhs.value));
+               if(CPUID::supportsMMX2())
+               {
+                       return As<UShort4>(x86::por(As<Short4>(lhs), As<Short4>(rhs)));
+               }
+               else
+               {
+                       return RValue<UShort4>(Nucleus::createOr(lhs.value, rhs.value));
+               }
+       }
 
-               return x86::psrlw(lhs, rhs);
+       RValue<UShort4> operator^(RValue<UShort4> lhs, RValue<UShort4> rhs)
+       {
+               if(CPUID::supportsMMX2())
+               {
+                       return As<UShort4>(x86::pxor(As<Short4>(lhs), As<Short4>(rhs)));
+               }
+               else
+               {
+                       return RValue<UShort4>(Nucleus::createXor(lhs.value, rhs.value));
+               }
        }
 
-       RValue<UShort4> operator<<(RValue<UShort4> lhs, RValue<Long1> rhs)
+       RValue<UShort4> operator<<(RValue<UShort4> lhs, unsigned char rhs)
        {
        //      return RValue<Short4>(Nucleus::createShl(lhs.value, rhs.value));
 
                return As<UShort4>(x86::psllw(As<Short4>(lhs), rhs));
        }
 
-       RValue<UShort4> operator>>(RValue<UShort4> lhs, RValue<Long1> rhs)
+       RValue<UShort4> operator>>(RValue<UShort4> lhs, unsigned char rhs)
        {
        //      return RValue<Short4>(Nucleus::createLShr(lhs.value, rhs.value));
 
                return x86::psrlw(lhs, rhs);
        }
 
-       RValue<UShort4> operator<<=(const UShort4 &lhs, unsigned char rhs)
+       RValue<UShort4> operator<<=(UShort4 &lhs, unsigned char rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<UShort4> operator>>=(const UShort4 &lhs, unsigned char rhs)
-       {
-               return lhs = lhs >> rhs;
-       }
-
-       RValue<UShort4> operator<<=(const UShort4 &lhs, RValue<Long1> rhs)
-       {
-               return lhs = lhs << rhs;
-       }
-
-       RValue<UShort4> operator>>=(const UShort4 &lhs, RValue<Long1> rhs)
+       RValue<UShort4> operator>>=(UShort4 &lhs, unsigned char rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -3527,34 +3292,25 @@ namespace sw
                }
        }
 
-       Short8::Short8(short c0, short c1, short c2, short c3, short c4, short c5, short c6, short c7)
+       Short8::Short8(short c)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[8];
-               constantVector[0] = Nucleus::createConstantShort(c0);
-               constantVector[1] = Nucleus::createConstantShort(c1);
-               constantVector[2] = Nucleus::createConstantShort(c2);
-               constantVector[3] = Nucleus::createConstantShort(c3);
-               constantVector[4] = Nucleus::createConstantShort(c4);
-               constantVector[5] = Nucleus::createConstantShort(c5);
-               constantVector[6] = Nucleus::createConstantShort(c6);
-               constantVector[7] = Nucleus::createConstantShort(c7);
+               int64_t constantVector[8] = {c, c, c, c, c, c, c, c};
+               storeValue(Nucleus::createConstantVector(constantVector, getType()));
+       }
 
-               storeValue(Nucleus::createConstantVector(constantVector, 8));
+       Short8::Short8(short c0, short c1, short c2, short c3, short c4, short c5, short c6, short c7)
+       {
+               int64_t constantVector[8] = {c0, c1, c2, c3, c4, c5, c6, c7};
+               storeValue(Nucleus::createConstantVector(constantVector, getType()));
        }
 
        Short8::Short8(RValue<Short8> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        Short8::Short8(const Reference<Short8> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
@@ -3564,7 +3320,7 @@ namespace sw
                Value *loLong = Nucleus::createBitCast(lo.value, Long::getType());
                Value *hiLong = Nucleus::createBitCast(hi.value, Long::getType());
 
-               Value *long2 = V(UndefValue::get(Long2::getType()));
+               Value *long2 = V(UndefValue::get(VectorType::get(Long::getType(), 2)));
                long2 = Nucleus::createInsertElement(long2, loLong, 0);
                long2 = Nucleus::createInsertElement(long2, hiLong, 1);
                Value *short8 = Nucleus::createBitCast(long2, Short8::getType());
@@ -3620,34 +3376,25 @@ namespace sw
                return T(VectorType::get(Short::getType(), 8));
        }
 
-       UShort8::UShort8(unsigned short c0, unsigned short c1, unsigned short c2, unsigned short c3, unsigned short c4, unsigned short c5, unsigned short c6, unsigned short c7)
+       UShort8::UShort8(unsigned short c)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[8];
-               constantVector[0] = Nucleus::createConstantShort(c0);
-               constantVector[1] = Nucleus::createConstantShort(c1);
-               constantVector[2] = Nucleus::createConstantShort(c2);
-               constantVector[3] = Nucleus::createConstantShort(c3);
-               constantVector[4] = Nucleus::createConstantShort(c4);
-               constantVector[5] = Nucleus::createConstantShort(c5);
-               constantVector[6] = Nucleus::createConstantShort(c6);
-               constantVector[7] = Nucleus::createConstantShort(c7);
+               int64_t constantVector[8] = {c, c, c, c, c, c, c, c};
+               storeValue(Nucleus::createConstantVector(constantVector, getType()));
+       }
 
-               storeValue(Nucleus::createConstantVector(constantVector, 8));
+       UShort8::UShort8(unsigned short c0, unsigned short c1, unsigned short c2, unsigned short c3, unsigned short c4, unsigned short c5, unsigned short c6, unsigned short c7)
+       {
+               int64_t constantVector[8] = {c0, c1, c2, c3, c4, c5, c6, c7};
+               storeValue(Nucleus::createConstantVector(constantVector, getType()));
        }
 
        UShort8::UShort8(RValue<UShort8> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        UShort8::UShort8(const Reference<UShort8> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
@@ -3657,7 +3404,7 @@ namespace sw
                Value *loLong = Nucleus::createBitCast(lo.value, Long::getType());
                Value *hiLong = Nucleus::createBitCast(hi.value, Long::getType());
 
-               Value *long2 = V(UndefValue::get(Long2::getType()));
+               Value *long2 = V(UndefValue::get(VectorType::get(Long::getType(), 2)));
                long2 = Nucleus::createInsertElement(long2, loLong, 0);
                long2 = Nucleus::createInsertElement(long2, hiLong, 1);
                Value *short8 = Nucleus::createBitCast(long2, Short8::getType());
@@ -3665,14 +3412,14 @@ namespace sw
                storeValue(short8);
        }
 
-       RValue<UShort8> UShort8::operator=(RValue<UShort8> rhs) const
+       RValue<UShort8> UShort8::operator=(RValue<UShort8> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<UShort8> UShort8::operator=(const UShort8 &rhs) const
+       RValue<UShort8> UShort8::operator=(const UShort8 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3680,7 +3427,7 @@ namespace sw
                return RValue<UShort8>(value);
        }
 
-       RValue<UShort8> UShort8::operator=(const Reference<UShort8> &rhs) const
+       RValue<UShort8> UShort8::operator=(const Reference<UShort8> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3713,7 +3460,7 @@ namespace sw
                return RValue<UShort8>(Nucleus::createMul(lhs.value, rhs.value));
        }
 
-       RValue<UShort8> operator+=(const UShort8 &lhs, RValue<UShort8> rhs)
+       RValue<UShort8> operator+=(UShort8 &lhs, RValue<UShort8> rhs)
        {
                return lhs = lhs + rhs;
        }
@@ -3725,26 +3472,28 @@ namespace sw
 
        RValue<UShort8> Swizzle(RValue<UShort8> x, char select0, char select1, char select2, char select3, char select4, char select5, char select6, char select7)
        {
-               Constant *pshufb[16];
-               pshufb[0] = Nucleus::createConstantInt(select0 + 0);
-               pshufb[1] = Nucleus::createConstantInt(select0 + 1);
-               pshufb[2] = Nucleus::createConstantInt(select1 + 0);
-               pshufb[3] = Nucleus::createConstantInt(select1 + 1);
-               pshufb[4] = Nucleus::createConstantInt(select2 + 0);
-               pshufb[5] = Nucleus::createConstantInt(select2 + 1);
-               pshufb[6] = Nucleus::createConstantInt(select3 + 0);
-               pshufb[7] = Nucleus::createConstantInt(select3 + 1);
-               pshufb[8] = Nucleus::createConstantInt(select4 + 0);
-               pshufb[9] = Nucleus::createConstantInt(select4 + 1);
-               pshufb[10] = Nucleus::createConstantInt(select5 + 0);
-               pshufb[11] = Nucleus::createConstantInt(select5 + 1);
-               pshufb[12] = Nucleus::createConstantInt(select6 + 0);
-               pshufb[13] = Nucleus::createConstantInt(select6 + 1);
-               pshufb[14] = Nucleus::createConstantInt(select7 + 0);
-               pshufb[15] = Nucleus::createConstantInt(select7 + 1);
+               int pshufb[16] =
+               {
+                       select0 + 0,
+                       select0 + 1,
+                       select1 + 0,
+                       select1 + 1,
+                       select2 + 0,
+                       select2 + 1,
+                       select3 + 0,
+                       select3 + 1,
+                       select4 + 0,
+                       select4 + 1,
+                       select5 + 0,
+                       select5 + 1,
+                       select6 + 0,
+                       select6 + 1,
+                       select7 + 0,
+                       select7 + 1,
+               };
 
                Value *byte16 = Nucleus::createBitCast(x.value, Byte16::getType());
-               Value *shuffle = Nucleus::createShuffleVector(byte16, V(UndefValue::get(Byte16::getType())), V(Nucleus::createConstantVector(pshufb, 16)));
+               Value *shuffle = Nucleus::createShuffleVector(byte16, byte16, pshufb);
                Value *short8 = Nucleus::createBitCast(shuffle, UShort8::getType());
 
                return RValue<UShort8>(short8);
@@ -3755,33 +3504,6 @@ namespace sw
                return x86::pmulhuw(x, y);   // FIXME: Fallback required
        }
 
-       // FIXME: Implement as Shuffle(x, y, Select(i0, ..., i16)) and Shuffle(x, y, SELECT_PACK_REPEAT(element))
-//     RValue<UShort8> PackRepeat(RValue<Byte16> x, RValue<Byte16> y, int element)
-//     {
-//             Constant *pshufb[16];
-//             pshufb[0] = Nucleus::createConstantInt(element + 0);
-//             pshufb[1] = Nucleus::createConstantInt(element + 0);
-//             pshufb[2] = Nucleus::createConstantInt(element + 4);
-//             pshufb[3] = Nucleus::createConstantInt(element + 4);
-//             pshufb[4] = Nucleus::createConstantInt(element + 8);
-//             pshufb[5] = Nucleus::createConstantInt(element + 8);
-//             pshufb[6] = Nucleus::createConstantInt(element + 12);
-//             pshufb[7] = Nucleus::createConstantInt(element + 12);
-//             pshufb[8] = Nucleus::createConstantInt(element + 16);
-//             pshufb[9] = Nucleus::createConstantInt(element + 16);
-//             pshufb[10] = Nucleus::createConstantInt(element + 20);
-//             pshufb[11] = Nucleus::createConstantInt(element + 20);
-//             pshufb[12] = Nucleus::createConstantInt(element + 24);
-//             pshufb[13] = Nucleus::createConstantInt(element + 24);
-//             pshufb[14] = Nucleus::createConstantInt(element + 28);
-//             pshufb[15] = Nucleus::createConstantInt(element + 28);
-//
-//             Value *shuffle = Nucleus::createShuffleVector(x.value, y.value, Nucleus::createConstantVector(pshufb, 16));
-//             Value *short8 = Nucleus::createBitCast(shuffle, UShort8::getType());
-//
-//             return RValue<UShort8>(short8);
-//     }
-
        Type *UShort8::getType()
        {
                return T(VectorType::get(UShort::getType(), 8));
@@ -3839,10 +3561,6 @@ namespace sw
                storeValue(integer);
        }
 
-       Int::Int()
-       {
-       }
-
        Int::Int(int x)
        {
                storeValue(Nucleus::createConstantInt(x));
@@ -3882,26 +3600,26 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<Int> Int::operator=(int rhs) const
+       RValue<Int> Int::operator=(int rhs)
        {
                return RValue<Int>(storeValue(Nucleus::createConstantInt(rhs)));
        }
 
-       RValue<Int> Int::operator=(RValue<Int> rhs) const
+       RValue<Int> Int::operator=(RValue<Int> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Int> Int::operator=(RValue<UInt> rhs) const
+       RValue<Int> Int::operator=(RValue<UInt> rhs)
        {
                storeValue(rhs.value);
 
                return RValue<Int>(rhs);
        }
 
-       RValue<Int> Int::operator=(const Int &rhs) const
+       RValue<Int> Int::operator=(const Int &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3909,7 +3627,7 @@ namespace sw
                return RValue<Int>(value);
        }
 
-       RValue<Int> Int::operator=(const Reference<Int> &rhs) const
+       RValue<Int> Int::operator=(const Reference<Int> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3917,7 +3635,7 @@ namespace sw
                return RValue<Int>(value);
        }
 
-       RValue<Int> Int::operator=(const UInt &rhs) const
+       RValue<Int> Int::operator=(const UInt &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3925,7 +3643,7 @@ namespace sw
                return RValue<Int>(value);
        }
 
-       RValue<Int> Int::operator=(const Reference<UInt> &rhs) const
+       RValue<Int> Int::operator=(const Reference<UInt> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -3983,52 +3701,52 @@ namespace sw
                return RValue<Int>(Nucleus::createAShr(lhs.value, rhs.value));
        }
 
-       RValue<Int> operator+=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator+=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Int> operator-=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator-=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<Int> operator*=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator*=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<Int> operator/=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator/=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs / rhs;
        }
 
-       RValue<Int> operator%=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator%=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs % rhs;
        }
 
-       RValue<Int> operator&=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator&=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<Int> operator|=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator|=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<Int> operator^=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator^=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<Int> operator<<=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator<<=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<Int> operator>>=(const Int &lhs, RValue<Int> rhs)
+       RValue<Int> operator>>=(Int &lhs, RValue<Int> rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -4048,7 +3766,7 @@ namespace sw
                return RValue<Int>(Nucleus::createNot(val.value));
        }
 
-       RValue<Int> operator++(const Int &val, int)   // Post-increment
+       RValue<Int> operator++(Int &val, int)   // Post-increment
        {
                RValue<Int> res = val;
 
@@ -4058,7 +3776,7 @@ namespace sw
                return res;
        }
 
-       const Int &operator++(const Int &val)   // Pre-increment
+       const Int &operator++(Int &val)   // Pre-increment
        {
                Value *inc = Nucleus::createAdd(val.loadValue(), V(Nucleus::createConstantInt(1)));
                val.storeValue(inc);
@@ -4066,7 +3784,7 @@ namespace sw
                return val;
        }
 
-       RValue<Int> operator--(const Int &val, int)   // Post-decrement
+       RValue<Int> operator--(Int &val, int)   // Post-decrement
        {
                RValue<Int> res = val;
 
@@ -4076,7 +3794,7 @@ namespace sw
                return res;
        }
 
-       const Int &operator--(const Int &val)   // Pre-decrement
+       const Int &operator--(Int &val)   // Pre-decrement
        {
                Value *inc = Nucleus::createSub(val.loadValue(), V(Nucleus::createConstantInt(1)));
                val.storeValue(inc);
@@ -4155,28 +3873,24 @@ namespace sw
                storeValue(integer);
        }
 
-       Long::Long()
-       {
-       }
-
        Long::Long(RValue<Long> rhs)
        {
                storeValue(rhs.value);
        }
 
-       RValue<Long> Long::operator=(int64_t rhs) const
+       RValue<Long> Long::operator=(int64_t rhs)
        {
-               return RValue<Long>(storeValue(Nucleus::createConstantInt(rhs)));
+               return RValue<Long>(storeValue(Nucleus::createConstantLong(rhs)));
        }
 
-       RValue<Long> Long::operator=(RValue<Long> rhs) const
+       RValue<Long> Long::operator=(RValue<Long> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Long> Long::operator=(const Long &rhs) const
+       RValue<Long> Long::operator=(const Long &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4184,7 +3898,7 @@ namespace sw
                return RValue<Long>(value);
        }
 
-       RValue<Long> Long::operator=(const Reference<Long> &rhs) const
+       RValue<Long> Long::operator=(const Reference<Long> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4202,12 +3916,12 @@ namespace sw
                return RValue<Long>(Nucleus::createSub(lhs.value, rhs.value));
        }
 
-       RValue<Long> operator+=(const Long &lhs, RValue<Long> rhs)
+       RValue<Long> operator+=(Long &lhs, RValue<Long> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Long> operator-=(const Long &lhs, RValue<Long> rhs)
+       RValue<Long> operator-=(Long &lhs, RValue<Long> rhs)
        {
                return lhs = lhs - rhs;
        }
@@ -4222,47 +3936,6 @@ namespace sw
                return T(llvm::Type::getInt64Ty(*::context));
        }
 
-       Long1::Long1(const RValue<UInt> cast)
-       {
-               Value *undefCast = Nucleus::createInsertElement(V(UndefValue::get(VectorType::get(Int::getType(), 2))), cast.value, 0);
-               Value *zeroCast = Nucleus::createInsertElement(undefCast, V(Nucleus::createConstantInt(0)), 1);
-
-               storeValue(Nucleus::createBitCast(zeroCast, Long1::getType()));
-       }
-
-       Long1::Long1(RValue<Long1> rhs)
-       {
-               storeValue(rhs.value);
-       }
-
-       Type *Long1::getType()
-       {
-               if(CPUID::supportsMMX2())
-               {
-                       return MMX::getType();
-               }
-               else
-               {
-                       return T(VectorType::get(Long::getType(), 1));
-               }
-       }
-
-       RValue<Long2> UnpackHigh(RValue<Long2> x, RValue<Long2> y)
-       {
-               Constant *shuffle[2];
-               shuffle[0] = Nucleus::createConstantInt(1);
-               shuffle[1] = Nucleus::createConstantInt(3);
-
-               Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 2)));
-
-               return RValue<Long2>(packed);
-       }
-
-       Type *Long2::getType()
-       {
-               return T(VectorType::get(Long::getType(), 2));
-       }
-
        UInt::UInt(Argument<UInt> argument)
        {
                storeValue(argument.value);
@@ -4301,10 +3974,6 @@ namespace sw
                                Int(cast))).value);
        }
 
-       UInt::UInt()
-       {
-       }
-
        UInt::UInt(int x)
        {
                storeValue(Nucleus::createConstantInt(x));
@@ -4349,26 +4018,26 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<UInt> UInt::operator=(unsigned int rhs) const
+       RValue<UInt> UInt::operator=(unsigned int rhs)
        {
                return RValue<UInt>(storeValue(Nucleus::createConstantInt(rhs)));
        }
 
-       RValue<UInt> UInt::operator=(RValue<UInt> rhs) const
+       RValue<UInt> UInt::operator=(RValue<UInt> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<UInt> UInt::operator=(RValue<Int> rhs) const
+       RValue<UInt> UInt::operator=(RValue<Int> rhs)
        {
                storeValue(rhs.value);
 
                return RValue<UInt>(rhs);
        }
 
-       RValue<UInt> UInt::operator=(const UInt &rhs) const
+       RValue<UInt> UInt::operator=(const UInt &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4376,7 +4045,7 @@ namespace sw
                return RValue<UInt>(value);
        }
 
-       RValue<UInt> UInt::operator=(const Reference<UInt> &rhs) const
+       RValue<UInt> UInt::operator=(const Reference<UInt> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4384,7 +4053,7 @@ namespace sw
                return RValue<UInt>(value);
        }
 
-       RValue<UInt> UInt::operator=(const Int &rhs) const
+       RValue<UInt> UInt::operator=(const Int &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4392,7 +4061,7 @@ namespace sw
                return RValue<UInt>(value);
        }
 
-       RValue<UInt> UInt::operator=(const Reference<Int> &rhs) const
+       RValue<UInt> UInt::operator=(const Reference<Int> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4450,52 +4119,52 @@ namespace sw
                return RValue<UInt>(Nucleus::createLShr(lhs.value, rhs.value));
        }
 
-       RValue<UInt> operator+=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator+=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<UInt> operator-=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator-=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<UInt> operator*=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator*=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<UInt> operator/=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator/=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs / rhs;
        }
 
-       RValue<UInt> operator%=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator%=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs % rhs;
        }
 
-       RValue<UInt> operator&=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator&=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<UInt> operator|=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator|=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<UInt> operator^=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator^=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<UInt> operator<<=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator<<=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<UInt> operator>>=(const UInt &lhs, RValue<UInt> rhs)
+       RValue<UInt> operator>>=(UInt &lhs, RValue<UInt> rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -4515,7 +4184,7 @@ namespace sw
                return RValue<UInt>(Nucleus::createNot(val.value));
        }
 
-       RValue<UInt> operator++(const UInt &val, int)   // Post-increment
+       RValue<UInt> operator++(UInt &val, int)   // Post-increment
        {
                RValue<UInt> res = val;
 
@@ -4525,7 +4194,7 @@ namespace sw
                return res;
        }
 
-       const UInt &operator++(const UInt &val)   // Pre-increment
+       const UInt &operator++(UInt &val)   // Pre-increment
        {
                Value *inc = Nucleus::createAdd(val.loadValue(), V(Nucleus::createConstantInt(1)));
                val.storeValue(inc);
@@ -4533,7 +4202,7 @@ namespace sw
                return val;
        }
 
-       RValue<UInt> operator--(const UInt &val, int)   // Post-decrement
+       RValue<UInt> operator--(UInt &val, int)   // Post-decrement
        {
                RValue<UInt> res = val;
 
@@ -4543,7 +4212,7 @@ namespace sw
                return res;
        }
 
-       const UInt &operator--(const UInt &val)   // Pre-decrement
+       const UInt &operator--(UInt &val)   // Pre-decrement
        {
                Value *inc = Nucleus::createSub(val.loadValue(), V(Nucleus::createConstantInt(1)));
                val.storeValue(inc);
@@ -4613,60 +4282,42 @@ namespace sw
 //             Value *extend = Nucleus::createZExt(cast.value, Long::getType());
 //             Value *vector = Nucleus::createBitCast(extend, Int2::getType());
 //
-//             Constant *shuffle[2];
-//             shuffle[0] = Nucleus::createConstantInt(0);
-//             shuffle[1] = Nucleus::createConstantInt(0);
-//
-//             Value *replicate = Nucleus::createShuffleVector(vector, UndefValue::get(Int2::getType()), Nucleus::createConstantVector(shuffle, 2));
+//             int shuffle[2] = {0, 0};
+//             Value *replicate = Nucleus::createShuffleVector(vector, vector, shuffle);
 //
 //             storeValue(replicate);
 //     }
 
        Int2::Int2(RValue<Int4> cast)
        {
-               Value *long2 = Nucleus::createBitCast(cast.value, Long2::getType());
-               Value *element = Nucleus::createExtractElement(long2, 0);
+               Value *long2 = Nucleus::createBitCast(cast.value, T(VectorType::get(Long::getType(), 2)));
+               Value *element = Nucleus::createExtractElement(long2, Long::getType(), 0);
                Value *int2 = Nucleus::createBitCast(element, Int2::getType());
 
                storeValue(int2);
        }
 
-       Int2::Int2()
-       {
-       //      xy.parent = this;
-       }
-
        Int2::Int2(int x, int y)
        {
-       //      xy.parent = this;
-
-               Constant *constantVector[2];
-               constantVector[0] = Nucleus::createConstantInt(x);
-               constantVector[1] = Nucleus::createConstantInt(y);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 2));
+               int64_t constantVector[2] = {x, y};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(Int::getType(), 2))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        Int2::Int2(RValue<Int2> rhs)
        {
-       //      xy.parent = this;
-
                storeValue(rhs.value);
        }
 
        Int2::Int2(const Int2 &rhs)
        {
-       //      xy.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Int2::Int2(const Reference<Int2> &rhs)
        {
-       //      xy.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
@@ -4678,28 +4329,31 @@ namespace sw
                        // movd mm0, lo
                        // movd mm1, hi
                        // punpckldq mm0, mm1
-                       storeValue(As<Int2>(UnpackLow(As<Int2>(Long1(RValue<UInt>(lo))), As<Int2>(Long1(RValue<UInt>(hi))))).value);
+
+                       Value *loLong = Nucleus::createInsertElement(V(UndefValue::get(VectorType::get(Int::getType(), 2))), lo.value, 0);
+                       loLong = Nucleus::createInsertElement(loLong, V(ConstantInt::get(Int::getType(), 0)), 1);
+                       Value *hiLong = Nucleus::createInsertElement(V(UndefValue::get(VectorType::get(Int::getType(), 2))), hi.value, 0);
+                       hiLong = Nucleus::createInsertElement(hiLong, V(ConstantInt::get(Int::getType(), 0)), 1);
+
+                       storeValue(As<Int2>(UnpackLow(As<Int2>(loLong), As<Int2>(hiLong))).value);
                }
                else
                {
-                       Constant *shuffle[2];
-                       shuffle[0] = Nucleus::createConstantInt(0);
-                       shuffle[1] = Nucleus::createConstantInt(1);
-
-                       Value *packed = Nucleus::createShuffleVector(Nucleus::createBitCast(lo.value, T(VectorType::get(Int::getType(), 1))), Nucleus::createBitCast(hi.value, T(VectorType::get(Int::getType(), 1))), V(Nucleus::createConstantVector(shuffle, 2)));
+                       int shuffle[2] = {0, 1};
+                       Value *packed = Nucleus::createShuffleVector(Nucleus::createBitCast(lo.value, T(VectorType::get(Int::getType(), 1))), Nucleus::createBitCast(hi.value, T(VectorType::get(Int::getType(), 1))), shuffle);
 
                        storeValue(Nucleus::createBitCast(packed, Int2::getType()));
                }
        }
 
-       RValue<Int2> Int2::operator=(RValue<Int2> rhs) const
+       RValue<Int2> Int2::operator=(RValue<Int2> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Int2> Int2::operator=(const Int2 &rhs) const
+       RValue<Int2> Int2::operator=(const Int2 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4707,7 +4361,7 @@ namespace sw
                return RValue<Int2>(value);
        }
 
-       RValue<Int2> Int2::operator=(const Reference<Int2> &rhs) const
+       RValue<Int2> Int2::operator=(const Reference<Int2> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -4804,76 +4458,52 @@ namespace sw
                return x86::psrad(lhs, rhs);
        }
 
-       RValue<Int2> operator<<(RValue<Int2> lhs, RValue<Long1> rhs)
-       {
-       //      return RValue<Int2>(Nucleus::createShl(lhs.value, rhs.value));
-
-               return x86::pslld(lhs, rhs);
-       }
-
-       RValue<Int2> operator>>(RValue<Int2> lhs, RValue<Long1> rhs)
-       {
-       //      return RValue<Int2>(Nucleus::createAShr(lhs.value, rhs.value));
-
-               return x86::psrad(lhs, rhs);
-       }
-
-       RValue<Int2> operator+=(const Int2 &lhs, RValue<Int2> rhs)
+       RValue<Int2> operator+=(Int2 &lhs, RValue<Int2> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Int2> operator-=(const Int2 &lhs, RValue<Int2> rhs)
+       RValue<Int2> operator-=(Int2 &lhs, RValue<Int2> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-//     RValue<Int2> operator*=(const Int2 &lhs, RValue<Int2> rhs)
+//     RValue<Int2> operator*=(Int2 &lhs, RValue<Int2> rhs)
 //     {
 //             return lhs = lhs * rhs;
 //     }
 
-//     RValue<Int2> operator/=(const Int2 &lhs, RValue<Int2> rhs)
+//     RValue<Int2> operator/=(Int2 &lhs, RValue<Int2> rhs)
 //     {
 //             return lhs = lhs / rhs;
 //     }
 
-//     RValue<Int2> operator%=(const Int2 &lhs, RValue<Int2> rhs)
+//     RValue<Int2> operator%=(Int2 &lhs, RValue<Int2> rhs)
 //     {
 //             return lhs = lhs % rhs;
 //     }
 
-       RValue<Int2> operator&=(const Int2 &lhs, RValue<Int2> rhs)
+       RValue<Int2> operator&=(Int2 &lhs, RValue<Int2> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<Int2> operator|=(const Int2 &lhs, RValue<Int2> rhs)
+       RValue<Int2> operator|=(Int2 &lhs, RValue<Int2> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<Int2> operator^=(const Int2 &lhs, RValue<Int2> rhs)
+       RValue<Int2> operator^=(Int2 &lhs, RValue<Int2> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<Int2> operator<<=(const Int2 &lhs, unsigned char rhs)
+       RValue<Int2> operator<<=(Int2 &lhs, unsigned char rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<Int2> operator>>=(const Int2 &lhs, unsigned char rhs)
-       {
-               return lhs = lhs >> rhs;
-       }
-
-       RValue<Int2> operator<<=(const Int2 &lhs, RValue<Long1> rhs)
-       {
-               return lhs = lhs << rhs;
-       }
-
-       RValue<Int2> operator>>=(const Int2 &lhs, RValue<Long1> rhs)
+       RValue<Int2> operator>>=(Int2 &lhs, unsigned char rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -4900,7 +4530,7 @@ namespace sw
                }
        }
 
-       RValue<Long1> UnpackLow(RValue<Int2> x, RValue<Int2> y)
+       RValue<Short4> UnpackLow(RValue<Int2> x, RValue<Int2> y)
        {
                if(CPUID::supportsMMX2())
                {
@@ -4908,17 +4538,14 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[2];
-                       shuffle[0] = Nucleus::createConstantInt(0);
-                       shuffle[1] = Nucleus::createConstantInt(2);
+                       int shuffle[2] = {0, 2};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 2)));
-
-                       return RValue<Long1>(Nucleus::createBitCast(packed, Long1::getType()));
+                       return As<Short4>(packed);
                }
        }
 
-       RValue<Long1> UnpackHigh(RValue<Int2> x, RValue<Int2> y)
+       RValue<Short4> UnpackHigh(RValue<Int2> x, RValue<Int2> y)
        {
                if(CPUID::supportsMMX2())
                {
@@ -4926,13 +4553,10 @@ namespace sw
                }
                else
                {
-                       Constant *shuffle[2];
-                       shuffle[0] = Nucleus::createConstantInt(1);
-                       shuffle[1] = Nucleus::createConstantInt(3);
-
-                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 2)));
+                       int shuffle[2] = {1, 3};
+                       Value *packed = Nucleus::createShuffleVector(x.value, y.value, shuffle);
 
-                       return RValue<Long1>(Nucleus::createBitCast(packed, Long1::getType()));
+                       return As<Short4>(packed);
                }
        }
 
@@ -4940,13 +4564,13 @@ namespace sw
        {
                if(false)   // FIXME: LLVM does not generate optimal code
                {
-                       return RValue<Int>(Nucleus::createExtractElement(val.value, i));
+                       return RValue<Int>(Nucleus::createExtractElement(val.value, Int::getType(), i));
                }
                else
                {
                        if(i == 0)
                        {
-                               return RValue<Int>(Nucleus::createExtractElement(Nucleus::createBitCast(val.value, T(VectorType::get(Int::getType(), 2))), 0));
+                               return RValue<Int>(Nucleus::createExtractElement(Nucleus::createBitCast(val.value, T(VectorType::get(Int::getType(), 2))), Int::getType(), 0));
                        }
                        else
                        {
@@ -4974,54 +4598,39 @@ namespace sw
                }
        }
 
-       UInt2::UInt2()
-       {
-       //      xy.parent = this;
-       }
-
        UInt2::UInt2(unsigned int x, unsigned int y)
        {
-       //      xy.parent = this;
-
-               Constant *constantVector[2];
-               constantVector[0] = Nucleus::createConstantInt(x);
-               constantVector[1] = Nucleus::createConstantInt(y);
-               Value *vector = V(Nucleus::createConstantVector(constantVector, 2));
+               int64_t constantVector[2] = {x, y};
+               Value *vector = V(Nucleus::createConstantVector(constantVector, T(VectorType::get(UInt::getType(), 2))));
 
                storeValue(Nucleus::createBitCast(vector, getType()));
        }
 
        UInt2::UInt2(RValue<UInt2> rhs)
        {
-       //      xy.parent = this;
-
                storeValue(rhs.value);
        }
 
        UInt2::UInt2(const UInt2 &rhs)
        {
-       //      xy.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        UInt2::UInt2(const Reference<UInt2> &rhs)
        {
-       //      xy.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
-       RValue<UInt2> UInt2::operator=(RValue<UInt2> rhs) const
+       RValue<UInt2> UInt2::operator=(RValue<UInt2> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<UInt2> UInt2::operator=(const UInt2 &rhs) const
+       RValue<UInt2> UInt2::operator=(const UInt2 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -5029,7 +4638,7 @@ namespace sw
                return RValue<UInt2>(value);
        }
 
-       RValue<UInt2> UInt2::operator=(const Reference<UInt2> &rhs) const
+       RValue<UInt2> UInt2::operator=(const Reference<UInt2> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -5126,76 +4735,52 @@ namespace sw
                return x86::psrld(lhs, rhs);
        }
 
-       RValue<UInt2> operator<<(RValue<UInt2> lhs, RValue<Long1> rhs)
-       {
-       //      return RValue<UInt2>(Nucleus::createShl(lhs.value, rhs.value));
-
-               return As<UInt2>(x86::pslld(As<Int2>(lhs), rhs));
-       }
-
-       RValue<UInt2> operator>>(RValue<UInt2> lhs, RValue<Long1> rhs)
-       {
-       //      return RValue<UInt2>(Nucleus::createLShr(lhs.value, rhs.value));
-
-               return x86::psrld(lhs, rhs);
-       }
-
-       RValue<UInt2> operator+=(const UInt2 &lhs, RValue<UInt2> rhs)
+       RValue<UInt2> operator+=(UInt2 &lhs, RValue<UInt2> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<UInt2> operator-=(const UInt2 &lhs, RValue<UInt2> rhs)
+       RValue<UInt2> operator-=(UInt2 &lhs, RValue<UInt2> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-//     RValue<UInt2> operator*=(const UInt2 &lhs, RValue<UInt2> rhs)
+//     RValue<UInt2> operator*=(UInt2 &lhs, RValue<UInt2> rhs)
 //     {
 //             return lhs = lhs * rhs;
 //     }
 
-//     RValue<UInt2> operator/=(const UInt2 &lhs, RValue<UInt2> rhs)
+//     RValue<UInt2> operator/=(UInt2 &lhs, RValue<UInt2> rhs)
 //     {
 //             return lhs = lhs / rhs;
 //     }
 
-//     RValue<UInt2> operator%=(const UInt2 &lhs, RValue<UInt2> rhs)
+//     RValue<UInt2> operator%=(UInt2 &lhs, RValue<UInt2> rhs)
 //     {
 //             return lhs = lhs % rhs;
 //     }
 
-       RValue<UInt2> operator&=(const UInt2 &lhs, RValue<UInt2> rhs)
+       RValue<UInt2> operator&=(UInt2 &lhs, RValue<UInt2> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<UInt2> operator|=(const UInt2 &lhs, RValue<UInt2> rhs)
+       RValue<UInt2> operator|=(UInt2 &lhs, RValue<UInt2> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<UInt2> operator^=(const UInt2 &lhs, RValue<UInt2> rhs)
+       RValue<UInt2> operator^=(UInt2 &lhs, RValue<UInt2> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<UInt2> operator<<=(const UInt2 &lhs, unsigned char rhs)
+       RValue<UInt2> operator<<=(UInt2 &lhs, unsigned char rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<UInt2> operator>>=(const UInt2 &lhs, unsigned char rhs)
-       {
-               return lhs = lhs >> rhs;
-       }
-
-       RValue<UInt2> operator<<=(const UInt2 &lhs, RValue<Long1> rhs)
-       {
-               return lhs = lhs << rhs;
-       }
-
-       RValue<UInt2> operator>>=(const UInt2 &lhs, RValue<Long1> rhs)
+       RValue<UInt2> operator>>=(UInt2 &lhs, unsigned char rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -5247,39 +4832,13 @@ namespace sw
                }
                else
                {
-                       Constant *swizzle[16];
-                       swizzle[0] = Nucleus::createConstantInt(0);
-                       swizzle[1] = Nucleus::createConstantInt(16);
-                       swizzle[2] = Nucleus::createConstantInt(1);
-                       swizzle[3] = Nucleus::createConstantInt(17);
-                       swizzle[4] = Nucleus::createConstantInt(2);
-                       swizzle[5] = Nucleus::createConstantInt(18);
-                       swizzle[6] = Nucleus::createConstantInt(3);
-                       swizzle[7] = Nucleus::createConstantInt(19);
-                       swizzle[8] = Nucleus::createConstantInt(4);
-                       swizzle[9] = Nucleus::createConstantInt(20);
-                       swizzle[10] = Nucleus::createConstantInt(5);
-                       swizzle[11] = Nucleus::createConstantInt(21);
-                       swizzle[12] = Nucleus::createConstantInt(6);
-                       swizzle[13] = Nucleus::createConstantInt(22);
-                       swizzle[14] = Nucleus::createConstantInt(7);
-                       swizzle[15] = Nucleus::createConstantInt(23);
-
+                       int swizzle[16] = {0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23};
                        Value *b = Nucleus::createBitCast(a, Byte16::getType());
-                       Value *c = Nucleus::createShuffleVector(b, V(Nucleus::createNullValue(Byte16::getType())), V(Nucleus::createConstantVector(swizzle, 16)));
-
-                       Constant *swizzle2[8];
-                       swizzle2[0] = Nucleus::createConstantInt(0);
-                       swizzle2[1] = Nucleus::createConstantInt(8);
-                       swizzle2[2] = Nucleus::createConstantInt(1);
-                       swizzle2[3] = Nucleus::createConstantInt(9);
-                       swizzle2[4] = Nucleus::createConstantInt(2);
-                       swizzle2[5] = Nucleus::createConstantInt(10);
-                       swizzle2[6] = Nucleus::createConstantInt(3);
-                       swizzle2[7] = Nucleus::createConstantInt(11);
+                       Value *c = Nucleus::createShuffleVector(b, V(Nucleus::createNullValue(Byte16::getType())), swizzle);
 
+                       int swizzle2[8] = {0, 8, 1, 9, 2, 10, 3, 11};
                        Value *d = Nucleus::createBitCast(c, Short8::getType());
-                       e = Nucleus::createShuffleVector(d, V(Nucleus::createNullValue(Short8::getType())), V(Nucleus::createConstantVector(swizzle2, 8)));
+                       e = Nucleus::createShuffleVector(d, V(Nucleus::createNullValue(Short8::getType())), swizzle2);
                }
 
                Value *f = Nucleus::createBitCast(e, Int4::getType());
@@ -5299,39 +4858,13 @@ namespace sw
                }
                else
                {
-                       Constant *swizzle[16];
-                       swizzle[0] = Nucleus::createConstantInt(0);
-                       swizzle[1] = Nucleus::createConstantInt(0);
-                       swizzle[2] = Nucleus::createConstantInt(1);
-                       swizzle[3] = Nucleus::createConstantInt(1);
-                       swizzle[4] = Nucleus::createConstantInt(2);
-                       swizzle[5] = Nucleus::createConstantInt(2);
-                       swizzle[6] = Nucleus::createConstantInt(3);
-                       swizzle[7] = Nucleus::createConstantInt(3);
-                       swizzle[8] = Nucleus::createConstantInt(4);
-                       swizzle[9] = Nucleus::createConstantInt(4);
-                       swizzle[10] = Nucleus::createConstantInt(5);
-                       swizzle[11] = Nucleus::createConstantInt(5);
-                       swizzle[12] = Nucleus::createConstantInt(6);
-                       swizzle[13] = Nucleus::createConstantInt(6);
-                       swizzle[14] = Nucleus::createConstantInt(7);
-                       swizzle[15] = Nucleus::createConstantInt(7);
-
+                       int     swizzle[16] = {0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7};
                        Value *b = Nucleus::createBitCast(a, Byte16::getType());
-                       Value *c = Nucleus::createShuffleVector(b, b, V(Nucleus::createConstantVector(swizzle, 16)));
-
-                       Constant *swizzle2[8];
-                       swizzle2[0] = Nucleus::createConstantInt(0);
-                       swizzle2[1] = Nucleus::createConstantInt(0);
-                       swizzle2[2] = Nucleus::createConstantInt(1);
-                       swizzle2[3] = Nucleus::createConstantInt(1);
-                       swizzle2[4] = Nucleus::createConstantInt(2);
-                       swizzle2[5] = Nucleus::createConstantInt(2);
-                       swizzle2[6] = Nucleus::createConstantInt(3);
-                       swizzle2[7] = Nucleus::createConstantInt(3);
+                       Value *c = Nucleus::createShuffleVector(b, b, swizzle);
 
+                       int swizzle2[8] = {0, 0, 1, 1, 2, 2, 3, 3};
                        Value *d = Nucleus::createBitCast(c, Short8::getType());
-                       Value *e = Nucleus::createShuffleVector(d, d, V(Nucleus::createConstantVector(swizzle2, 8)));
+                       Value *e = Nucleus::createShuffleVector(d, d, swizzle2);
 
                        Value *f = Nucleus::createBitCast(e, Int4::getType());
                        //      g = Nucleus::createAShr(f, Nucleus::createConstantInt(24));
@@ -5343,8 +4876,6 @@ namespace sw
 
        Int4::Int4(RValue<Float4> cast)
        {
-       //      xyzw.parent = this;
-
                Value *xyzw = Nucleus::createFPToSI(cast.value, Int4::getType());
 
                storeValue(xyzw);
@@ -5352,7 +4883,7 @@ namespace sw
 
        Int4::Int4(RValue<Short4> cast)
        {
-               Value *long2 = V(UndefValue::get(Long2::getType()));
+               Value *long2 = V(UndefValue::get(VectorType::get(Long::getType(), 2)));
                Value *element = Nucleus::createBitCast(cast.value, Long::getType());
                long2 = Nucleus::createInsertElement(long2, element, 0);
                RValue<Int4> vector = RValue<Int4>(Nucleus::createBitCast(long2, Int4::getType()));
@@ -5365,23 +4896,14 @@ namespace sw
                {
                        Value *b = Nucleus::createBitCast(vector.value, Short8::getType());
 
-                       Constant *swizzle[8];
-                       swizzle[0] = Nucleus::createConstantInt(0);
-                       swizzle[1] = Nucleus::createConstantInt(0);
-                       swizzle[2] = Nucleus::createConstantInt(1);
-                       swizzle[3] = Nucleus::createConstantInt(1);
-                       swizzle[4] = Nucleus::createConstantInt(2);
-                       swizzle[5] = Nucleus::createConstantInt(2);
-                       swizzle[6] = Nucleus::createConstantInt(3);
-                       swizzle[7] = Nucleus::createConstantInt(3);
-
-                       Value *c = Nucleus::createShuffleVector(b, b, V(Nucleus::createConstantVector(swizzle, 8)));
+                       int swizzle[8] = {0, 0, 1, 1, 2, 2, 3, 3};
+                       Value *c = Nucleus::createShuffleVector(b, b, swizzle);
                        Value *d = Nucleus::createBitCast(c, Int4::getType());
                        storeValue(d);
 
                        // Each Short is packed into each Int in the (Short | Short) format.
                        // Shifting by 16 will retrieve the original Short value.
-                       // Shitfing an Int will propagate the sign bit, which will work
+                       // Shifting an Int will propagate the sign bit, which will work
                        // for both positive and negative values of a Short.
                        *this >>= 16;
                }
@@ -5389,7 +4911,7 @@ namespace sw
 
        Int4::Int4(RValue<UShort4> cast)
        {
-               Value *long2 = V(UndefValue::get(Long2::getType()));
+               Value *long2 = V(UndefValue::get(VectorType::get(Long::getType(), 2)));
                Value *element = Nucleus::createBitCast(cast.value, Long::getType());
                long2 = Nucleus::createInsertElement(long2, element, 0);
                RValue<Int4> vector = RValue<Int4>(Nucleus::createBitCast(long2, Int4::getType()));
@@ -5402,27 +4924,13 @@ namespace sw
                {
                        Value *b = Nucleus::createBitCast(vector.value, Short8::getType());
 
-                       Constant *swizzle[8];
-                       swizzle[0] = Nucleus::createConstantInt(0);
-                       swizzle[1] = Nucleus::createConstantInt(8);
-                       swizzle[2] = Nucleus::createConstantInt(1);
-                       swizzle[3] = Nucleus::createConstantInt(9);
-                       swizzle[4] = Nucleus::createConstantInt(2);
-                       swizzle[5] = Nucleus::createConstantInt(10);
-                       swizzle[6] = Nucleus::createConstantInt(3);
-                       swizzle[7] = Nucleus::createConstantInt(11);
-
-                       Value *c = Nucleus::createShuffleVector(b, V(Nucleus::createNullValue(Short8::getType())), V(Nucleus::createConstantVector(swizzle, 8)));
+                       int swizzle[8] = {0, 8, 1, 9, 2, 10, 3, 11};
+                       Value *c = Nucleus::createShuffleVector(b, V(Nucleus::createNullValue(Short8::getType())), swizzle);
                        Value *d = Nucleus::createBitCast(c, Int4::getType());
                        storeValue(d);
                }
        }
 
-       Int4::Int4()
-       {
-       //      xyzw.parent = this;
-       }
-
        Int4::Int4(int xyzw)
        {
                constant(xyzw, xyzw, xyzw, xyzw);
@@ -5445,71 +4953,50 @@ namespace sw
 
        void Int4::constant(int x, int y, int z, int w)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantInt(x);
-               constantVector[1] = Nucleus::createConstantInt(y);
-               constantVector[2] = Nucleus::createConstantInt(z);
-               constantVector[3] = Nucleus::createConstantInt(w);
-
-               storeValue(Nucleus::createConstantVector(constantVector, 4));
+               int64_t constantVector[4] = {x, y, z, w};
+               storeValue(Nucleus::createConstantVector(constantVector, getType()));
        }
 
        Int4::Int4(RValue<Int4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        Int4::Int4(const Int4 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Int4::Int4(const Reference<Int4> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Int4::Int4(RValue<UInt4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        Int4::Int4(const UInt4 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Int4::Int4(const Reference<UInt4> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        Int4::Int4(RValue<Int2> lo, RValue<Int2> hi)
        {
-       //      xyzw.parent = this;
-
                Value *loLong = Nucleus::createBitCast(lo.value, Long::getType());
                Value *hiLong = Nucleus::createBitCast(hi.value, Long::getType());
 
-               Value *long2 = V(UndefValue::get(Long2::getType()));
+               Value *long2 = V(UndefValue::get(VectorType::get(Long::getType(), 2)));
                long2 = Nucleus::createInsertElement(long2, loLong, 0);
                long2 = Nucleus::createInsertElement(long2, hiLong, 1);
                Value *int4 = Nucleus::createBitCast(long2, Int4::getType());
@@ -5519,44 +5006,33 @@ namespace sw
 
        Int4::Int4(RValue<Int> rhs)
        {
-       //      xyzw.parent = this;
-
                Value *vector = loadValue();
                Value *insert = Nucleus::createInsertElement(vector, rhs.value, 0);
 
-               Constant *swizzle[4];
-               swizzle[0] = Nucleus::createConstantInt(0);
-               swizzle[1] = Nucleus::createConstantInt(0);
-               swizzle[2] = Nucleus::createConstantInt(0);
-               swizzle[3] = Nucleus::createConstantInt(0);
-
-               Value *replicate = Nucleus::createShuffleVector(insert, V(UndefValue::get(Int4::getType())), V(Nucleus::createConstantVector(swizzle, 4)));
+               int swizzle[4] = {0, 0, 0, 0};
+               Value *replicate = Nucleus::createShuffleVector(insert, insert, swizzle);
 
                storeValue(replicate);
        }
 
        Int4::Int4(const Int &rhs)
        {
-       //      xyzw.parent = this;
-
                *this = RValue<Int>(rhs.loadValue());
        }
 
        Int4::Int4(const Reference<Int> &rhs)
        {
-       //      xyzw.parent = this;
-
                *this = RValue<Int>(rhs.loadValue());
        }
 
-       RValue<Int4> Int4::operator=(RValue<Int4> rhs) const
+       RValue<Int4> Int4::operator=(RValue<Int4> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Int4> Int4::operator=(const Int4 &rhs) const
+       RValue<Int4> Int4::operator=(const Int4 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -5564,7 +5040,7 @@ namespace sw
                return RValue<Int4>(value);
        }
 
-       RValue<Int4> Int4::operator=(const Reference<Int4> &rhs) const
+       RValue<Int4> Int4::operator=(const Reference<Int4> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -5632,52 +5108,52 @@ namespace sw
                return RValue<Int4>(Nucleus::createAShr(lhs.value, rhs.value));
        }
 
-       RValue<Int4> operator+=(const Int4 &lhs, RValue<Int4> rhs)
+       RValue<Int4> operator+=(Int4 &lhs, RValue<Int4> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Int4> operator-=(const Int4 &lhs, RValue<Int4> rhs)
+       RValue<Int4> operator-=(Int4 &lhs, RValue<Int4> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<Int4> operator*=(const Int4 &lhs, RValue<Int4> rhs)
+       RValue<Int4> operator*=(Int4 &lhs, RValue<Int4> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-//     RValue<Int4> operator/=(const Int4 &lhs, RValue<Int4> rhs)
+//     RValue<Int4> operator/=(Int4 &lhs, RValue<Int4> rhs)
 //     {
 //             return lhs = lhs / rhs;
 //     }
 
-//     RValue<Int4> operator%=(const Int4 &lhs, RValue<Int4> rhs)
+//     RValue<Int4> operator%=(Int4 &lhs, RValue<Int4> rhs)
 //     {
 //             return lhs = lhs % rhs;
 //     }
 
-       RValue<Int4> operator&=(const Int4 &lhs, RValue<Int4> rhs)
+       RValue<Int4> operator&=(Int4 &lhs, RValue<Int4> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<Int4> operator|=(const Int4 &lhs, RValue<Int4> rhs)
+       RValue<Int4> operator|=(Int4 &lhs, RValue<Int4> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<Int4> operator^=(const Int4 &lhs, RValue<Int4> rhs)
+       RValue<Int4> operator^=(Int4 &lhs, RValue<Int4> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<Int4> operator<<=(const Int4 &lhs, unsigned char rhs)
+       RValue<Int4> operator<<=(Int4 &lhs, unsigned char rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<Int4> operator>>=(const Int4 &lhs, unsigned char rhs)
+       RValue<Int4> operator>>=(Int4 &lhs, unsigned char rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -5745,7 +5221,7 @@ namespace sw
                else
                {
                        RValue<Int4> greater = CmpNLE(x, y);
-                       return x & greater | y & ~greater;
+                       return (x & greater) | (y & ~greater);
                }
        }
 
@@ -5758,7 +5234,7 @@ namespace sw
                else
                {
                        RValue<Int4> less = CmpLT(x, y);
-                       return x & less | y & ~less;
+                       return (x & less) | (y & ~less);
                }
        }
 
@@ -5774,7 +5250,7 @@ namespace sw
 
        RValue<Int> Extract(RValue<Int4> x, int i)
        {
-               return RValue<Int>(Nucleus::createExtractElement(x.value, i));
+               return RValue<Int>(Nucleus::createExtractElement(x.value, Int::getType(), i));
        }
 
        RValue<Int4> Insert(RValue<Int4> x, RValue<Int> element, int i)
@@ -5789,7 +5265,7 @@ namespace sw
 
        RValue<Int4> Swizzle(RValue<Int4> x, unsigned char select)
        {
-               return RValue<Int4>(Nucleus::createSwizzle(x.value, select));
+               return RValue<Int4>(createSwizzle4(x.value, select));
        }
 
        Type *Int4::getType()
@@ -5799,8 +5275,6 @@ namespace sw
 
        UInt4::UInt4(RValue<Float4> cast)
        {
-       //      xyzw.parent = this;
-
                // Note: createFPToUI is broken, must perform conversion using createFPtoSI
                // Value *xyzw = Nucleus::createFPToUI(cast.value, UInt4::getType());
 
@@ -5818,11 +5292,6 @@ namespace sw
                storeValue((~(As<Int4>(cast) >> 31) & uiValue).value);
        }
 
-       UInt4::UInt4()
-       {
-       //      xyzw.parent = this;
-       }
-
        UInt4::UInt4(int xyzw)
        {
                constant(xyzw, xyzw, xyzw, xyzw);
@@ -5845,59 +5314,40 @@ namespace sw
 
        void UInt4::constant(int x, int y, int z, int w)
        {
-       //      xyzw.parent = this;
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantInt(x);
-               constantVector[1] = Nucleus::createConstantInt(y);
-               constantVector[2] = Nucleus::createConstantInt(z);
-               constantVector[3] = Nucleus::createConstantInt(w);
-
-               storeValue(Nucleus::createConstantVector(constantVector, 4));
+               int64_t constantVector[4] = {x, y, z, w};
+               storeValue(Nucleus::createConstantVector(constantVector, getType()));
        }
 
        UInt4::UInt4(RValue<UInt4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        UInt4::UInt4(const UInt4 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        UInt4::UInt4(const Reference<UInt4> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        UInt4::UInt4(RValue<Int4> rhs)
        {
-       //      xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
        UInt4::UInt4(const Int4 &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
        UInt4::UInt4(const Reference<Int4> &rhs)
        {
-       //      xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
@@ -5907,7 +5357,7 @@ namespace sw
                Value *loLong = Nucleus::createBitCast(lo.value, Long::getType());
                Value *hiLong = Nucleus::createBitCast(hi.value, Long::getType());
 
-               Value *long2 = V(UndefValue::get(Long2::getType()));
+               Value *long2 = V(UndefValue::get(VectorType::get(Long::getType(), 2)));
                long2 = Nucleus::createInsertElement(long2, loLong, 0);
                long2 = Nucleus::createInsertElement(long2, hiLong, 1);
                Value *uint4 = Nucleus::createBitCast(long2, Int4::getType());
@@ -5915,14 +5365,14 @@ namespace sw
                storeValue(uint4);
        }
 
-       RValue<UInt4> UInt4::operator=(RValue<UInt4> rhs) const
+       RValue<UInt4> UInt4::operator=(RValue<UInt4> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<UInt4> UInt4::operator=(const UInt4 &rhs) const
+       RValue<UInt4> UInt4::operator=(const UInt4 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -5930,7 +5380,7 @@ namespace sw
                return RValue<UInt4>(value);
        }
 
-       RValue<UInt4> UInt4::operator=(const Reference<UInt4> &rhs) const
+       RValue<UInt4> UInt4::operator=(const Reference<UInt4> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -5998,52 +5448,52 @@ namespace sw
                return RValue<UInt4>(Nucleus::createLShr(lhs.value, rhs.value));
        }
 
-       RValue<UInt4> operator+=(const UInt4 &lhs, RValue<UInt4> rhs)
+       RValue<UInt4> operator+=(UInt4 &lhs, RValue<UInt4> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<UInt4> operator-=(const UInt4 &lhs, RValue<UInt4> rhs)
+       RValue<UInt4> operator-=(UInt4 &lhs, RValue<UInt4> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<UInt4> operator*=(const UInt4 &lhs, RValue<UInt4> rhs)
+       RValue<UInt4> operator*=(UInt4 &lhs, RValue<UInt4> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-//     RValue<UInt4> operator/=(const UInt4 &lhs, RValue<UInt4> rhs)
+//     RValue<UInt4> operator/=(UInt4 &lhs, RValue<UInt4> rhs)
 //     {
 //             return lhs = lhs / rhs;
 //     }
 
-//     RValue<UInt4> operator%=(const UInt4 &lhs, RValue<UInt4> rhs)
+//     RValue<UInt4> operator%=(UInt4 &lhs, RValue<UInt4> rhs)
 //     {
 //             return lhs = lhs % rhs;
 //     }
 
-       RValue<UInt4> operator&=(const UInt4 &lhs, RValue<UInt4> rhs)
+       RValue<UInt4> operator&=(UInt4 &lhs, RValue<UInt4> rhs)
        {
                return lhs = lhs & rhs;
        }
 
-       RValue<UInt4> operator|=(const UInt4 &lhs, RValue<UInt4> rhs)
+       RValue<UInt4> operator|=(UInt4 &lhs, RValue<UInt4> rhs)
        {
                return lhs = lhs | rhs;
        }
 
-       RValue<UInt4> operator^=(const UInt4 &lhs, RValue<UInt4> rhs)
+       RValue<UInt4> operator^=(UInt4 &lhs, RValue<UInt4> rhs)
        {
                return lhs = lhs ^ rhs;
        }
 
-       RValue<UInt4> operator<<=(const UInt4 &lhs, unsigned char rhs)
+       RValue<UInt4> operator<<=(UInt4 &lhs, unsigned char rhs)
        {
                return lhs = lhs << rhs;
        }
 
-       RValue<UInt4> operator>>=(const UInt4 &lhs, unsigned char rhs)
+       RValue<UInt4> operator>>=(UInt4 &lhs, unsigned char rhs)
        {
                return lhs = lhs >> rhs;
        }
@@ -6111,7 +5561,7 @@ namespace sw
                else
                {
                        RValue<UInt4> greater = CmpNLE(x, y);
-                       return x & greater | y & ~greater;
+                       return (x & greater) | (y & ~greater);
                }
        }
 
@@ -6124,13 +5574,13 @@ namespace sw
                else
                {
                        RValue<UInt4> less = CmpLT(x, y);
-                       return x & less | y & ~less;
+                       return (x & less) | (y & ~less);
                }
        }
 
        RValue<UShort8> Pack(RValue<UInt4> x, RValue<UInt4> y)
        {
-               return x86::packusdw(x, y);   // FIXME: Fallback required
+               return x86::packusdw(As<Int4>(x), As<Int4>(y));
        }
 
        Type *UInt4::getType()
@@ -6145,11 +5595,6 @@ namespace sw
                storeValue(integer);
        }
 
-       Float::Float()
-       {
-
-       }
-
        Float::Float(float x)
        {
                storeValue(Nucleus::createConstantFloat(x));
@@ -6172,14 +5617,14 @@ namespace sw
                storeValue(value);
        }
 
-       RValue<Float> Float::operator=(RValue<Float> rhs) const
+       RValue<Float> Float::operator=(RValue<Float> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Float> Float::operator=(const Float &rhs) const
+       RValue<Float> Float::operator=(const Float &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -6187,7 +5632,7 @@ namespace sw
                return RValue<Float>(value);
        }
 
-       RValue<Float> Float::operator=(const Reference<Float> &rhs) const
+       RValue<Float> Float::operator=(const Reference<Float> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -6215,22 +5660,22 @@ namespace sw
                return RValue<Float>(Nucleus::createFDiv(lhs.value, rhs.value));
        }
 
-       RValue<Float> operator+=(const Float &lhs, RValue<Float> rhs)
+       RValue<Float> operator+=(Float &lhs, RValue<Float> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Float> operator-=(const Float &lhs, RValue<Float> rhs)
+       RValue<Float> operator-=(Float &lhs, RValue<Float> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<Float> operator*=(const Float &lhs, RValue<Float> rhs)
+       RValue<Float> operator*=(Float &lhs, RValue<Float> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<Float> operator/=(const Float &lhs, RValue<Float> rhs)
+       RValue<Float> operator/=(Float &lhs, RValue<Float> rhs)
        {
                return lhs = lhs / rhs;
        }
@@ -6292,16 +5737,16 @@ namespace sw
 
        RValue<Float> Rcp_pp(RValue<Float> x, bool exactAtPow2)
        {
-               if(exactAtPow2)
-               {
-                       // rcpss uses a piecewise-linear approximation which minimizes the relative error
-                       // but is not exact at power-of-two values. Rectify by multiplying by the inverse.
-                       return x86::rcpss(x) * Float(1.0f / _mm_cvtss_f32(_mm_rcp_ss(_mm_set_ps1(1.0f))));
-               }
-               else
-               {
-                       return x86::rcpss(x);
-               }
+               #if defined(__i386__) || defined(__x86_64__)
+                       if(exactAtPow2)
+                       {
+                               // rcpss uses a piecewise-linear approximation which minimizes the relative error
+                               // but is not exact at power-of-two values. Rectify by multiplying by the inverse.
+                               return x86::rcpss(x) * Float(1.0f / _mm_cvtss_f32(_mm_rcp_ss(_mm_set_ps1(1.0f))));
+                       }
+               #endif
+
+               return x86::rcpss(x);
        }
 
        RValue<Float> RcpSqrt_pp(RValue<Float> x)
@@ -6381,10 +5826,8 @@ namespace sw
 
        Float2::Float2(RValue<Float4> cast)
        {
-       //      xyzw.parent = this;
-
-               Value *int64x2 = Nucleus::createBitCast(cast.value, Long2::getType());
-               Value *int64 = Nucleus::createExtractElement(int64x2, 0);
+               Value *int64x2 = Nucleus::createBitCast(cast.value, T(VectorType::get(Long::getType(), 2)));
+               Value *int64 = Nucleus::createExtractElement(int64x2, Long::getType(), 0);
                Value *float2 = Nucleus::createBitCast(int64, Float2::getType());
 
                storeValue(float2);
@@ -6395,10 +5838,8 @@ namespace sw
                return T(VectorType::get(Float::getType(), 2));
        }
 
-       Float4::Float4(RValue<Byte4> cast)
+       Float4::Float4(RValue<Byte4> cast) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                #if 0
                        Value *xyzw = Nucleus::createUIToFP(cast.value, Float4::getType());   // FIXME: Crashes
                #elif 0
@@ -6427,10 +5868,8 @@ namespace sw
                storeValue(xyzw);
        }
 
-       Float4::Float4(RValue<SByte4> cast)
+       Float4::Float4(RValue<SByte4> cast) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                #if 0
                        Value *xyzw = Nucleus::createSIToFP(cast.value, Float4::getType());   // FIXME: Crashes
                #elif 0
@@ -6459,146 +5898,114 @@ namespace sw
                storeValue(xyzw);
        }
 
-       Float4::Float4(RValue<Short4> cast)
+       Float4::Float4(RValue<Short4> cast) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                Int4 c(cast);
                storeValue(Nucleus::createSIToFP(RValue<Int4>(c).value, Float4::getType()));
        }
 
-       Float4::Float4(RValue<UShort4> cast)
+       Float4::Float4(RValue<UShort4> cast) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                Int4 c(cast);
                storeValue(Nucleus::createSIToFP(RValue<Int4>(c).value, Float4::getType()));
        }
 
-       Float4::Float4(RValue<Int4> cast)
+       Float4::Float4(RValue<Int4> cast) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                Value *xyzw = Nucleus::createSIToFP(cast.value, Float4::getType());
 
                storeValue(xyzw);
        }
 
-       Float4::Float4(RValue<UInt4> cast)
+       Float4::Float4(RValue<UInt4> cast) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
-               Value *xyzw = Nucleus::createUIToFP(cast.value, Float4::getType());
+               RValue<Float4> result = Float4(Int4(cast & UInt4(0x7FFFFFFF))) +
+                                       As<Float4>((As<Int4>(cast) >> 31) & As<Int4>(Float4(0x80000000u)));
 
-               storeValue(xyzw);
+               storeValue(result.value);
        }
 
-       Float4::Float4()
+       Float4::Float4() : FloatXYZW(this)
        {
-               xyzw.parent = this;
        }
 
-       Float4::Float4(float xyzw)
+       Float4::Float4(float xyzw) : FloatXYZW(this)
        {
                constant(xyzw, xyzw, xyzw, xyzw);
        }
 
-       Float4::Float4(float x, float yzw)
+       Float4::Float4(float x, float yzw) : FloatXYZW(this)
        {
                constant(x, yzw, yzw, yzw);
        }
 
-       Float4::Float4(float x, float y, float zw)
+       Float4::Float4(float x, float y, float zw) : FloatXYZW(this)
        {
                constant(x, y, zw, zw);
        }
 
-       Float4::Float4(float x, float y, float z, float w)
+       Float4::Float4(float x, float y, float z, float w) : FloatXYZW(this)
        {
                constant(x, y, z, w);
        }
 
        void Float4::constant(float x, float y, float z, float w)
        {
-               xyzw.parent = this;
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantFloat(x);
-               constantVector[1] = Nucleus::createConstantFloat(y);
-               constantVector[2] = Nucleus::createConstantFloat(z);
-               constantVector[3] = Nucleus::createConstantFloat(w);
-
-               storeValue(Nucleus::createConstantVector(constantVector, 4));
+               double constantVector[4] = {x, y, z, w};
+               storeValue(Nucleus::createConstantVector(constantVector, getType()));
        }
 
-       Float4::Float4(RValue<Float4> rhs)
+       Float4::Float4(RValue<Float4> rhs) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                storeValue(rhs.value);
        }
 
-       Float4::Float4(const Float4 &rhs)
+       Float4::Float4(const Float4 &rhs) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
-       Float4::Float4(const Reference<Float4> &rhs)
+       Float4::Float4(const Reference<Float4> &rhs) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                Value *value = rhs.loadValue();
                storeValue(value);
        }
 
-       Float4::Float4(RValue<Float> rhs)
+       Float4::Float4(RValue<Float> rhs) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                Value *vector = loadValue();
                Value *insert = Nucleus::createInsertElement(vector, rhs.value, 0);
 
-               Constant *swizzle[4];
-               swizzle[0] = Nucleus::createConstantInt(0);
-               swizzle[1] = Nucleus::createConstantInt(0);
-               swizzle[2] = Nucleus::createConstantInt(0);
-               swizzle[3] = Nucleus::createConstantInt(0);
-
-               Value *replicate = Nucleus::createShuffleVector(insert, V(UndefValue::get(Float4::getType())), V(Nucleus::createConstantVector(swizzle, 4)));
+               int swizzle[4] = {0, 0, 0, 0};
+               Value *replicate = Nucleus::createShuffleVector(insert, insert, swizzle);
 
                storeValue(replicate);
        }
 
-       Float4::Float4(const Float &rhs)
+       Float4::Float4(const Float &rhs) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                *this = RValue<Float>(rhs.loadValue());
        }
 
-       Float4::Float4(const Reference<Float> &rhs)
+       Float4::Float4(const Reference<Float> &rhs) : FloatXYZW(this)
        {
-               xyzw.parent = this;
-
                *this = RValue<Float>(rhs.loadValue());
        }
 
-       RValue<Float4> Float4::operator=(float x) const
+       RValue<Float4> Float4::operator=(float x)
        {
                return *this = Float4(x, x, x, x);
        }
 
-       RValue<Float4> Float4::operator=(RValue<Float4> rhs) const
+       RValue<Float4> Float4::operator=(RValue<Float4> rhs)
        {
                storeValue(rhs.value);
 
                return rhs;
        }
 
-       RValue<Float4> Float4::operator=(const Float4 &rhs) const
+       RValue<Float4> Float4::operator=(const Float4 &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -6606,7 +6013,7 @@ namespace sw
                return RValue<Float4>(value);
        }
 
-       RValue<Float4> Float4::operator=(const Reference<Float4> &rhs) const
+       RValue<Float4> Float4::operator=(const Reference<Float4> &rhs)
        {
                Value *value = rhs.loadValue();
                storeValue(value);
@@ -6614,17 +6021,17 @@ namespace sw
                return RValue<Float4>(value);
        }
 
-       RValue<Float4> Float4::operator=(RValue<Float> rhs) const
+       RValue<Float4> Float4::operator=(RValue<Float> rhs)
        {
                return *this = Float4(rhs);
        }
 
-       RValue<Float4> Float4::operator=(const Float &rhs) const
+       RValue<Float4> Float4::operator=(const Float &rhs)
        {
                return *this = Float4(rhs);
        }
 
-       RValue<Float4> Float4::operator=(const Reference<Float> &rhs) const
+       RValue<Float4> Float4::operator=(const Reference<Float> &rhs)
        {
                return *this = Float4(rhs);
        }
@@ -6654,27 +6061,27 @@ namespace sw
                return RValue<Float4>(Nucleus::createFRem(lhs.value, rhs.value));
        }
 
-       RValue<Float4> operator+=(const Float4 &lhs, RValue<Float4> rhs)
+       RValue<Float4> operator+=(Float4 &lhs, RValue<Float4> rhs)
        {
                return lhs = lhs + rhs;
        }
 
-       RValue<Float4> operator-=(const Float4 &lhs, RValue<Float4> rhs)
+       RValue<Float4> operator-=(Float4 &lhs, RValue<Float4> rhs)
        {
                return lhs = lhs - rhs;
        }
 
-       RValue<Float4> operator*=(const Float4 &lhs, RValue<Float4> rhs)
+       RValue<Float4> operator*=(Float4 &lhs, RValue<Float4> rhs)
        {
                return lhs = lhs * rhs;
        }
 
-       RValue<Float4> operator/=(const Float4 &lhs, RValue<Float4> rhs)
+       RValue<Float4> operator/=(Float4 &lhs, RValue<Float4> rhs)
        {
                return lhs = lhs / rhs;
        }
 
-       RValue<Float4> operator%=(const Float4 &lhs, RValue<Float4> rhs)
+       RValue<Float4> operator%=(Float4 &lhs, RValue<Float4> rhs)
        {
                return lhs = lhs % rhs;
        }
@@ -6692,14 +6099,8 @@ namespace sw
        RValue<Float4> Abs(RValue<Float4> x)
        {
                Value *vector = Nucleus::createBitCast(x.value, Int4::getType());
-
-               Constant *constantVector[4];
-               constantVector[0] = Nucleus::createConstantInt(0x7FFFFFFF);
-               constantVector[1] = Nucleus::createConstantInt(0x7FFFFFFF);
-               constantVector[2] = Nucleus::createConstantInt(0x7FFFFFFF);
-               constantVector[3] = Nucleus::createConstantInt(0x7FFFFFFF);
-
-               Value *result = Nucleus::createAnd(vector, V(Nucleus::createConstantVector(constantVector, 4)));
+               int64_t constantVector[4] = {0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF};
+               Value *result = Nucleus::createAnd(vector, V(Nucleus::createConstantVector(constantVector, Int4::getType())));
 
                return RValue<Float4>(Nucleus::createBitCast(result, Float4::getType()));
        }
@@ -6716,16 +6117,16 @@ namespace sw
 
        RValue<Float4> Rcp_pp(RValue<Float4> x, bool exactAtPow2)
        {
-               if(exactAtPow2)
-               {
-                       // rcpps uses a piecewise-linear approximation which minimizes the relative error
-                       // but is not exact at power-of-two values. Rectify by multiplying by the inverse.
-                       return x86::rcpps(x) * Float4(1.0f / _mm_cvtss_f32(_mm_rcp_ss(_mm_set_ps1(1.0f))));
-               }
-               else
-               {
-                       return x86::rcpps(x);
-               }
+               #if defined(__i386__) || defined(__x86_64__)
+                       if(exactAtPow2)
+                       {
+                               // rcpps uses a piecewise-linear approximation which minimizes the relative error
+                               // but is not exact at power-of-two values. Rectify by multiplying by the inverse.
+                               return x86::rcpps(x) * Float4(1.0f / _mm_cvtss_f32(_mm_rcp_ss(_mm_set_ps1(1.0f))));
+                       }
+               #endif
+
+               return x86::rcpps(x);
        }
 
        RValue<Float4> RcpSqrt_pp(RValue<Float4> x)
@@ -6738,63 +6139,50 @@ namespace sw
                return x86::sqrtps(x);
        }
 
-       RValue<Float4> Insert(const Float4 &val, RValue<Float> element, int i)
+       RValue<Float4> Insert(RValue<Float4> val, RValue<Float> element, int i)
        {
-               Value *value = val.loadValue();
-               Value *insert = Nucleus::createInsertElement(value, element.value, i);
-
-               val = RValue<Float4>(insert);
-
-               return val;
+               return RValue<Float4>(Nucleus::createInsertElement(val.value, element.value, i));
        }
 
        RValue<Float> Extract(RValue<Float4> x, int i)
        {
-               return RValue<Float>(Nucleus::createExtractElement(x.value, i));
+               return RValue<Float>(Nucleus::createExtractElement(x.value, Float::getType(), i));
        }
 
        RValue<Float4> Swizzle(RValue<Float4> x, unsigned char select)
        {
-               return RValue<Float4>(Nucleus::createSwizzle(x.value, select));
+               return RValue<Float4>(createSwizzle4(x.value, select));
        }
 
        RValue<Float4> ShuffleLowHigh(RValue<Float4> x, RValue<Float4> y, unsigned char imm)
        {
-               Constant *shuffle[4];
-               shuffle[0] = Nucleus::createConstantInt(((imm >> 0) & 0x03) + 0);
-               shuffle[1] = Nucleus::createConstantInt(((imm >> 2) & 0x03) + 0);
-               shuffle[2] = Nucleus::createConstantInt(((imm >> 4) & 0x03) + 4);
-               shuffle[3] = Nucleus::createConstantInt(((imm >> 6) & 0x03) + 4);
+               int shuffle[4] =
+               {
+                       ((imm >> 0) & 0x03) + 0,
+                       ((imm >> 2) & 0x03) + 0,
+                       ((imm >> 4) & 0x03) + 4,
+                       ((imm >> 6) & 0x03) + 4,
+               };
 
-               return RValue<Float4>(Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 4))));
+               return RValue<Float4>(Nucleus::createShuffleVector(x.value, y.value, shuffle));
        }
 
        RValue<Float4> UnpackLow(RValue<Float4> x, RValue<Float4> y)
        {
-               Constant *shuffle[4];
-               shuffle[0] = Nucleus::createConstantInt(0);
-               shuffle[1] = Nucleus::createConstantInt(4);
-               shuffle[2] = Nucleus::createConstantInt(1);
-               shuffle[3] = Nucleus::createConstantInt(5);
-
-               return RValue<Float4>(Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 4))));
+               int shuffle[4] = {0, 4, 1, 5};
+               return RValue<Float4>(Nucleus::createShuffleVector(x.value, y.value, shuffle));
        }
 
        RValue<Float4> UnpackHigh(RValue<Float4> x, RValue<Float4> y)
        {
-               Constant *shuffle[4];
-               shuffle[0] = Nucleus::createConstantInt(2);
-               shuffle[1] = Nucleus::createConstantInt(6);
-               shuffle[2] = Nucleus::createConstantInt(3);
-               shuffle[3] = Nucleus::createConstantInt(7);
-
-               return RValue<Float4>(Nucleus::createShuffleVector(x.value, y.value, V(Nucleus::createConstantVector(shuffle, 4))));
+               int shuffle[4] = {2, 6, 3, 7};
+               return RValue<Float4>(Nucleus::createShuffleVector(x.value, y.value, shuffle));
        }
 
        RValue<Float4> Mask(Float4 &lhs, RValue<Float4> rhs, unsigned char select)
        {
                Value *vector = lhs.loadValue();
-               Value *shuffle = Nucleus::createMask(vector, rhs.value, select);
+               Value *shuffle = createMask4(vector, rhs.value, select);
                lhs.storeValue(shuffle);
 
                return RValue<Float4>(shuffle);
@@ -6867,16 +6255,22 @@ namespace sw
 
        RValue<Float4> Frac(RValue<Float4> x)
        {
+               Float4 frc;
+
                if(CPUID::supportsSSE4_1())
                {
-                       return x - x86::floorps(x);
+                       frc = x - x86::floorps(x);
                }
                else
                {
-                       Float4 frc = x - Float4(Int4(x));   // Signed fractional part
+                       frc = x - Float4(Int4(x));   // Signed fractional part.
 
-                       return frc + As<Float4>(As<Int4>(CmpNLE(Float4(0.0f), frc)) & As<Int4>(Float4(1, 1, 1, 1)));
+                       frc += As<Float4>(As<Int4>(CmpNLE(Float4(0.0f), frc)) & As<Int4>(Float4(1.0f)));   // Add 1.0 if negative.
                }
+
+               // x - floor(x) can be 1.0 for very small negative x.
+               // Clamp against the value just below 1.0.
+               return Min(frc, As<Float4>(Int4(0x3F7FFFFF)));
        }
 
        RValue<Float4> Floor(RValue<Float4> x)
@@ -6910,30 +6304,30 @@ namespace sw
 
        RValue<Pointer<Byte>> operator+(RValue<Pointer<Byte>> lhs, int offset)
        {
-               return RValue<Pointer<Byte>>(Nucleus::createGEP(lhs.value, V(Nucleus::createConstantInt(offset))));
+               return RValue<Pointer<Byte>>(Nucleus::createGEP(lhs.value, Byte::getType(), V(Nucleus::createConstantInt(offset)), false));
        }
 
        RValue<Pointer<Byte>> operator+(RValue<Pointer<Byte>> lhs, RValue<Int> offset)
        {
-               return RValue<Pointer<Byte>>(Nucleus::createGEP(lhs.value, offset.value));
+               return RValue<Pointer<Byte>>(Nucleus::createGEP(lhs.value, Byte::getType(), offset.value, false));
        }
 
        RValue<Pointer<Byte>> operator+(RValue<Pointer<Byte>> lhs, RValue<UInt> offset)
        {
-               return RValue<Pointer<Byte>>(Nucleus::createGEP(lhs.value, offset.value));
+               return RValue<Pointer<Byte>>(Nucleus::createGEP(lhs.value, Byte::getType(), offset.value, true));
        }
 
-       RValue<Pointer<Byte>> operator+=(const Pointer<Byte> &lhs, int offset)
+       RValue<Pointer<Byte>> operator+=(Pointer<Byte> &lhs, int offset)
        {
                return lhs = lhs + offset;
        }
 
-       RValue<Pointer<Byte>> operator+=(const Pointer<Byte> &lhs, RValue<Int> offset)
+       RValue<Pointer<Byte>> operator+=(Pointer<Byte> &lhs, RValue<Int> offset)
        {
                return lhs = lhs + offset;
        }
 
-       RValue<Pointer<Byte>> operator+=(const Pointer<Byte> &lhs, RValue<UInt> offset)
+       RValue<Pointer<Byte>> operator+=(Pointer<Byte> &lhs, RValue<UInt> offset)
        {
                return lhs = lhs + offset;
        }
@@ -6953,17 +6347,17 @@ namespace sw
                return lhs + -offset;
        }
 
-       RValue<Pointer<Byte>> operator-=(const Pointer<Byte> &lhs, int offset)
+       RValue<Pointer<Byte>> operator-=(Pointer<Byte> &lhs, int offset)
        {
                return lhs = lhs - offset;
        }
 
-       RValue<Pointer<Byte>> operator-=(const Pointer<Byte> &lhs, RValue<Int> offset)
+       RValue<Pointer<Byte>> operator-=(Pointer<Byte> &lhs, RValue<Int> offset)
        {
                return lhs = lhs - offset;
        }
 
-       RValue<Pointer<Byte>> operator-=(const Pointer<Byte> &lhs, RValue<UInt> offset)
+       RValue<Pointer<Byte>> operator-=(Pointer<Byte> &lhs, RValue<UInt> offset)
        {
                return lhs = lhs - offset;
        }
@@ -6975,44 +6369,17 @@ namespace sw
                Nucleus::createUnreachable();
        }
 
-       void Return(bool ret)
-       {
-               Nucleus::createRet(V(Nucleus::createConstantBool(ret)));
-               Nucleus::setInsertBlock(Nucleus::createBasicBlock());
-               Nucleus::createUnreachable();
-       }
-
-       void Return(const Int &ret)
+       void Return(RValue<Int> ret)
        {
-               Nucleus::createRet(ret.loadValue());
+               Nucleus::createRet(ret.value);
                Nucleus::setInsertBlock(Nucleus::createBasicBlock());
                Nucleus::createUnreachable();
        }
 
-       BasicBlock *beginLoop()
-       {
-               BasicBlock *loopBB = Nucleus::createBasicBlock();
-
-               Nucleus::createBr(loopBB);
-               Nucleus::setInsertBlock(loopBB);
-
-               return loopBB;
-       }
-
-       bool branch(RValue<Bool> cmp, BasicBlock *bodyBB, BasicBlock *endBB)
+       void branch(RValue<Bool> cmp, BasicBlock *bodyBB, BasicBlock *endBB)
        {
                Nucleus::createCondBr(cmp.value, bodyBB, endBB);
                Nucleus::setInsertBlock(bodyBB);
-
-               return true;
-       }
-
-       bool elseBlock(BasicBlock *falseBB)
-       {
-               falseBB->back().eraseFromParent();
-               Nucleus::setInsertBlock(falseBB);
-
-               return true;
        }
 
        RValue<Long> Ticks()
@@ -7074,7 +6441,7 @@ namespace sw
 
                        Value *vector = Nucleus::createInsertElement(V(UndefValue::get(Float4::getType())), val.value, 0);
 
-                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall(rcpss, vector)), 0));
+                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall(rcpss, vector)), Float::getType(), 0));
                }
 
                RValue<Float> sqrtss(RValue<Float> val)
@@ -7083,7 +6450,7 @@ namespace sw
 
                        Value *vector = Nucleus::createInsertElement(V(UndefValue::get(Float4::getType())), val.value, 0);
 
-                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall(sqrtss, vector)), 0));
+                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall(sqrtss, vector)), Float::getType(), 0));
                }
 
                RValue<Float> rsqrtss(RValue<Float> val)
@@ -7092,7 +6459,7 @@ namespace sw
 
                        Value *vector = Nucleus::createInsertElement(V(UndefValue::get(Float4::getType())), val.value, 0);
 
-                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall(rsqrtss, vector)), 0));
+                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall(rsqrtss, vector)), Float::getType(), 0));
                }
 
                RValue<Float4> rcpps(RValue<Float4> val)
@@ -7137,7 +6504,7 @@ namespace sw
                        Value *undef = V(UndefValue::get(Float4::getType()));
                        Value *vector = Nucleus::createInsertElement(undef, val.value, 0);
 
-                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall3(roundss, undef, vector, V(Nucleus::createConstantInt(imm)))), 0));
+                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall3(roundss, undef, vector, V(Nucleus::createConstantInt(imm)))), Float::getType(), 0));
                }
 
                RValue<Float> floorss(RValue<Float> val)
@@ -7221,7 +6588,7 @@ namespace sw
                        Value *vector1 = Nucleus::createInsertElement(V(UndefValue::get(Float4::getType())), x.value, 0);
                        Value *vector2 = Nucleus::createInsertElement(V(UndefValue::get(Float4::getType())), y.value, 0);
 
-                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall3(cmpss, vector1, vector2, V(Nucleus::createConstantByte(imm)))), 0));
+                       return RValue<Float>(Nucleus::createExtractElement(V(::builder->CreateCall3(cmpss, vector1, vector2, V(Nucleus::createConstantByte(imm)))), Float::getType(), 0));
                }
 
                RValue<Float> cmpeqss(RValue<Float> x, RValue<Float> y)
@@ -7275,126 +6642,126 @@ namespace sw
                {
                        llvm::Function *paddsw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_padds_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(paddsw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(paddsw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> psubsw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *psubsw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psubs_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(psubsw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(psubsw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<UShort4> paddusw(RValue<UShort4> x, RValue<UShort4> y)
                {
                        llvm::Function *paddusw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_paddus_w);
 
-                       return As<UShort4>(RValue<MMX>(V(::builder->CreateCall2(paddusw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<UShort4>(V(::builder->CreateCall2(paddusw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<UShort4> psubusw(RValue<UShort4> x, RValue<UShort4> y)
                {
                        llvm::Function *psubusw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psubus_w);
 
-                       return As<UShort4>(RValue<MMX>(V(::builder->CreateCall2(psubusw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<UShort4>(V(::builder->CreateCall2(psubusw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<SByte8> paddsb(RValue<SByte8> x, RValue<SByte8> y)
                {
                        llvm::Function *paddsb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_padds_b);
 
-                       return As<SByte8>(RValue<MMX>(V(::builder->CreateCall2(paddsb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<SByte8>(V(::builder->CreateCall2(paddsb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<SByte8> psubsb(RValue<SByte8> x, RValue<SByte8> y)
                {
                        llvm::Function *psubsb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psubs_b);
 
-                       return As<SByte8>(RValue<MMX>(V(::builder->CreateCall2(psubsb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<SByte8>(V(::builder->CreateCall2(psubsb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Byte8> paddusb(RValue<Byte8> x, RValue<Byte8> y)
                {
                        llvm::Function *paddusb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_paddus_b);
 
-                       return As<Byte8>(RValue<MMX>(V(::builder->CreateCall2(paddusb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Byte8>(V(::builder->CreateCall2(paddusb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Byte8> psubusb(RValue<Byte8> x, RValue<Byte8> y)
                {
                        llvm::Function *psubusb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psubus_b);
 
-                       return As<Byte8>(RValue<MMX>(V(::builder->CreateCall2(psubusb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Byte8>(V(::builder->CreateCall2(psubusb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> paddw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *paddw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_padd_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(paddw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(paddw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> psubw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *psubw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psub_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(psubw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(psubw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pmullw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pmullw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pmull_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pmullw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pmullw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pand(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pand = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pand);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pand, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pand, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> por(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *por = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_por);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(por, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(por, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pxor(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pxor = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pxor);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pxor, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pxor, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pshufw(RValue<Short4> x, unsigned char y)
                {
                        llvm::Function *pshufw = Intrinsic::getDeclaration(::module, Intrinsic::x86_sse_pshuf_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pshufw, As<MMX>(x).value, V(Nucleus::createConstantByte(y))))));
+                       return As<Short4>(V(::builder->CreateCall2(pshufw, As<MMX>(x).value, V(Nucleus::createConstantByte(y)))));
                }
 
                RValue<Int2> punpcklwd(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *punpcklwd = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_punpcklwd);
 
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(punpcklwd, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Int2>(V(::builder->CreateCall2(punpcklwd, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Int2> punpckhwd(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *punpckhwd = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_punpckhwd);
 
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(punpckhwd, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Int2>(V(::builder->CreateCall2(punpckhwd, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pinsrw(RValue<Short4> x, RValue<Int> y, unsigned int i)
                {
                        llvm::Function *pinsrw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pinsr_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall3(pinsrw, As<MMX>(x).value, y.value, V(Nucleus::createConstantInt(i))))));
+                       return As<Short4>(V(::builder->CreateCall3(pinsrw, As<MMX>(x).value, y.value, V(Nucleus::createConstantInt(i)))));
                }
 
                RValue<Int> pextrw(RValue<Short4> x, unsigned int i)
@@ -7404,116 +6771,116 @@ namespace sw
                        return RValue<Int>(V(::builder->CreateCall2(pextrw, As<MMX>(x).value, V(Nucleus::createConstantInt(i)))));
                }
 
-               RValue<Long1> punpckldq(RValue<Int2> x, RValue<Int2> y)
+               RValue<Short4> punpckldq(RValue<Int2> x, RValue<Int2> y)
                {
                        llvm::Function *punpckldq = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_punpckldq);
 
-                       return As<Long1>(RValue<MMX>(V(::builder->CreateCall2(punpckldq, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(punpckldq, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
-               RValue<Long1> punpckhdq(RValue<Int2> x, RValue<Int2> y)
+               RValue<Short4> punpckhdq(RValue<Int2> x, RValue<Int2> y)
                {
                        llvm::Function *punpckhdq = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_punpckhdq);
 
-                       return As<Long1>(RValue<MMX>(V(::builder->CreateCall2(punpckhdq, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(punpckhdq, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> punpcklbw(RValue<Byte8> x, RValue<Byte8> y)
                {
                        llvm::Function *punpcklbw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_punpcklbw);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(punpcklbw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(punpcklbw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> punpckhbw(RValue<Byte8> x, RValue<Byte8> y)
                {
                        llvm::Function *punpckhbw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_punpckhbw);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(punpckhbw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(punpckhbw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Byte8> paddb(RValue<Byte8> x, RValue<Byte8> y)
                {
                        llvm::Function *paddb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_padd_b);
 
-                       return As<Byte8>(RValue<MMX>(V(::builder->CreateCall2(paddb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Byte8>(V(::builder->CreateCall2(paddb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Byte8> psubb(RValue<Byte8> x, RValue<Byte8> y)
                {
                        llvm::Function *psubb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psub_b);
 
-                       return As<Byte8>(RValue<MMX>(V(::builder->CreateCall2(psubb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Byte8>(V(::builder->CreateCall2(psubb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Int2> paddd(RValue<Int2> x, RValue<Int2> y)
                {
                        llvm::Function *paddd = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_padd_d);
 
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(paddd, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Int2>(V(::builder->CreateCall2(paddd, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Int2> psubd(RValue<Int2> x, RValue<Int2> y)
                {
                        llvm::Function *psubd = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psub_d);
 
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(psubd, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Int2>(V(::builder->CreateCall2(psubd, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<UShort4> pavgw(RValue<UShort4> x, RValue<UShort4> y)
                {
                        llvm::Function *pavgw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pavg_w);
 
-                       return As<UShort4>(RValue<MMX>(V(::builder->CreateCall2(pavgw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<UShort4>(V(::builder->CreateCall2(pavgw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pmaxsw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pmaxsw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pmaxs_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pmaxsw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pmaxsw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pminsw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pminsw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pmins_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pminsw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pminsw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pcmpgtw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pcmpgtw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pcmpgt_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pcmpgtw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pcmpgtw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> pcmpeqw(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pcmpeqw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pcmpeq_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pcmpeqw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pcmpeqw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Byte8> pcmpgtb(RValue<SByte8> x, RValue<SByte8> y)
                {
                        llvm::Function *pcmpgtb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pcmpgt_b);
 
-                       return As<Byte8>(RValue<MMX>(V(::builder->CreateCall2(pcmpgtb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Byte8>(V(::builder->CreateCall2(pcmpgtb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Byte8> pcmpeqb(RValue<Byte8> x, RValue<Byte8> y)
                {
                        llvm::Function *pcmpeqb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pcmpeq_b);
 
-                       return As<Byte8>(RValue<MMX>(V(::builder->CreateCall2(pcmpeqb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Byte8>(V(::builder->CreateCall2(pcmpeqb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short4> packssdw(RValue<Int2> x, RValue<Int2> y)
                {
                        llvm::Function *packssdw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_packssdw);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(packssdw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(packssdw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short8> packssdw(RValue<Int4> x, RValue<Int4> y)
@@ -7543,17 +6910,17 @@ namespace sw
                {
                        llvm::Function *packsswb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_packsswb);
 
-                       return As<SByte8>(RValue<MMX>(V(::builder->CreateCall2(packsswb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<SByte8>(V(::builder->CreateCall2(packsswb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Byte8> packuswb(RValue<UShort4> x, RValue<UShort4> y)
                {
                        llvm::Function *packuswb = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_packuswb);
 
-                       return As<Byte8>(RValue<MMX>(V(::builder->CreateCall2(packuswb, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Byte8>(V(::builder->CreateCall2(packuswb, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
-               RValue<UShort8> packusdw(RValue<UInt4> x, RValue<UInt4> y)
+               RValue<UShort8> packusdw(RValue<Int4> x, RValue<Int4> y)
                {
                        if(CPUID::supportsSSE4_1())
                        {
@@ -7563,8 +6930,10 @@ namespace sw
                        }
                        else
                        {
-                               // FIXME: Not an exact replacement!
-                               return As<UShort8>(packssdw(As<Int4>(x - UInt4(0x00008000, 0x00008000, 0x00008000, 0x00008000)), As<Int4>(y - UInt4(0x00008000, 0x00008000, 0x00008000, 0x00008000))) + Short8(0x8000u, 0x8000u, 0x8000u, 0x8000u, 0x8000u, 0x8000u, 0x8000u, 0x8000u));
+                               RValue<Int4> bx = (x & ~(x >> 31)) - Int4(0x8000);
+                               RValue<Int4> by = (y & ~(y >> 31)) - Int4(0x8000);
+
+                               return As<UShort8>(packssdw(bx, by) + Short8(0x8000u));
                        }
                }
 
@@ -7572,7 +6941,7 @@ namespace sw
                {
                        llvm::Function *psrlw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psrli_w);
 
-                       return As<UShort4>(RValue<MMX>(V(::builder->CreateCall2(psrlw, As<MMX>(x).value, V(Nucleus::createConstantInt(y))))));
+                       return As<UShort4>(V(::builder->CreateCall2(psrlw, As<MMX>(x).value, V(Nucleus::createConstantInt(y)))));
                }
 
                RValue<UShort8> psrlw(RValue<UShort8> x, unsigned char y)
@@ -7586,7 +6955,7 @@ namespace sw
                {
                        llvm::Function *psraw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psrai_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(psraw, As<MMX>(x).value, V(Nucleus::createConstantInt(y))))));
+                       return As<Short4>(V(::builder->CreateCall2(psraw, As<MMX>(x).value, V(Nucleus::createConstantInt(y)))));
                }
 
                RValue<Short8> psraw(RValue<Short8> x, unsigned char y)
@@ -7600,7 +6969,7 @@ namespace sw
                {
                        llvm::Function *psllw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pslli_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(psllw, As<MMX>(x).value, V(Nucleus::createConstantInt(y))))));
+                       return As<Short4>(V(::builder->CreateCall2(psllw, As<MMX>(x).value, V(Nucleus::createConstantInt(y)))));
                }
 
                RValue<Short8> psllw(RValue<Short8> x, unsigned char y)
@@ -7614,7 +6983,7 @@ namespace sw
                {
                        llvm::Function *pslld = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pslli_d);
 
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(pslld, As<MMX>(x).value, V(Nucleus::createConstantInt(y))))));
+                       return As<Int2>(V(::builder->CreateCall2(pslld, As<MMX>(x).value, V(Nucleus::createConstantInt(y)))));
                }
 
                RValue<Int4> pslld(RValue<Int4> x, unsigned char y)
@@ -7641,7 +7010,7 @@ namespace sw
                {
                        llvm::Function *psrad = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psrai_d);
 
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(psrad, As<MMX>(x).value, V(Nucleus::createConstantInt(y))))));
+                       return As<Int2>(V(::builder->CreateCall2(psrad, As<MMX>(x).value, V(Nucleus::createConstantInt(y)))));
                }
 
                RValue<Int4> psrad(RValue<Int4> x, unsigned char y)
@@ -7668,7 +7037,7 @@ namespace sw
                {
                        llvm::Function *psrld = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psrli_d);
 
-                       return As<UInt2>(RValue<MMX>(V(::builder->CreateCall2(psrld, As<MMX>(x).value, V(Nucleus::createConstantInt(y))))));
+                       return As<UInt2>(V(::builder->CreateCall2(psrld, As<MMX>(x).value, V(Nucleus::createConstantInt(y)))));
                }
 
                RValue<UInt4> psrld(RValue<UInt4> x, unsigned char y)
@@ -7691,48 +7060,6 @@ namespace sw
                        }
                }
 
-               RValue<UShort4> psrlw(RValue<UShort4> x, RValue<Long1> y)
-               {
-                       llvm::Function *psrlw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psrl_w);
-
-                       return As<UShort4>(RValue<MMX>(V(::builder->CreateCall2(psrlw, As<MMX>(x).value, As<MMX>(y).value))));
-               }
-
-               RValue<Short4> psraw(RValue<Short4> x, RValue<Long1> y)
-               {
-                       llvm::Function *psraw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psra_w);
-
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(psraw, As<MMX>(x).value, As<MMX>(y).value))));
-               }
-
-               RValue<Short4> psllw(RValue<Short4> x, RValue<Long1> y)
-               {
-                       llvm::Function *psllw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psll_w);
-
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(psllw, As<MMX>(x).value, As<MMX>(y).value))));
-               }
-
-               RValue<Int2> pslld(RValue<Int2> x, RValue<Long1> y)
-               {
-                       llvm::Function *pslld = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psll_d);
-
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(pslld, As<MMX>(x).value, As<MMX>(y).value))));
-               }
-
-               RValue<UInt2> psrld(RValue<UInt2> x, RValue<Long1> y)
-               {
-                       llvm::Function *psrld = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psrl_d);
-
-                       return As<UInt2>(RValue<MMX>(V(::builder->CreateCall2(psrld, As<MMX>(x).value, As<MMX>(y).value))));
-               }
-
-               RValue<Int2> psrad(RValue<Int2> x, RValue<Long1> y)
-               {
-                       llvm::Function *psrld = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_psra_d);
-
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(psrld, As<MMX>(x).value, As<MMX>(y).value))));
-               }
-
                RValue<Int4> pmaxsd(RValue<Int4> x, RValue<Int4> y)
                {
                        llvm::Function *pmaxsd = Intrinsic::getDeclaration(::module, Intrinsic::x86_sse41_pmaxsd);
@@ -7765,21 +7092,21 @@ namespace sw
                {
                        llvm::Function *pmulhw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pmulh_w);
 
-                       return As<Short4>(RValue<MMX>(V(::builder->CreateCall2(pmulhw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Short4>(V(::builder->CreateCall2(pmulhw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<UShort4> pmulhuw(RValue<UShort4> x, RValue<UShort4> y)
                {
                        llvm::Function *pmulhuw = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pmulhu_w);
 
-                       return As<UShort4>(RValue<MMX>(V(::builder->CreateCall2(pmulhuw, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<UShort4>(V(::builder->CreateCall2(pmulhuw, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Int2> pmaddwd(RValue<Short4> x, RValue<Short4> y)
                {
                        llvm::Function *pmaddwd = Intrinsic::getDeclaration(::module, Intrinsic::x86_mmx_pmadd_wd);
 
-                       return As<Int2>(RValue<MMX>(V(::builder->CreateCall2(pmaddwd, As<MMX>(x).value, As<MMX>(y).value))));
+                       return As<Int2>(V(::builder->CreateCall2(pmaddwd, As<MMX>(x).value, As<MMX>(y).value)));
                }
 
                RValue<Short8> pmulhw(RValue<Short8> x, RValue<Short8> y)
@@ -7831,7 +7158,7 @@ namespace sw
 
                //RValue<Int2> movdq2q(RValue<Int4> x)
                //{
-               //      Value *long2 = Nucleus::createBitCast(x.value, Long2::getType());
+               //      Value *long2 = Nucleus::createBitCast(x.value, T(VectorType::get(Long::getType(), 2)));
                //      Value *element = Nucleus::createExtractElement(long2, ConstantInt::get(Int::getType(), 0));
 
                //      return RValue<Int2>(Nucleus::createBitCast(element, Int2::getType()));