diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2007-04-21 18:36:27 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2007-04-21 18:36:27 +0000 |
commit | c67bdc288aac130d88630f7fa95ceca6bcf95077 (patch) | |
tree | 3fae3a889e0520a5670196b40f6a2f9eb5b1adfb /lib/VMCore/Instructions.cpp | |
parent | b3b0727032e58c8b8f3017c2b3f560616c6905af (diff) | |
download | external_llvm-c67bdc288aac130d88630f7fa95ceca6bcf95077.zip external_llvm-c67bdc288aac130d88630f7fa95ceca6bcf95077.tar.gz external_llvm-c67bdc288aac130d88630f7fa95ceca6bcf95077.tar.bz2 |
Revert Christopher Lamb's load/store alignment changes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36309 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore/Instructions.cpp')
-rw-r--r-- | lib/VMCore/Instructions.cpp | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp index 91f3b58..bfda46d 100644 --- a/lib/VMCore/Instructions.cpp +++ b/lib/VMCore/Instructions.cpp @@ -20,7 +20,6 @@ #include "llvm/ParameterAttributes.h" #include "llvm/Support/CallSite.h" #include "llvm/Support/ConstantRange.h" -#include "llvm/Support/MathExtras.h" using namespace llvm; unsigned CallSite::getCallingConv() const { @@ -686,7 +685,6 @@ LoadInst::LoadInst(Value *Ptr, const std::string &Name, Instruction *InsertBef) : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertBef) { setVolatile(false); - setAlignment(0); AssertOK(); setName(Name); } @@ -695,7 +693,6 @@ LoadInst::LoadInst(Value *Ptr, const std::string &Name, BasicBlock *InsertAE) : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertAE) { setVolatile(false); - setAlignment(0); AssertOK(); setName(Name); } @@ -705,17 +702,6 @@ LoadInst::LoadInst(Value *Ptr, const std::string &Name, bool isVolatile, : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertBef) { setVolatile(isVolatile); - setAlignment(0); - AssertOK(); - setName(Name); -} - -LoadInst::LoadInst(Value *Ptr, const std::string &Name, bool isVolatile, - unsigned Align, Instruction *InsertBef) - : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), - Load, Ptr, InsertBef) { - setVolatile(isVolatile); - setAlignment(Align); AssertOK(); setName(Name); } @@ -725,7 +711,6 @@ LoadInst::LoadInst(Value *Ptr, const std::string &Name, bool isVolatile, : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertAE) { setVolatile(isVolatile); - setAlignment(0); AssertOK(); setName(Name); } @@ -736,7 +721,6 @@ LoadInst::LoadInst(Value *Ptr, const char *Name, Instruction *InsertBef) : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertBef) { setVolatile(false); - setAlignment(0); AssertOK(); if (Name && Name[0]) setName(Name); } @@ -745,7 +729,6 @@ LoadInst::LoadInst(Value *Ptr, const char *Name, BasicBlock *InsertAE) : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertAE) { setVolatile(false); - setAlignment(0); AssertOK(); if (Name && Name[0]) setName(Name); } @@ -755,7 +738,6 @@ LoadInst::LoadInst(Value *Ptr, const char *Name, bool isVolatile, : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertBef) { setVolatile(isVolatile); - setAlignment(0); AssertOK(); if (Name && Name[0]) setName(Name); } @@ -765,15 +747,10 @@ LoadInst::LoadInst(Value *Ptr, const char *Name, bool isVolatile, : UnaryInstruction(cast<PointerType>(Ptr->getType())->getElementType(), Load, Ptr, InsertAE) { setVolatile(isVolatile); - setAlignment(0); AssertOK(); if (Name && Name[0]) setName(Name); } -void LoadInst::setAlignment(unsigned Align) { - assert((Align & (Align-1)) == 0 && "Alignment is not a power of 2!"); - SubclassData = (SubclassData & 1) | ((Log2_32(Align)+1)<<1); -} //===----------------------------------------------------------------------===// // StoreInst Implementation @@ -793,7 +770,6 @@ StoreInst::StoreInst(Value *val, Value *addr, Instruction *InsertBefore) Ops[0].init(val, this); Ops[1].init(addr, this); setVolatile(false); - setAlignment(0); AssertOK(); } @@ -802,7 +778,6 @@ StoreInst::StoreInst(Value *val, Value *addr, BasicBlock *InsertAtEnd) Ops[0].init(val, this); Ops[1].init(addr, this); setVolatile(false); - setAlignment(0); AssertOK(); } @@ -812,17 +787,6 @@ StoreInst::StoreInst(Value *val, Value *addr, bool isVolatile, Ops[0].init(val, this); Ops[1].init(addr, this); setVolatile(isVolatile); - setAlignment(0); - AssertOK(); -} - -StoreInst::StoreInst(Value *val, Value *addr, bool isVolatile, - unsigned Align, Instruction *InsertBefore) - : Instruction(Type::VoidTy, Store, Ops, 2, InsertBefore) { - Ops[0].init(val, this); - Ops[1].init(addr, this); - setVolatile(isVolatile); - setAlignment(Align); AssertOK(); } @@ -832,15 +796,9 @@ StoreInst::StoreInst(Value *val, Value *addr, bool isVolatile, Ops[0].init(val, this); Ops[1].init(addr, this); setVolatile(isVolatile); - setAlignment(0); AssertOK(); } -void StoreInst::setAlignment(unsigned Align) { - assert((Align & (Align-1)) == 0 && "Alignment is not a power of 2!"); - SubclassData = (SubclassData & 1) | ((Log2_32(Align)+1)<<1); -} - //===----------------------------------------------------------------------===// // GetElementPtrInst Implementation //===----------------------------------------------------------------------===// |