* Expose new command line arg --debug-pass for gccas and llc debugging

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

diff --git a/lib/VMCore/iMemory.cpp b/lib/VMCore/iMemory.cpp
index 4403224b880e0c5bbc72f8f86696f363e9fe6cf2..4226a69615750a96e3d86ef5b9fb4607f1df56d3 100644 (file)
--- a/lib/VMCore/iMemory.cpp
+++ b/lib/VMCore/iMemory.cpp
@@ -5,7 +5,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/iMemory.h"
-#include "llvm/ConstPoolVals.h"
+
+static inline const Type *checkType(const Type *Ty) {
+  assert(Ty && "Invalid indices for type!");
+  return Ty;
+}
 
 //===----------------------------------------------------------------------===//
 //                        MemAccessInst Implementation
@@ -17,31 +21,26 @@
 // A null type is returned if the indices are invalid for the specified 
 // pointer type.
 //
-const Type *MemAccessInst::getIndexedType(const Type *Ptr, 
-                                         const vector<ConstPoolVal*> &Idx,
-                                         bool AllowStructLeaf = false) {
+const Type* MemAccessInst::getIndexedType(const Type *Ptr, 
+                                         const std::vector<Value*> &Idx,
+                                         bool AllowCompositeLeaf = false) {
   if (!Ptr->isPointerType()) return 0;   // Type isn't a pointer type!
+
+  // Handle the special case of the empty set index set...
+  if (Idx.empty()) return cast<PointerType>(Ptr)->getElementType();
  
-  // Get the type pointed to...
-  Ptr = ((const PointerType*)Ptr)->getValueType();
-
-  if (Ptr->isStructType()) {
-    unsigned CurIDX = 0;
-    while (Ptr->isStructType()) {
-      if (Idx.size() == CurIDX) 
-       return AllowStructLeaf ? Ptr : 0;   // Can't load a whole structure!?!?
-      if (Idx[CurIDX]->getType() != Type::UByteTy) return 0; // Illegal idx
-      unsigned NextIdx = ((ConstPoolUInt*)Idx[CurIDX++])->getValue();
-      
-      const StructType *ST = (const StructType *)Ptr;
-      Ptr = ST->getElementTypes()[NextIdx];
+  unsigned CurIDX = 0;
+  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
+    if (Idx.size() == CurIDX) {
+      if (AllowCompositeLeaf || CT->isFirstClassType()) return Ptr;
+      return 0;   // Can't load a whole structure or array!?!?
     }
-    return Ptr;
-  } else if (Ptr->isArrayType()) {
-    assert(0 && "Loading from arrays not implemented yet!");
-  } else {
-    return (Idx.size() == 0) ? Ptr : 0;  // Load directly through ptr
+
+    Value *Index = Idx[CurIDX++];
+    if (!CT->indexValid(Index)) return 0;
+    Ptr = CT->getTypeAtIndex(Index);
   }
+  return CurIDX == Idx.size() ? Ptr : 0;
 }
 
 
@@ -49,15 +48,23 @@ const Type *MemAccessInst::getIndexedType(const Type *Ptr,
 //                           LoadInst Implementation
 //===----------------------------------------------------------------------===//
 
-LoadInst::LoadInst(Value *Ptr, const vector<ConstPoolVal*> &Idx,
-                  const string &Name = "")
-  : MemAccessInst(getIndexedType(Ptr->getType(), Idx), Load, Name) {
+LoadInst::LoadInst(Value *Ptr, const std::vector<Value*> &Idx,
+                  const std::string &Name = "")
+  : MemAccessInst(checkType(getIndexedType(Ptr->getType(), Idx)), Load, Name) {
   assert(getIndexedType(Ptr->getType(), Idx) && "Load operands invalid!");
   Operands.reserve(1+Idx.size());
   Operands.push_back(Use(Ptr, this));
-
+  
   for (unsigned i = 0, E = Idx.size(); i != E; ++i)
     Operands.push_back(Use(Idx[i], this));
+  
+}
+
+LoadInst::LoadInst(Value *Ptr, const std::string &Name = "")
+  : MemAccessInst(cast<PointerType>(Ptr->getType())->getElementType(),
+                  Load, Name) {
+  Operands.reserve(1);
+  Operands.push_back(Use(Ptr, this));
 }
 
 
@@ -65,8 +72,8 @@ LoadInst::LoadInst(Value *Ptr, const vector<ConstPoolVal*> &Idx,
 //                           StoreInst Implementation
 //===----------------------------------------------------------------------===//
 
-StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<ConstPoolVal*> &Idx,
-                    const string &Name = "")
+StoreInst::StoreInst(Value *Val, Value *Ptr, const std::vector<Value*> &Idx,
+                    const std::string &Name = "")
   : MemAccessInst(Type::VoidTy, Store, Name) {
   assert(getIndexedType(Ptr->getType(), Idx) && "Store operands invalid!");
   
@@ -78,15 +85,24 @@ StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<ConstPoolVal*> &Idx,
     Operands.push_back(Use(Idx[i], this));
 }
 
+StoreInst::StoreInst(Value *Val, Value *Ptr, const std::string &Name = "")
+  : MemAccessInst(Type::VoidTy, Store, Name) {
+  
+  Operands.reserve(2);
+  Operands.push_back(Use(Val, this));
+  Operands.push_back(Use(Ptr, this));
+}
+
 
 //===----------------------------------------------------------------------===//
 //                       GetElementPtrInst Implementation
 //===----------------------------------------------------------------------===//
 
-GetElementPtrInst::GetElementPtrInst(Value *Ptr, 
-                                    const vector<ConstPoolVal*> &Idx,
-                                    const string &Name = "")
-  : MemAccessInst(PointerType::getPointerType(getIndexedType(Ptr->getType(), Idx, true)), GetElementPtr, Name) {
+GetElementPtrInst::GetElementPtrInst(Value *Ptr, const std::vector<Value*> &Idx,
+                                    const std::string &Name = "")
+  : MemAccessInst(PointerType::get(checkType(getIndexedType(Ptr->getType(),
+                                                            Idx, true))),
+                 GetElementPtr, Name) {
   assert(getIndexedType(Ptr->getType(), Idx, true) && "gep operands invalid!");
   Operands.reserve(1+Idx.size());
   Operands.push_back(Use(Ptr, this));
@@ -95,3 +111,6 @@ GetElementPtrInst::GetElementPtrInst(Value *Ptr,
     Operands.push_back(Use(Idx[i], this));
 }
 
+bool GetElementPtrInst::isStructSelector() const {
+  return ((PointerType*)Operands[0]->getType())->getElementType()->isStructType();
+}