Skip to content

S
swiftshader
Commit 22479eb6 by Nicolas Capens
Options

Make LValue a template class.

This avoids having to store the type as a member field. Bug swiftshader:12 Change-Id: I53ea4869a5b590027217d1e9cc015c0502ab530f Reviewed-on: https://swiftshader-review.googlesource.com/7361Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent c37252c9
Showing with 56 additions and 77 deletions
src/Reactor/LLVMReactor.cpp
...@@ -810,31 +810,6 @@ namespace sw ...@@ -810,31 +810,6 @@ namespace sw
return T(llvm::Type::getVoidTy(*::context)); return T(llvm::Type::getVoidTy(*::context));
} }
LValue::LValue(Type *type, int arraySize) : type(type)
{
address = Nucleus::allocateStackVariable(type, arraySize);
}
Value *LValue::loadValue(unsigned int alignment) const
{
return Nucleus::createLoad(address, type, false, alignment);
}
Value *LValue::storeValue(Value *value, unsigned int alignment) const
{
return Nucleus::createStore(value, address, false, alignment);
}
Value *LValue::storeValue(Constant *constant, unsigned int alignment) const
{
return Nucleus::createStore(constant, address, false, alignment);
}
Value *LValue::getAddress(Value *index) const
{
return Nucleus::createGEP(address, index);
}
class MMX : public Variable<MMX> class MMX : public Variable<MMX>
{ {
public: public:
......
src/Reactor/Reactor.hpp
...@@ -68,10 +68,11 @@ namespace sw ...@@ -68,10 +68,11 @@ namespace sw
template<class T> template<class T>
class Pointer; class Pointer;
template<class T>
class LValue class LValue
{ {
public: public:
LValue(Type *type, int arraySize = 0); LValue(int arraySize = 0);
static bool isVoid() static bool isVoid()
{ {
...@@ -84,12 +85,11 @@ namespace sw ...@@ -84,12 +85,11 @@ namespace sw
Value *getAddress(Value *index) const; Value *getAddress(Value *index) const;
protected: protected:
Type *const type;
Value *address; Value *address;
}; };
template<class T> template<class T>
class Variable : public LValue class Variable : public LValue<T>
{ {
public: public:
Variable(int arraySize = 0); Variable(int arraySize = 0);
...@@ -2210,7 +2210,7 @@ namespace sw ...@@ -2210,7 +2210,7 @@ namespace sw
Pointer(RValue<Pointer<S>> pointerS, int alignment = 1) : alignment(alignment) Pointer(RValue<Pointer<S>> pointerS, int alignment = 1) : alignment(alignment)
{ {
Value *pointerT = Nucleus::createBitCast(pointerS.value, Nucleus::getPointerType(T::getType())); Value *pointerT = Nucleus::createBitCast(pointerS.value, Nucleus::getPointerType(T::getType()));
LValue::storeValue(pointerT); LValue<Pointer<T>>::storeValue(pointerT);
} }
template<class S> template<class S>
...@@ -2218,7 +2218,7 @@ namespace sw ...@@ -2218,7 +2218,7 @@ namespace sw
{ {
Value *pointerS = pointer.loadValue(alignment); Value *pointerS = pointer.loadValue(alignment);
Value *pointerT = Nucleus::createBitCast(pointerS, Nucleus::getPointerType(T::getType())); Value *pointerT = Nucleus::createBitCast(pointerS, Nucleus::getPointerType(T::getType()));
LValue::storeValue(pointerT); LValue<Pointer<T>>::storeValue(pointerT);
} }
Pointer(Argument<Pointer<T>> argument); Pointer(Argument<Pointer<T>> argument);
...@@ -2345,14 +2345,44 @@ namespace sw ...@@ -2345,14 +2345,44 @@ namespace sw
namespace sw namespace sw
{ {
template<class T> template<class T>
Variable<T>::Variable(int arraySize) : LValue(T::getType(), arraySize) LValue<T>::LValue(int arraySize)
{
address = Nucleus::allocateStackVariable(T::getType(), arraySize);
}
template<class T>
Value *LValue<T>::loadValue(unsigned int alignment) const
{
return Nucleus::createLoad(address, T::getType(), false, alignment);
}
template<class T>
Value *LValue<T>::storeValue(Value *value, unsigned int alignment) const
{
return Nucleus::createStore(value, address, false, alignment);
}
template<class T>
Value *LValue<T>::storeValue(Constant *constant, unsigned int alignment) const
{
return Nucleus::createStore(constant, address, false, alignment);
}
template<class T>
Value *LValue<T>::getAddress(Value *index) const
{
return Nucleus::createGEP(address, index);
}
template<class T>
Variable<T>::Variable(int arraySize) : LValue<T>(arraySize)
{ {
} }
template<class T> template<class T>
RValue<Pointer<T>> Variable<T>::operator&() RValue<Pointer<T>> Variable<T>::operator&()
{ {
return RValue<Pointer<T>>(LValue::address); return RValue<Pointer<T>>(LValue<T>::address);
} }
template<class T> template<class T>
...@@ -2583,7 +2613,7 @@ namespace sw ...@@ -2583,7 +2613,7 @@ namespace sw
template<class T> template<class T>
Pointer<T>::Pointer(Argument<Pointer<T>> argument) : alignment(1) Pointer<T>::Pointer(Argument<Pointer<T>> argument) : alignment(1)
{ {
LValue::storeValue(argument.value); LValue<Pointer<T>>::storeValue(argument.value);
} }
template<class T> template<class T>
...@@ -2591,39 +2621,39 @@ namespace sw ...@@ -2591,39 +2621,39 @@ namespace sw
{ {
Constant *globalPointer = Nucleus::createConstantPointer(external, T::getType(), false, alignment); Constant *globalPointer = Nucleus::createConstantPointer(external, T::getType(), false, alignment);
LValue::storeValue(globalPointer); LValue<Pointer<T>>::storeValue(globalPointer);
} }
template<class T> template<class T>
Pointer<T>::Pointer() : alignment(1) Pointer<T>::Pointer() : alignment(1)
{ {
LValue::storeValue(Nucleus::createNullPointer(T::getType())); LValue<Pointer<T>>::storeValue(Nucleus::createNullPointer(T::getType()));
} }
template<class T> template<class T>
Pointer<T>::Pointer(RValue<Pointer<T>> rhs) : alignment(1) Pointer<T>::Pointer(RValue<Pointer<T>> rhs) : alignment(1)
{ {
LValue::storeValue(rhs.value); LValue<Pointer<T>>::storeValue(rhs.value);
} }
template<class T> template<class T>
Pointer<T>::Pointer(const Pointer<T> &rhs) : alignment(rhs.alignment) Pointer<T>::Pointer(const Pointer<T> &rhs) : alignment(rhs.alignment)
{ {
Value *value = rhs.loadValue(); Value *value = rhs.loadValue();
LValue::storeValue(value); LValue<Pointer<T>>::storeValue(value);
} }
template<class T> template<class T>
Pointer<T>::Pointer(const Reference<Pointer<T>> &rhs) : alignment(rhs.getAlignment()) Pointer<T>::Pointer(const Reference<Pointer<T>> &rhs) : alignment(rhs.getAlignment())
{ {
Value *value = rhs.loadValue(); Value *value = rhs.loadValue();
LValue::storeValue(value); LValue<Pointer<T>>::storeValue(value);
} }
template<class T> template<class T>
RValue<Pointer<T>> Pointer<T>::operator=(RValue<Pointer<T>> rhs) const RValue<Pointer<T>> Pointer<T>::operator=(RValue<Pointer<T>> rhs) const
{ {
LValue::storeValue(rhs.value); LValue<Pointer<T>>::storeValue(rhs.value);
return rhs; return rhs;
} }
...@@ -2632,7 +2662,7 @@ namespace sw ...@@ -2632,7 +2662,7 @@ namespace sw
RValue<Pointer<T>> Pointer<T>::operator=(const Pointer<T> &rhs) const RValue<Pointer<T>> Pointer<T>::operator=(const Pointer<T> &rhs) const
{ {
Value *value = rhs.loadValue(); Value *value = rhs.loadValue();
LValue::storeValue(value); LValue<Pointer<T>>::storeValue(value);
return RValue<Pointer<T>>(value); return RValue<Pointer<T>>(value);
} }
...@@ -2641,7 +2671,7 @@ namespace sw ...@@ -2641,7 +2671,7 @@ namespace sw
RValue<Pointer<T>> Pointer<T>::operator=(const Reference<Pointer<T>> &rhs) const RValue<Pointer<T>> Pointer<T>::operator=(const Reference<Pointer<T>> &rhs) const
{ {
Value *value = rhs.loadValue(); Value *value = rhs.loadValue();
LValue::storeValue(value); LValue<Pointer<T>>::storeValue(value);
return RValue<Pointer<T>>(value); return RValue<Pointer<T>>(value);
} }
...@@ -2649,13 +2679,13 @@ namespace sw ...@@ -2649,13 +2679,13 @@ namespace sw
template<class T> template<class T>
Reference<T> Pointer<T>::operator*() Reference<T> Pointer<T>::operator*()
{ {
return Reference<T>(LValue::loadValue(), alignment); return Reference<T>(LValue<Pointer<T>>::loadValue(), alignment);
} }
template<class T> template<class T>
Reference<T> Pointer<T>::operator[](int index) Reference<T> Pointer<T>::operator[](int index)
{ {
Value *element = Nucleus::createGEP(LValue::loadValue(), (Value*)Nucleus::createConstantInt(index)); Value *element = Nucleus::createGEP(LValue<Pointer<T>>::loadValue(), (Value*)Nucleus::createConstantInt(index));
return Reference<T>(element, alignment); return Reference<T>(element, alignment);
} }
...@@ -2663,7 +2693,7 @@ namespace sw ...@@ -2663,7 +2693,7 @@ namespace sw
template<class T> template<class T>
Reference<T> Pointer<T>::operator[](RValue<Int> index) Reference<T> Pointer<T>::operator[](RValue<Int> index)
{ {
Value *element = Nucleus::createGEP(LValue::loadValue(), index.value); Value *element = Nucleus::createGEP(LValue<Pointer<T>>::loadValue(), index.value);
return Reference<T>(element, alignment); return Reference<T>(element, alignment);
} }
...@@ -2682,7 +2712,7 @@ namespace sw ...@@ -2682,7 +2712,7 @@ namespace sw
template<class T, int S> template<class T, int S>
Reference<T> Array<T, S>::operator[](int index) Reference<T> Array<T, S>::operator[](int index)
{ {
Value *element = LValue::getAddress((Value*)Nucleus::createConstantInt(index)); Value *element = LValue<T>::getAddress((Value*)Nucleus::createConstantInt(index));
return Reference<T>(element); return Reference<T>(element);
} }
...@@ -2690,7 +2720,7 @@ namespace sw ...@@ -2690,7 +2720,7 @@ namespace sw
template<class T, int S> template<class T, int S>
Reference<T> Array<T, S>::operator[](RValue<Int> index) Reference<T> Array<T, S>::operator[](RValue<Int> index)
{ {
Value *element = LValue::getAddress(index.value); Value *element = LValue<T>::getAddress(index.value);
return Reference<T>(element); return Reference<T>(element);
} }
...@@ -2806,8 +2836,8 @@ namespace sw ...@@ -2806,8 +2836,8 @@ namespace sw
return RValue<T>(Nucleus::createBitCast(val.value, T::getType())); return RValue<T>(Nucleus::createBitCast(val.value, T::getType()));
} }
template<class T> template<class T, class S>
RValue<T> ReinterpretCast(const LValue &var) RValue<T> ReinterpretCast(const LValue<S> &var)
{ {
Value *val = var.loadValue(); Value *val = var.loadValue();
...@@ -2826,8 +2856,8 @@ namespace sw ...@@ -2826,8 +2856,8 @@ namespace sw
return ReinterpretCast<T>(val); return ReinterpretCast<T>(val);
} }
template<class T> template<class T, class S>
RValue<T> As(const LValue &var) RValue<T> As(const LValue<S> &var)
{ {
return ReinterpretCast<T>(var); return ReinterpretCast<T>(var);
} }
...@@ -2877,4 +2907,4 @@ namespace sw ...@@ -2877,4 +2907,4 @@ namespace sw
onceBB__ = 0, Nucleus::createBr(endBB__), Nucleus::setInsertBlock(endBB__)) onceBB__ = 0, Nucleus::createBr(endBB__), Nucleus::setInsertBlock(endBB__))
} }
#endif // sw_Reactor_hpp #endif // sw_Reactor_hpp
\ No newline at end of file
src/Reactor/SubzeroReactor.cpp
...@@ -773,31 +773,6 @@ namespace sw ...@@ -773,31 +773,6 @@ namespace sw
return T(Ice::IceType_void); return T(Ice::IceType_void);
} }
LValue::LValue(Type *type, int arraySize) : type(type)
{
address = Nucleus::allocateStackVariable(type, arraySize);
}
Value *LValue::loadValue(unsigned int alignment) const
{
return Nucleus::createLoad(address, type, false, alignment);
}
Value *LValue::storeValue(Value *value, unsigned int alignment) const
{
return Nucleus::createStore(value, address, false, alignment);
}
Value *LValue::storeValue(Constant *constant, unsigned int alignment) const
{
return Nucleus::createStore(constant, address, false, alignment);
}
Value *LValue::getAddress(Value *index) const
{
return Nucleus::createGEP(address, index);
}
Bool::Bool(Argument<Bool> argument) Bool::Bool(Argument<Bool> argument)
{ {
storeValue(argument.value); storeValue(argument.value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment