Add notes

[oota-llvm.git] / lib / VMCore / iMemory.cpp

diff --git a/lib/VMCore/iMemory.cpp b/lib/VMCore/iMemory.cpp
index c793783b2f850eef5b6bb49324271d5e798f9e88..cc24ca144120ec8162dd8e250f2ab41180c6e7fd 100644 (file)
--- a/lib/VMCore/iMemory.cpp
+++ b/lib/VMCore/iMemory.cpp
@@ -44,46 +44,6 @@ const Type* MemAccessInst::getIndexedType(const Type *Ptr,
   }
 }
 
-unsigned int
-MemAccessInst::getIndexedOfsetForTarget(const Type *Ptr, 
-                                       const vector<ConstPoolVal*> &Idx,
-                                       const TargetMachine& targetMachine)
-{
-  if (!Ptr->isPointerType())
-    return 0;                          // Type isn't a pointer type!
- 
-  unsigned int curOffset = 0;
-  
-  // Get the type pointed to...
-  Ptr = ((const PointerType*) Ptr)->getValueType();
-  
-  if (Ptr->isStructType()) {
-    unsigned CurIDX = 0;               // which element of Idx vector
-    while (Ptr->isStructType()) {
-      const StructType * SPtr = (StructType *) Ptr;
-      
-      if (Idx.size() == CurIDX) 
-       break;
-      
-      assert (Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx");
-      unsigned NextIdx = ((ConstPoolUInt*)Idx[CurIDX++])->getValue();
-      
-      // add the offset for the current element
-      curOffset += SPtr->getElementOffset(NextIdx, targetMachine);
-      
-      // and update Ptr to refer to current element
-      Ptr = SPtr->getElementTypes()[NextIdx];
-    }
-    return curOffset;
-  } else if (Ptr->isArrayType()) {
-    assert(0 && "Loading from arrays not implemented yet!");
-  } else {
-    assert (Idx.size() == 0 && "Indexing type that is not struct or array?");
-    return 0;                          // Load directly through ptr
-  }
-}
-  
-
 //===----------------------------------------------------------------------===//
 //                           LoadInst Implementation
 //===----------------------------------------------------------------------===//
@@ -100,6 +60,13 @@ LoadInst::LoadInst(Value *Ptr, const vector<ConstPoolVal*> &Idx,
   
 }
 
+LoadInst::LoadInst(Value *Ptr, const string &Name = "")
+  : MemAccessInst(cast<PointerType>(Ptr->getType())->getValueType(),
+                  Load, vector<ConstPoolVal*>(), Name) {
+  Operands.reserve(1);
+  Operands.push_back(Use(Ptr, this));
+}
+
 
 //===----------------------------------------------------------------------===//
 //                           StoreInst Implementation
@@ -118,6 +85,14 @@ StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<ConstPoolVal*> &Idx,
     Operands.push_back(Use(Idx[i], this));
 }
 
+StoreInst::StoreInst(Value *Val, Value *Ptr, const string &Name = "")
+  : MemAccessInst(Type::VoidTy, Store, vector<ConstPoolVal*>(), Name) {
+  
+  Operands.reserve(2);
+  Operands.push_back(Use(Val, this));
+  Operands.push_back(Use(Ptr, this));
+}
+
 
 //===----------------------------------------------------------------------===//
 //                       GetElementPtrInst Implementation
@@ -126,8 +101,7 @@ StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<ConstPoolVal*> &Idx,
 GetElementPtrInst::GetElementPtrInst(Value *Ptr, 
                                     const vector<ConstPoolVal*> &Idx,
                                     const string &Name = "")
-  : MemAccessInst(PointerType::getPointerType(getIndexedType(Ptr->getType(),
-                                                            Idx, true)),
+  : MemAccessInst(PointerType::get(getIndexedType(Ptr->getType(), Idx, true)),
                  GetElementPtr, Idx, Name) {
   assert(getIndexedType(Ptr->getType(), Idx, true) && "gep operands invalid!");
   Operands.reserve(1+Idx.size());