X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FExprTypeConvert.cpp;h=85f9bb0714cf09b8d657fbe17f80c73bcf329fb6;hb=b91b657e026e86082b665cc875c2881ed075b68d;hp=a1d92f1b26987ccccc3a1d2331e01251e4937fb6;hpb=cee8f9ae67104576b2028125b56e9ba4856a1d66;p=oota-llvm.git

diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp
index a1d92f1b269..85f9bb0714c 100644
--- a/lib/Transforms/ExprTypeConvert.cpp
+++ b/lib/Transforms/ExprTypeConvert.cpp
@@ -1,4 +1,4 @@
-//===- ExprTypeConvert.cpp - Code to change an LLVM Expr Type ---------------=//
+//===- ExprTypeConvert.cpp - Code to change an LLVM Expr Type -------------===//
 //
 // This file implements the part of level raising that checks to see if it is
 // possible to coerce an entire expression tree into a different type.  If
@@ -7,20 +7,15 @@
 //===----------------------------------------------------------------------===//
 
 #include "TransformInternals.h"
-#include "llvm/Method.h"
 #include "llvm/iOther.h"
+#include "llvm/iPHINode.h"
 #include "llvm/iMemory.h"
-#include "llvm/ConstPoolVals.h"
-#include "llvm/Optimizations/ConstantHandling.h"
-#include "llvm/Optimizations/DCE.h"
+#include "llvm/ConstantHandling.h"
 #include "llvm/Analysis/Expressions.h"
 #include "Support/STLExtras.h"
-#include <map>
+#include "Support/Statistic.h"
 #include <algorithm>
-
-#include "llvm/Assembly/Writer.h"
-
-//#define DEBUG_EXPR_CONVERT 1
+using std::cerr;
 
 static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
                                      ValueTypeCache &ConvertedTypes);
@@ -28,26 +23,6 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
 static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
                                  ValueMapCache &VMC);
 
-// AllIndicesZero - Return true if all of the indices of the specified memory
-// access instruction are zero, indicating an effectively nil offset to the 
-// pointer value.
-//
-static bool AllIndicesZero(const MemAccessInst *MAI) {
-  for (User::op_const_iterator S = MAI->idx_begin(), E = MAI->idx_end();
-       S != E; ++S)
-    if (!isa<ConstPoolVal>(*S) || !cast<ConstPoolVal>(*S)->isNullValue())
-      return false;
-  return true;
-}
-
-static unsigned getBaseTypeSize(const Type *Ty) {
-  if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty))
-    if (ATy->isUnsized())
-      return getBaseTypeSize(ATy->getElementType());
-  return TD.getTypeSize(Ty);
-}
-
-
 // Peephole Malloc instructions: we take a look at the use chain of the
 // malloc instruction, and try to find out if the following conditions hold:
 //   1. The malloc is of the form: 'malloc [sbyte], uint <constant>'
@@ -61,188 +36,158 @@ static unsigned getBaseTypeSize(const Type *Ty) {
 //
 static bool MallocConvertableToType(MallocInst *MI, const Type *Ty,
                                     ValueTypeCache &CTMap) {
-  if (!MI->isArrayAllocation() ||            // No array allocation?
-      !isa<PointerType>(Ty)) return false;   // Malloc always returns pointers
+  if (!isa<PointerType>(Ty)) return false;   // Malloc always returns pointers
 
   // Deal with the type to allocate, not the pointer type...
-  Ty = cast<PointerType>(Ty)->getValueType();
+  Ty = cast<PointerType>(Ty)->getElementType();
+  if (!Ty->isSized()) return false;      // Can only alloc something with a size
 
   // Analyze the number of bytes allocated...
-  analysis::ExprType Expr = analysis::ClassifyExpression(MI->getArraySize());
+  ExprType Expr = ClassifyExpression(MI->getArraySize());
 
-  // Must have a scale or offset to analyze it...
-  if (!Expr.Offset && !Expr.Scale) return false;
-
-  if (Expr.Offset && (Expr.Scale || Expr.Var)) {
-    // This is wierd, shouldn't happen, but if it does, I wanna know about it!
-    cerr << "LevelRaise.cpp: Crazy allocation detected!\n";
-    return false;    
-  }
+  // Get information about the base datatype being allocated, before & after
+  int ReqTypeSize = TD.getTypeSize(Ty);
+  unsigned OldTypeSize = TD.getTypeSize(MI->getType()->getElementType());
 
-  // Get the number of bytes allocated...
-  int SizeVal = getConstantValue(Expr.Offset ? Expr.Offset : Expr.Scale);
-  if (SizeVal <= 0) {
-    cerr << "malloc of a negative number???\n";
-    return false;
-  }
-  unsigned Size = (unsigned)SizeVal;
-  unsigned ReqTypeSize = getBaseTypeSize(Ty);
+  // Must have a scale or offset to analyze it...
+  if (!Expr.Offset && !Expr.Scale && OldTypeSize == 1) return false;
 
-  // Does the size of the allocated type match the number of bytes
-  // allocated?
-  //
-  if (ReqTypeSize == Size)
-    return true;
+  // Get the offset and scale of the allocation...
+  int64_t OffsetVal = Expr.Offset ? getConstantValue(Expr.Offset) : 0;
+  int64_t ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) :(Expr.Var != 0);
 
-  // If not, it's possible that an array of constant size is being allocated.
-  // In this case, the Size will be a multiple of the data size.
+  // The old type might not be of unit size, take old size into consideration
+  // here...
+  int64_t Offset = OffsetVal * OldTypeSize;
+  int64_t Scale  = ScaleVal  * OldTypeSize;
+  
+  // In order to be successful, both the scale and the offset must be a multiple
+  // of the requested data type's size.
   //
-  if (!Expr.Offset) return false;  // Offset must be set, not scale...
-
-#if 1
-  return false;
-#else   // THIS CAN ONLY BE RUN VERY LATE, after several passes to make sure
-        // things are adequately raised!
-  // See if the allocated amount is a multiple of the type size...
-  if (Size/ReqTypeSize*ReqTypeSize != Size)
+  if (Offset/ReqTypeSize*ReqTypeSize != Offset ||
+      Scale/ReqTypeSize*ReqTypeSize != Scale)
     return false;   // Nope.
 
-  // Unfortunately things tend to be powers of two, so there may be
-  // many false hits.  We don't want to optimistically assume that we
-  // have the right type on the first try, so scan the use list of the
-  // malloc instruction, looking for the cast to the biggest type...
-  //
-  for (Value::use_iterator I = MI->use_begin(), E = MI->use_end(); I != E; ++I)
-    if (CastInst *CI = dyn_cast<CastInst>(*I))
-      if (const PointerType *PT = 
-          dyn_cast<PointerType>(CI->getOperand(0)->getType()))
-        if (getBaseTypeSize(PT->getValueType()) > ReqTypeSize)
-          return false;     // We found a type bigger than this one!
-  
   return true;
-#endif
 }
 
 static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty,
-                                        const string &Name, ValueMapCache &VMC){
+                                        const std::string &Name,
+                                        ValueMapCache &VMC){
   BasicBlock *BB = MI->getParent();
   BasicBlock::iterator It = BB->end();
 
   // Analyze the number of bytes allocated...
-  analysis::ExprType Expr = analysis::ClassifyExpression(MI->getArraySize());
+  ExprType Expr = ClassifyExpression(MI->getArraySize());
 
   const PointerType *AllocTy = cast<PointerType>(Ty);
-  const Type *ElType = AllocTy->getValueType();
+  const Type *ElType = AllocTy->getElementType();
 
-  if (Expr.Var && !isa<ArrayType>(ElType)) {
-    ElType = ArrayType::get(AllocTy->getValueType());
-    AllocTy = PointerType::get(ElType);
-  }
+  unsigned DataSize = TD.getTypeSize(ElType);
+  unsigned OldTypeSize = TD.getTypeSize(MI->getType()->getElementType());
 
-  // If the array size specifier is not an unsigned integer, insert a cast now.
-  if (Expr.Var && Expr.Var->getType() != Type::UIntTy) {
-    It = find(BB->getInstList().begin(), BB->getInstList().end(), MI);
-    CastInst *SizeCast = new CastInst(Expr.Var, Type::UIntTy);
-    It = BB->getInstList().insert(It, SizeCast)+1;
-    Expr.Var = SizeCast;
-  }
+  // Get the offset and scale coefficients that we are allocating...
+  int64_t OffsetVal = (Expr.Offset ? getConstantValue(Expr.Offset) : 0);
+  int64_t ScaleVal = Expr.Scale ? getConstantValue(Expr.Scale) : (Expr.Var !=0);
 
-  // Check to see if they are allocating a constant sized array of a type...
-#if 0   // THIS CAN ONLY BE RUN VERY LATE
-  if (!Expr.Var) {
-    unsigned OffsetAmount  = (unsigned)getConstantValue(Expr.Offset);
-    unsigned DataSize = TD.getTypeSize(ElType);
-    
-    if (OffsetAmount > DataSize) // Allocate a sized array amount...
-      Expr.Var = ConstPoolUInt::get(Type::UIntTy, OffsetAmount/DataSize);
-  }
-#endif
+  // The old type might not be of unit size, take old size into consideration
+  // here...
+  unsigned Offset = (uint64_t)OffsetVal * OldTypeSize / DataSize;
+  unsigned Scale  = (uint64_t)ScaleVal  * OldTypeSize / DataSize;
+
+  // Locate the malloc instruction, because we may be inserting instructions
+  It = MI;
 
-  Instruction *NewI = new MallocInst(AllocTy, Expr.Var, Name);
+  // If we have a scale, apply it first...
+  if (Expr.Var) {
+    // Expr.Var is not neccesarily unsigned right now, insert a cast now.
+    if (Expr.Var->getType() != Type::UIntTy)
+      Expr.Var = new CastInst(Expr.Var, Type::UIntTy,
+                              Expr.Var->getName()+"-uint", It);
 
-  if (AllocTy != Ty) { // Create a cast instruction to cast it to the correct ty
-    if (It == BB->end())
-      It = find(BB->getInstList().begin(), BB->getInstList().end(), MI);
-                
-    // Insert the new malloc directly into the code ourselves
-    assert(It != BB->getInstList().end());
-    It = BB->getInstList().insert(It, NewI)+1;
+    if (Scale != 1)
+      Expr.Var = BinaryOperator::create(Instruction::Mul, Expr.Var,
+                                        ConstantUInt::get(Type::UIntTy, Scale),
+                                        Expr.Var->getName()+"-scl", It);
+
+  } else {
+    // If we are not scaling anything, just make the offset be the "var"...
+    Expr.Var = ConstantUInt::get(Type::UIntTy, Offset);
+    Offset = 0; Scale = 1;
+  }
 
-    // Return the cast as the value to use...
-    NewI = new CastInst(NewI, Ty);
+  // If we have an offset now, add it in...
+  if (Offset != 0) {
+    assert(Expr.Var && "Var must be nonnull by now!");
+    Expr.Var = BinaryOperator::create(Instruction::Add, Expr.Var,
+                                      ConstantUInt::get(Type::UIntTy, Offset),
+                                      Expr.Var->getName()+"-off", It);
   }
 
-  return NewI;
+  assert(AllocTy == Ty);
+  return new MallocInst(AllocTy->getElementType(), Expr.Var, Name);
 }
 
 
 // ExpressionConvertableToType - Return true if it is possible
 bool ExpressionConvertableToType(Value *V, const Type *Ty,
                                  ValueTypeCache &CTMap) {
-  if (V->getType() == Ty) return true;  // Expression already correct type!
-
   // Expression type must be holdable in a register.
-  if (!isFirstClassType(Ty))
+  if (!Ty->isFirstClassType())
     return false;
   
   ValueTypeCache::iterator CTMI = CTMap.find(V);
   if (CTMI != CTMap.end()) return CTMI->second == Ty;
 
+  // If it's a constant... all constants can be converted to a different type We
+  // just ask the constant propogator to see if it can convert the value...
+  //
+  if (Constant *CPV = dyn_cast<Constant>(V))
+    return ConstantFoldCastInstruction(CPV, Ty);
+  
+
   CTMap[V] = Ty;
+  if (V->getType() == Ty) return true;  // Expression already correct type!
 
   Instruction *I = dyn_cast<Instruction>(V);
-  if (I == 0) {
-    // It's not an instruction, check to see if it's a constant... all constants
-    // can be converted to an equivalent value (except pointers, they can't be
-    // const prop'd in general).  We just ask the constant propogator to see if
-    // it can convert the value...
-    //
-    if (ConstPoolVal *CPV = dyn_cast<ConstPoolVal>(V))
-      if (opt::ConstantFoldCastInstruction(CPV, Ty))
-        return true;  // Don't worry about deallocating, it's a constant.
-
-    return false;              // Otherwise, we can't convert!
-  }
+  if (I == 0) return false;              // Otherwise, we can't convert!
 
   switch (I->getOpcode()) {
   case Instruction::Cast:
     // We can convert the expr if the cast destination type is losslessly
     // convertable to the requested type.
     if (!Ty->isLosslesslyConvertableTo(I->getType())) return false;
-#if 1
+
     // We also do not allow conversion of a cast that casts from a ptr to array
     // of X to a *X.  For example: cast [4 x %List *] * %val to %List * *
     //
-    if (PointerType *SPT = dyn_cast<PointerType>(I->getOperand(0)->getType()))
-      if (PointerType *DPT = dyn_cast<PointerType>(I->getType()))
-        if (ArrayType *AT = dyn_cast<ArrayType>(SPT->getValueType()))
-          if (AT->getElementType() == DPT->getValueType())
+    if (const PointerType *SPT = 
+        dyn_cast<PointerType>(I->getOperand(0)->getType()))
+      if (const PointerType *DPT = dyn_cast<PointerType>(I->getType()))
+        if (const ArrayType *AT = dyn_cast<ArrayType>(SPT->getElementType()))
+          if (AT->getElementType() == DPT->getElementType())
             return false;
-#endif
     break;
 
   case Instruction::Add:
   case Instruction::Sub:
+    if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false;
     if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap) ||
         !ExpressionConvertableToType(I->getOperand(1), Ty, CTMap))
       return false;
     break;
   case Instruction::Shr:
+    if (!Ty->isInteger()) return false;
     if (Ty->isSigned() != V->getType()->isSigned()) return false;
     // FALL THROUGH
   case Instruction::Shl:
+    if (!Ty->isInteger()) return false;
     if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap))
       return false;
     break;
 
   case Instruction::Load: {
     LoadInst *LI = cast<LoadInst>(I);
-    if (LI->hasIndices() && !AllIndicesZero(LI)) {
-      // We can't convert a load expression if it has indices... unless they are
-      // all zero.
-      return false;
-    }
-
     if (!ExpressionConvertableToType(LI->getPointerOperand(),
                                      PointerType::get(Ty), CTMap))
       return false;
@@ -261,7 +206,6 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
       return false;
     break;
 
-#if 1
   case Instruction::GetElementPtr: {
     // GetElementPtr's are directly convertable to a pointer type if they have
     // a number of zeros at the end.  Because removing these values does not
@@ -274,31 +218,91 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
     // 
     GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
     const PointerType *PTy = dyn_cast<PointerType>(Ty);
-    if (!PTy) return false;
+    if (!PTy) return false;  // GEP must always return a pointer...
+    const Type *PVTy = PTy->getElementType();
 
     // Check to see if there are zero elements that we can remove from the
     // index array.  If there are, check to see if removing them causes us to
     // get to the right type...
     //
-    vector<Value*> Indices = GEP->copyIndices();
+    std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
     const Type *BaseType = GEP->getPointerOperand()->getType();
     const Type *ElTy = 0;
 
-    while (!Indices.empty() && isa<ConstPoolUInt>(Indices.back()) &&
-           cast<ConstPoolUInt>(Indices.back())->getValue() == 0) {
+    while (!Indices.empty() &&
+           Indices.back() == Constant::getNullValue(Indices.back()->getType())){
       Indices.pop_back();
-      ElTy = GetElementPtrInst::getIndexedType(BaseType, Indices,
-                                                           true);
-      if (ElTy == PTy->getValueType())
+      ElTy = GetElementPtrInst::getIndexedType(BaseType, Indices, true);
+      if (ElTy == PVTy)
         break;  // Found a match!!
       ElTy = 0;
     }
 
-    if (ElTy) break;
+    if (ElTy) break;   // Found a number of zeros we can strip off!
+
+    // Otherwise, we can convert a GEP from one form to the other iff the
+    // current gep is of the form 'getelementptr sbyte*, long N
+    // and we could convert this to an appropriate GEP for the new type.
+    //
+    if (GEP->getNumOperands() == 2 &&
+        GEP->getOperand(1)->getType() == Type::LongTy &&
+        GEP->getType() == PointerType::get(Type::SByteTy)) {
+
+      // Do not Check to see if our incoming pointer can be converted
+      // to be a ptr to an array of the right type... because in more cases than
+      // not, it is simply not analyzable because of pointer/array
+      // discrepencies.  To fix this, we will insert a cast before the GEP.
+      //
+
+      // Check to see if 'N' is an expression that can be converted to
+      // the appropriate size... if so, allow it.
+      //
+      std::vector<Value*> Indices;
+      const Type *ElTy = ConvertableToGEP(PTy, I->getOperand(1), Indices);
+      if (ElTy == PVTy) {
+        if (!ExpressionConvertableToType(I->getOperand(0),
+                                         PointerType::get(ElTy), CTMap))
+          return false;  // Can't continue, ExConToTy might have polluted set!
+        break;
+      }
+    }
+
+    // Otherwise, it could be that we have something like this:
+    //     getelementptr [[sbyte] *] * %reg115, long %reg138    ; [sbyte]**
+    // and want to convert it into something like this:
+    //     getelemenptr [[int] *] * %reg115, long %reg138      ; [int]**
+    //
+    if (GEP->getNumOperands() == 2 && 
+        GEP->getOperand(1)->getType() == Type::LongTy &&
+        TD.getTypeSize(PTy->getElementType()) == 
+        TD.getTypeSize(GEP->getType()->getElementType())) {
+      const PointerType *NewSrcTy = PointerType::get(PVTy);
+      if (!ExpressionConvertableToType(I->getOperand(0), NewSrcTy, CTMap))
+        return false;
+      break;
+    }
+
     return false;   // No match, maybe next time.
   }
-#endif
 
+  case Instruction::Call: {
+    if (isa<Function>(I->getOperand(0)))
+      return false;  // Don't even try to change direct calls.
+
+    // If this is a function pointer, we can convert the return type if we can
+    // convert the source function pointer.
+    //
+    const PointerType *PT = cast<PointerType>(I->getOperand(0)->getType());
+    const FunctionType *FT = cast<FunctionType>(PT->getElementType());
+    std::vector<const Type *> ArgTys(FT->getParamTypes().begin(),
+                                     FT->getParamTypes().end());
+    const FunctionType *NewTy =
+      FunctionType::get(Ty, ArgTys, FT->isVarArg());
+    if (!ExpressionConvertableToType(I->getOperand(0),
+                                     PointerType::get(NewTy), CTMap))
+      return false;
+    break;
+  }
   default:
     return false;
   }
@@ -316,45 +320,50 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
 
 
 Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
+  if (V->getType() == Ty) return V;  // Already where we need to be?
+
   ValueMapCache::ExprMapTy::iterator VMCI = VMC.ExprMap.find(V);
   if (VMCI != VMC.ExprMap.end()) {
+    const Value *GV = VMCI->second;
+    const Type *GTy = VMCI->second->getType();
     assert(VMCI->second->getType() == Ty);
+
+    if (Instruction *I = dyn_cast<Instruction>(V))
+      ValueHandle IHandle(VMC, I);  // Remove I if it is unused now!
+
     return VMCI->second;
   }
 
-#ifdef DEBUG_EXPR_CONVERT
-  cerr << "CETT: " << (void*)V << " " << V;
-#endif
+  DEBUG(cerr << "CETT: " << (void*)V << " " << V);
 
   Instruction *I = dyn_cast<Instruction>(V);
-  if (I == 0)
-    if (ConstPoolVal *CPV = cast<ConstPoolVal>(V)) {
-      // Constants are converted by constant folding the cast that is required.
-      // We assume here that all casts are implemented for constant prop.
-      Value *Result = opt::ConstantFoldCastInstruction(CPV, Ty);
-      assert(Result && "ConstantFoldCastInstruction Failed!!!");
-      assert(Result->getType() == Ty && "Const prop of cast failed!");
-
-      // Add the instruction to the expression map
-      VMC.ExprMap[V] = Result;
-      return Result;
-    }
+  if (I == 0) {
+    Constant *CPV = cast<Constant>(V);
+    // Constants are converted by constant folding the cast that is required.
+    // We assume here that all casts are implemented for constant prop.
+    Value *Result = ConstantFoldCastInstruction(CPV, Ty);
+    assert(Result && "ConstantFoldCastInstruction Failed!!!");
+    assert(Result->getType() == Ty && "Const prop of cast failed!");
+
+    // Add the instruction to the expression map
+    //VMC.ExprMap[V] = Result;
+    return Result;
+  }
 
 
   BasicBlock *BB = I->getParent();
-  BasicBlock::InstListType &BIL = BB->getInstList();
-  string Name = I->getName();  if (!Name.empty()) I->setName("");
+  std::string Name = I->getName();  if (!Name.empty()) I->setName("");
   Instruction *Res;     // Result of conversion
 
   ValueHandle IHandle(VMC, I);  // Prevent I from being removed!
   
-  ConstPoolVal *Dummy = ConstPoolVal::getNullConstant(Ty);
-
-  //cerr << endl << endl << "Type:\t" << Ty << "\nInst: " << I << "BB Before: " << BB << endl;
+  Constant *Dummy = Constant::getNullValue(Ty);
 
   switch (I->getOpcode()) {
   case Instruction::Cast:
+    assert(VMC.NewCasts.count(ValueHandle(VMC, I)) == 0);
     Res = new CastInst(I->getOperand(0), Ty, Name);
+    VMC.NewCasts.insert(ValueHandle(VMC, Res));
     break;
     
   case Instruction::Add:
@@ -377,16 +386,14 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
 
   case Instruction::Load: {
     LoadInst *LI = cast<LoadInst>(I);
-    assert(!LI->hasIndices() || AllIndicesZero(LI));
 
-    Res = new LoadInst(ConstPoolVal::getNullConstant(PointerType::get(Ty)), 
-                       Name);
+    Res = new LoadInst(Constant::getNullValue(PointerType::get(Ty)), Name);
     VMC.ExprMap[I] = Res;
     Res->setOperand(0, ConvertExpressionToType(LI->getPointerOperand(),
                                                PointerType::get(Ty), VMC));
     assert(Res->getOperand(0)->getType() == PointerType::get(Ty));
     assert(Ty == Res->getType());
-    assert(isFirstClassType(Res->getType()) && "Load of structure or array!");
+    assert(Res->getType()->isFirstClassType() && "Load of structure or array!");
     break;
   }
 
@@ -399,7 +406,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
       BasicBlock *BB = OldPN->getIncomingBlock(0);
       Value *OldVal = OldPN->getIncomingValue(0);
       ValueHandle OldValHandle(VMC, OldVal);
-      OldPN->removeIncomingValue(BB);
+      OldPN->removeIncomingValue(BB, false);
       Value *V = ConvertExpressionToType(OldVal, Ty, VMC);
       NewPN->addIncoming(V, BB);
     }
@@ -428,26 +435,90 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
     // index array.  If there are, check to see if removing them causes us to
     // get to the right type...
     //
-    vector<Value*> Indices = GEP->copyIndices();
+    std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
     const Type *BaseType = GEP->getPointerOperand()->getType();
-    const Type *PVTy = cast<PointerType>(Ty)->getValueType();
+    const Type *PVTy = cast<PointerType>(Ty)->getElementType();
     Res = 0;
-    while (!Indices.empty() && isa<ConstPoolUInt>(Indices.back()) &&
-           cast<ConstPoolUInt>(Indices.back())->getValue() == 0) {
+    while (!Indices.empty() &&
+           Indices.back() == Constant::getNullValue(Indices.back()->getType())){
       Indices.pop_back();
       if (GetElementPtrInst::getIndexedType(BaseType, Indices, true) == PVTy) {
-        if (Indices.size() == 0) {
-          Res = new CastInst(GEP->getPointerOperand(), BaseType); // NOOP
-        } else {
+        if (Indices.size() == 0)
+          Res = new CastInst(GEP->getPointerOperand(), BaseType); // NOOP CAST
+        else
           Res = new GetElementPtrInst(GEP->getPointerOperand(), Indices, Name);
-        }
         break;
       }
     }
+
+    if (Res == 0 && GEP->getNumOperands() == 2 &&
+        GEP->getOperand(1)->getType() == Type::LongTy &&
+        GEP->getType() == PointerType::get(Type::SByteTy)) {
+      
+      // Otherwise, we can convert a GEP from one form to the other iff the
+      // current gep is of the form 'getelementptr [sbyte]*, unsigned N
+      // and we could convert this to an appropriate GEP for the new type.
+      //
+      const PointerType *NewSrcTy = PointerType::get(PVTy);
+      BasicBlock::iterator It = I;
+
+      // Check to see if 'N' is an expression that can be converted to
+      // the appropriate size... if so, allow it.
+      //
+      std::vector<Value*> Indices;
+      const Type *ElTy = ConvertableToGEP(NewSrcTy, I->getOperand(1),
+                                          Indices, &It);
+      if (ElTy) {        
+        assert(ElTy == PVTy && "Internal error, setup wrong!");
+        Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy),
+                                    Indices, Name);
+        VMC.ExprMap[I] = Res;
+        Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
+                                                   NewSrcTy, VMC));
+      }
+    }
+
+    // Otherwise, it could be that we have something like this:
+    //     getelementptr [[sbyte] *] * %reg115, uint %reg138    ; [sbyte]**
+    // and want to convert it into something like this:
+    //     getelemenptr [[int] *] * %reg115, uint %reg138      ; [int]**
+    //
+    if (Res == 0) {
+      const PointerType *NewSrcTy = PointerType::get(PVTy);
+      std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
+      Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy),
+                                  Indices, Name);
+      VMC.ExprMap[I] = Res;
+      Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
+                                                 NewSrcTy, VMC));
+    }
+
+
     assert(Res && "Didn't find match!");
-    break;   // No match, maybe next time.
+    break;
   }
 
+  case Instruction::Call: {
+    assert(!isa<Function>(I->getOperand(0)));
+
+    // If this is a function pointer, we can convert the return type if we can
+    // convert the source function pointer.
+    //
+    const PointerType *PT = cast<PointerType>(I->getOperand(0)->getType());
+    const FunctionType *FT = cast<FunctionType>(PT->getElementType());
+    std::vector<const Type *> ArgTys(FT->getParamTypes().begin(),
+                                     FT->getParamTypes().end());
+    const FunctionType *NewTy =
+      FunctionType::get(Ty, ArgTys, FT->isVarArg());
+    const PointerType *NewPTy = PointerType::get(NewTy);
+
+    Res = new CallInst(Constant::getNullValue(NewPTy),
+                       std::vector<Value*>(I->op_begin()+1, I->op_end()),
+                       Name);
+    VMC.ExprMap[I] = Res;
+    Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), NewPTy, VMC));
+    break;
+  }
   default:
     assert(0 && "Expression convertable, but don't know how to convert?");
     return 0;
@@ -455,9 +526,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
 
   assert(Res->getType() == Ty && "Didn't convert expr to correct type!");
 
-  BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
-  assert(It != BIL.end() && "Instruction not in own basic block??");
-  BIL.insert(It, Res);
+  BB->getInstList().insert(I, Res);
 
   // Add the instruction to the expression map
   VMC.ExprMap[I] = Res;
@@ -474,21 +543,8 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
     if (NumUses == OldSize) ++It;
   }
 
-#ifdef DEBUG_EXPR_CONVERT
-  cerr << "ExpIn: " << (void*)I << " " << I
-       << "ExpOut: " << (void*)Res << " " << Res;
-  cerr << "ExpCREATED: " << (void*)Res << " " << Res;
-#endif
-
-  if (I->use_empty()) {
-#ifdef DEBUG_EXPR_CONVERT
-    cerr << "EXPR DELETING: " << (void*)I << " " << I;
-#endif
-    BIL.remove(I);
-    VMC.OperandsMapped.erase(I);
-    VMC.ExprMap.erase(I);
-    delete I;
-  }
+  DEBUG(cerr << "ExpIn: " << (void*)I << " " << I
+             << "ExpOut: " << (void*)Res << " " << Res);
 
   return Res;
 }
@@ -505,9 +561,11 @@ bool ValueConvertableToType(Value *V, const Type *Ty,
   // It is safe to convert the specified value to the specified type IFF all of
   // the uses of the value can be converted to accept the new typed value.
   //
-  for (Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I)
-    if (!OperandConvertableToType(*I, V, Ty, ConvertedTypes))
-      return false;
+  if (V->getType() != Ty) {
+    for (Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I)
+      if (!OperandConvertableToType(*I, V, Ty, ConvertedTypes))
+        return false;
+  }
 
   return true;
 }
@@ -524,10 +582,10 @@ bool ValueConvertableToType(Value *V, const Type *Ty,
 //
 static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
                                      ValueTypeCache &CTMap) {
-  if (V->getType() == Ty) return true;   // Operand already the right type?
+  //  if (V->getType() == Ty) return true;   // Operand already the right type?
 
   // Expression type must be holdable in a register.
-  if (!isFirstClassType(Ty))
+  if (!Ty->isFirstClassType())
     return false;
 
   Instruction *I = dyn_cast<Instruction>(U);
@@ -538,25 +596,37 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
     assert(I->getOperand(0) == V);
     // We can convert the expr if the cast destination type is losslessly
     // convertable to the requested type.
-    if (!Ty->isLosslesslyConvertableTo(I->getOperand(0)->getType()))
+    // Also, do not change a cast that is a noop cast.  For all intents and
+    // purposes it should be eliminated.
+    if (!Ty->isLosslesslyConvertableTo(I->getOperand(0)->getType()) ||
+        I->getType() == I->getOperand(0)->getType())
       return false;
-#if 1
+
+    // Do not allow a 'cast ushort %V to uint' to have it's first operand be
+    // converted to a 'short' type.  Doing so changes the way sign promotion
+    // happens, and breaks things.  Only allow the cast to take place if the
+    // signedness doesn't change... or if the current cast is not a lossy
+    // conversion.
+    //
+    if (!I->getType()->isLosslesslyConvertableTo(I->getOperand(0)->getType()) &&
+        I->getOperand(0)->getType()->isSigned() != Ty->isSigned())
+      return false;
+
     // We also do not allow conversion of a cast that casts from a ptr to array
     // of X to a *X.  For example: cast [4 x %List *] * %val to %List * *
     //
-    if (PointerType *SPT = dyn_cast<PointerType>(I->getOperand(0)->getType()))
-      if (PointerType *DPT = dyn_cast<PointerType>(I->getType()))
-        if (ArrayType *AT = dyn_cast<ArrayType>(SPT->getValueType()))
-          if (AT->getElementType() == DPT->getValueType())
+    if (const PointerType *SPT = 
+        dyn_cast<PointerType>(I->getOperand(0)->getType()))
+      if (const PointerType *DPT = dyn_cast<PointerType>(I->getType()))
+        if (const ArrayType *AT = dyn_cast<ArrayType>(SPT->getElementType()))
+          if (AT->getElementType() == DPT->getElementType())
             return false;
-#endif
     return true;
 
   case Instruction::Add:
-    if (V == I->getOperand(0) && isa<CastInst>(I->getOperand(1)) &&
-        isa<PointerType>(Ty)) {
-      Value *IndexVal = cast<CastInst>(I->getOperand(1))->getOperand(0);
-      vector<Value*> Indices;
+    if (isa<PointerType>(Ty)) {
+      Value *IndexVal = I->getOperand(V == I->getOperand(0) ? 1 : 0);
+      std::vector<Value*> Indices;
       if (const Type *ETy = ConvertableToGEP(Ty, IndexVal, Indices)) {
         const Type *RetTy = PointerType::get(ETy);
 
@@ -565,10 +635,15 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
           CTMap[I] = RetTy;
           return true;
         }
+        // We have to return failure here because ValueConvertableToType could 
+        // have polluted our map
+        return false;
       }
     }
     // FALLTHROUGH
   case Instruction::Sub: {
+    if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false;
+
     Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0);
     return ValueConvertableToType(I, Ty, CTMap) &&
            ExpressionConvertableToType(OtherOp, Ty, CTMap);
@@ -583,8 +658,13 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
     // FALL THROUGH
   case Instruction::Shl:
     assert(I->getOperand(0) == V);
+    if (!Ty->isInteger()) return false;
     return ValueConvertableToType(I, Ty, CTMap);
 
+  case Instruction::Free:
+    assert(I->getOperand(0) == V);
+    return isa<PointerType>(Ty);    // Free can free any pointer type!
+
   case Instruction::Load:
     // Cannot convert the types of any subscripts...
     if (I->getOperand(0) != V) return false;
@@ -592,20 +672,17 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
     if (const PointerType *PT = dyn_cast<PointerType>(Ty)) {
       LoadInst *LI = cast<LoadInst>(I);
       
-      if (LI->hasIndices() && !AllIndicesZero(LI))
-        return false;
-
-      const Type *LoadedTy = PT->getValueType();
+      const Type *LoadedTy = PT->getElementType();
 
       // They could be loading the first element of a composite type...
       if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
         unsigned Offset = 0;     // No offset, get first leaf.
-        vector<Value*> Indices;  // Discarded...
+        std::vector<Value*> Indices;  // Discarded...
         LoadedTy = getStructOffsetType(CT, Offset, Indices, false);
         assert(Offset == 0 && "Offset changed from zero???");
       }
 
-      if (!isFirstClassType(LoadedTy))
+      if (!LoadedTy->isFirstClassType())
         return false;
 
       if (TD.getTypeSize(LoadedTy) != TD.getTypeSize(LI->getType()))
@@ -617,38 +694,111 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
 
   case Instruction::Store: {
     StoreInst *SI = cast<StoreInst>(I);
-    if (SI->hasIndices()) return false;
 
     if (V == I->getOperand(0)) {
+      ValueTypeCache::iterator CTMI = CTMap.find(I->getOperand(1));
+      if (CTMI != CTMap.end()) {   // Operand #1 is in the table already?
+        // If so, check to see if it's Ty*, or, more importantly, if it is a
+        // pointer to a structure where the first element is a Ty... this code
+        // is neccesary because we might be trying to change the source and
+        // destination type of the store (they might be related) and the dest
+        // pointer type might be a pointer to structure.  Below we allow pointer
+        // to structures where the 0th element is compatible with the value,
+        // now we have to support the symmetrical part of this.
+        //
+        const Type *ElTy = cast<PointerType>(CTMI->second)->getElementType();
+
+        // Already a pointer to what we want?  Trivially accept...
+        if (ElTy == Ty) return true;
+
+        // Tricky case now, if the destination is a pointer to structure,
+        // obviously the source is not allowed to be a structure (cannot copy
+        // a whole structure at a time), so the level raiser must be trying to
+        // store into the first field.  Check for this and allow it now:
+        //
+        if (const StructType *SElTy = dyn_cast<StructType>(ElTy)) {
+          unsigned Offset = 0;
+          std::vector<Value*> Indices;
+          ElTy = getStructOffsetType(ElTy, Offset, Indices, false);
+          assert(Offset == 0 && "Offset changed!");
+          if (ElTy == 0)    // Element at offset zero in struct doesn't exist!
+            return false;   // Can only happen for {}*
+          
+          if (ElTy == Ty)   // Looks like the 0th element of structure is
+            return true;    // compatible!  Accept now!
+
+          // Otherwise we know that we can't work, so just stop trying now.
+          return false;
+        }
+      }
+
       // Can convert the store if we can convert the pointer operand to match
       // the new  value type...
       return ExpressionConvertableToType(I->getOperand(1), PointerType::get(Ty),
                                          CTMap);
     } else if (const PointerType *PT = dyn_cast<PointerType>(Ty)) {
-      if (isa<ArrayType>(PT->getValueType()))
-        return false;  // Avoid getDataSize on unsized array type!
+      const Type *ElTy = PT->getElementType();
       assert(V == I->getOperand(1));
 
+      if (isa<StructType>(ElTy)) {
+        // We can change the destination pointer if we can store our first
+        // argument into the first element of the structure...
+        //
+        unsigned Offset = 0;
+        std::vector<Value*> Indices;
+        ElTy = getStructOffsetType(ElTy, Offset, Indices, false);
+        assert(Offset == 0 && "Offset changed!");
+        if (ElTy == 0)    // Element at offset zero in struct doesn't exist!
+          return false;   // Can only happen for {}*
+      }
+
       // Must move the same amount of data...
-      if (TD.getTypeSize(PT->getValueType()) != 
-          TD.getTypeSize(I->getOperand(0)->getType())) return false;
+      if (!ElTy->isSized() || 
+          TD.getTypeSize(ElTy) != TD.getTypeSize(I->getOperand(0)->getType()))
+        return false;
 
       // Can convert store if the incoming value is convertable...
-      return ExpressionConvertableToType(I->getOperand(0), PT->getValueType(),
-                                         CTMap);
+      return ExpressionConvertableToType(I->getOperand(0), ElTy, CTMap);
     }
     return false;
   }
 
   case Instruction::GetElementPtr:
-    // Convert a getelementptr [sbyte] * %reg111, uint 16 freely back to
-    // anything that is a pointer type...
+    if (V != I->getOperand(0) || !isa<PointerType>(Ty)) return false;
+
+    // If we have a two operand form of getelementptr, this is really little
+    // more than a simple addition.  As with addition, check to see if the
+    // getelementptr instruction can be changed to index into the new type.
     //
-    if (I->getType() != PointerType::get(Type::SByteTy) ||
-        I->getNumOperands() != 2 || V != I->getOperand(0) ||
-        I->getOperand(1)->getType() != Type::UIntTy || !isa<PointerType>(Ty))
-      return false;
-    return true;
+    if (I->getNumOperands() == 2) {
+      const Type *OldElTy = cast<PointerType>(I->getType())->getElementType();
+      unsigned DataSize = TD.getTypeSize(OldElTy);
+      Value *Index = I->getOperand(1);
+      Instruction *TempScale = 0;
+
+      // If the old data element is not unit sized, we have to create a scale
+      // instruction so that ConvertableToGEP will know the REAL amount we are
+      // indexing by.  Note that this is never inserted into the instruction
+      // stream, so we have to delete it when we're done.
+      //
+      if (DataSize != 1) {
+        TempScale = BinaryOperator::create(Instruction::Mul, Index,
+                                           ConstantSInt::get(Type::LongTy,
+                                                             DataSize));
+        Index = TempScale;
+      }
+
+      // Check to see if the second argument is an expression that can
+      // be converted to the appropriate size... if so, allow it.
+      //
+      std::vector<Value*> Indices;
+      const Type *ElTy = ConvertableToGEP(Ty, Index, Indices);
+      delete TempScale;   // Free our temporary multiply if we made it
+
+      if (ElTy == 0) return false;  // Cannot make conversion...
+      return ValueConvertableToType(I, PointerType::get(ElTy), CTMap);
+    }
+    return false;
 
   case Instruction::PHINode: {
     PHINode *PN = cast<PHINode>(I);
@@ -663,18 +813,61 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
     assert (OI != I->op_end() && "Not using value!");
     unsigned OpNum = OI - I->op_begin();
 
-    if (OpNum == 0)
-      return false; // Can't convert method pointer type yet.  FIXME
+    // Are we trying to change the function pointer value to a new type?
+    if (OpNum == 0) {
+      const PointerType *PTy = dyn_cast<PointerType>(Ty);
+      if (PTy == 0) return false;  // Can't convert to a non-pointer type...
+      const FunctionType *FTy = dyn_cast<FunctionType>(PTy->getElementType());
+      if (FTy == 0) return false;  // Can't convert to a non ptr to function...
+
+      // Do not allow converting to a call where all of the operands are ...'s
+      if (FTy->getNumParams() == 0 && FTy->isVarArg())
+        return false;              // Do not permit this conversion!
+
+      // Perform sanity checks to make sure that new function type has the
+      // correct number of arguments...
+      //
+      unsigned NumArgs = I->getNumOperands()-1;  // Don't include function ptr
+
+      // Cannot convert to a type that requires more fixed arguments than
+      // the call provides...
+      //
+      if (NumArgs < FTy->getNumParams()) return false;
+      
+      // Unless this is a vararg function type, we cannot provide more arguments
+      // than are desired...
+      //
+      if (!FTy->isVarArg() && NumArgs > FTy->getNumParams())
+        return false;
+
+      // Okay, at this point, we know that the call and the function type match
+      // number of arguments.  Now we see if we can convert the arguments
+      // themselves.  Note that we do not require operands to be convertable,
+      // we can insert casts if they are convertible but not compatible.  The
+      // reason for this is that we prefer to have resolved functions but casted
+      // arguments if possible.
+      //
+      const FunctionType::ParamTypes &PTs = FTy->getParamTypes();
+      for (unsigned i = 0, NA = PTs.size(); i < NA; ++i)
+        if (!PTs[i]->isLosslesslyConvertableTo(I->getOperand(i+1)->getType()))
+          return false;   // Operands must have compatible types!
+
+      // Okay, at this point, we know that all of the arguments can be
+      // converted.  We succeed if we can change the return type if
+      // neccesary...
+      //
+      return ValueConvertableToType(I, FTy->getReturnType(), CTMap);
+    }
     
     const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType());
-    const MethodType *MTy = cast<MethodType>(MPtr->getValueType());
-    if (!MTy->isVarArg()) return false;
+    const FunctionType *FTy = cast<FunctionType>(MPtr->getElementType());
+    if (!FTy->isVarArg()) return false;
 
-    if ((OpNum-1) < MTy->getParamTypes().size())
+    if ((OpNum-1) < FTy->getParamTypes().size())
       return false;  // It's not in the varargs section...
 
     // If we get this far, we know the value is in the varargs section of the
-    // method!  We can convert if we don't reinterpret the value...
+    // function!  We can convert if we don't reinterpret the value...
     //
     return Ty->isLosslesslyConvertableTo(V->getType());
   }
@@ -712,8 +905,9 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
   Instruction *I = cast<Instruction>(U);  // Only Instructions convertable
 
   BasicBlock *BB = I->getParent();
-  BasicBlock::InstListType &BIL = BB->getInstList();
-  string Name = I->getName();  if (!Name.empty()) I->setName("");
+  assert(BB != 0 && "Instruction not embedded in basic block!");
+  std::string Name = I->getName();
+  I->setName("");
   Instruction *Res;     // Result of conversion
 
   //cerr << endl << endl << "Type:\t" << Ty << "\nInst: " << I << "BB Before: " << BB << endl;
@@ -722,28 +916,37 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
   ValueHandle IHandle(VMC, I);
 
   const Type *NewTy = NewVal->getType();
-  ConstPoolVal *Dummy = (NewTy != Type::VoidTy) ? 
-                  ConstPoolVal::getNullConstant(NewTy) : 0;
+  Constant *Dummy = (NewTy != Type::VoidTy) ? 
+                  Constant::getNullValue(NewTy) : 0;
 
   switch (I->getOpcode()) {
   case Instruction::Cast:
-    assert(I->getOperand(0) == OldVal);
-    Res = new CastInst(NewVal, I->getType(), Name);
+    if (VMC.NewCasts.count(ValueHandle(VMC, I))) {
+      // This cast has already had it's value converted, causing a new cast to
+      // be created.  We don't want to create YET ANOTHER cast instruction
+      // representing the original one, so just modify the operand of this cast
+      // instruction, which we know is newly created.
+      I->setOperand(0, NewVal);
+      I->setName(Name);  // give I its name back
+      return;
+
+    } else {
+      Res = new CastInst(NewVal, I->getType(), Name);
+    }
     break;
 
   case Instruction::Add:
-    if (OldVal == I->getOperand(0) && isa<CastInst>(I->getOperand(1)) &&
-        isa<PointerType>(NewTy)) {
-      Value *IndexVal = cast<CastInst>(I->getOperand(1))->getOperand(0);
-      vector<Value*> Indices;
-      BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
+    if (isa<PointerType>(NewTy)) {
+      Value *IndexVal = I->getOperand(OldVal == I->getOperand(0) ? 1 : 0);
+      std::vector<Value*> Indices;
+      BasicBlock::iterator It = I;
 
       if (const Type *ETy = ConvertableToGEP(NewTy, IndexVal, Indices, &It)) {
         // If successful, convert the add to a GEP
-        const Type *RetTy = PointerType::get(ETy);
+        //const Type *RetTy = PointerType::get(ETy);
         // First operand is actually the given pointer...
-        Res = new GetElementPtrInst(NewVal, Indices);
-        assert(cast<PointerType>(Res->getType())->getValueType() == ETy &&
+        Res = new GetElementPtrInst(NewVal, Indices, Name);
+        assert(cast<PointerType>(Res->getType())->getElementType() == ETy &&
                "ConvertableToGEP broken!");
         break;
       }
@@ -772,32 +975,99 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
                         I->getOperand(1), Name);
     break;
 
+  case Instruction::Free:            // Free can free any pointer type!
+    assert(I->getOperand(0) == OldVal);
+    Res = new FreeInst(NewVal);
+    break;
+
+
   case Instruction::Load: {
     assert(I->getOperand(0) == OldVal && isa<PointerType>(NewVal->getType()));
-    const Type *LoadedTy = cast<PointerType>(NewVal->getType())->getValueType();
+    const Type *LoadedTy =
+      cast<PointerType>(NewVal->getType())->getElementType();
 
-    vector<Value*> Indices;
+    Value *Src = NewVal;
 
     if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
+      std::vector<Value*> Indices;
+      Indices.push_back(ConstantSInt::get(Type::LongTy, 0));
+
       unsigned Offset = 0;   // No offset, get first leaf.
       LoadedTy = getStructOffsetType(CT, Offset, Indices, false);
-    }
-    assert(isFirstClassType(LoadedTy));
+      assert(LoadedTy->isFirstClassType());
 
-    Res = new LoadInst(NewVal, Indices, Name);
-    assert(isFirstClassType(Res->getType()) && "Load of structure or array!");
+      if (Indices.size() != 1) {     // Do not generate load X, 0
+        // Insert the GEP instruction before this load.
+        Src = new GetElementPtrInst(Src, Indices, Name+".idx", I);
+      }
+    }
+    
+    Res = new LoadInst(Src, Name);
+    assert(Res->getType()->isFirstClassType() && "Load of structure or array!");
     break;
   }
 
   case Instruction::Store: {
     if (I->getOperand(0) == OldVal) {  // Replace the source value
-      const PointerType *NewPT = PointerType::get(NewTy);
-      Res = new StoreInst(NewVal, ConstPoolVal::getNullConstant(NewPT));
-      VMC.ExprMap[I] = Res;
-      Res->setOperand(1, ConvertExpressionToType(I->getOperand(1), NewPT, VMC));
+      // Check to see if operand #1 has already been converted...
+      ValueMapCache::ExprMapTy::iterator VMCI =
+        VMC.ExprMap.find(I->getOperand(1));
+      if (VMCI != VMC.ExprMap.end()) {
+        // Comments describing this stuff are in the OperandConvertableToType
+        // switch statement for Store...
+        //
+        const Type *ElTy =
+          cast<PointerType>(VMCI->second->getType())->getElementType();
+        
+        Value *SrcPtr = VMCI->second;
+
+        if (ElTy != NewTy) {
+          // We check that this is a struct in the initial scan...
+          const StructType *SElTy = cast<StructType>(ElTy);
+          
+          std::vector<Value*> Indices;
+          Indices.push_back(Constant::getNullValue(Type::LongTy));
+
+          unsigned Offset = 0;
+          const Type *Ty = getStructOffsetType(ElTy, Offset, Indices, false);
+          assert(Offset == 0 && "Offset changed!");
+          assert(NewTy == Ty && "Did not convert to correct type!");
+
+          // Insert the GEP instruction before this store.
+          SrcPtr = new GetElementPtrInst(SrcPtr, Indices,
+                                         SrcPtr->getName()+".idx", I);
+        }
+        Res = new StoreInst(NewVal, SrcPtr);
+
+        VMC.ExprMap[I] = Res;
+      } else {
+        // Otherwise, we haven't converted Operand #1 over yet...
+        const PointerType *NewPT = PointerType::get(NewTy);
+        Res = new StoreInst(NewVal, Constant::getNullValue(NewPT));
+        VMC.ExprMap[I] = Res;
+        Res->setOperand(1, ConvertExpressionToType(I->getOperand(1),
+                                                   NewPT, VMC));
+      }
     } else {                           // Replace the source pointer
-      const Type *ValTy = cast<PointerType>(NewTy)->getValueType();
-      Res = new StoreInst(ConstPoolVal::getNullConstant(ValTy), NewVal);
+      const Type *ValTy = cast<PointerType>(NewTy)->getElementType();
+
+      Value *SrcPtr = NewVal;
+
+      if (isa<StructType>(ValTy)) {
+        std::vector<Value*> Indices;
+        Indices.push_back(Constant::getNullValue(Type::LongTy));
+
+        unsigned Offset = 0;
+        ValTy = getStructOffsetType(ValTy, Offset, Indices, false);
+
+        assert(Offset == 0 && ValTy);
+
+        // Insert the GEP instruction before this store.
+        SrcPtr = new GetElementPtrInst(SrcPtr, Indices,
+                                       SrcPtr->getName()+".idx", I);
+      }
+
+      Res = new StoreInst(Constant::getNullValue(ValTy), SrcPtr);
       VMC.ExprMap[I] = Res;
       Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), ValTy, VMC));
     }
@@ -806,24 +1076,57 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
 
 
   case Instruction::GetElementPtr: {
-    // Convert a getelementptr [sbyte] * %reg111, uint 16 freely back to
-    // anything that is a pointer type...
+    // Convert a one index getelementptr into just about anything that is
+    // desired.
     //
-    BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
-    
-    // Insert a cast right before this instruction of the index value...
-    CastInst *CIdx = new CastInst(I->getOperand(1), NewTy);
-    It = BIL.insert(It, CIdx)+1;
-    
-    // Insert an add right before this instruction 
-    Instruction *AddInst = BinaryOperator::create(Instruction::Add, NewVal,
-                                                  CIdx, Name);
-    It = BIL.insert(It, AddInst)+1;
+    BasicBlock::iterator It = I;
+    const Type *OldElTy = cast<PointerType>(I->getType())->getElementType();
+    unsigned DataSize = TD.getTypeSize(OldElTy);
+    Value *Index = I->getOperand(1);
+
+    if (DataSize != 1) {
+      // Insert a multiply of the old element type is not a unit size...
+      Index = BinaryOperator::create(Instruction::Mul, Index,
+                                     ConstantSInt::get(Type::LongTy, DataSize),
+                                     "scale", It);
+    }
 
-    // Finally, cast the result back to our previous type...
-    Res = new CastInst(AddInst, I->getType());
-    break;
+    // Perform the conversion now...
+    //
+    std::vector<Value*> Indices;
+    const Type *ElTy = ConvertableToGEP(NewVal->getType(), Index, Indices, &It);
+    assert(ElTy != 0 && "GEP Conversion Failure!");
+    Res = new GetElementPtrInst(NewVal, Indices, Name);
+    assert(Res->getType() == PointerType::get(ElTy) &&
+           "ConvertableToGet failed!");
   }
+#if 0
+    if (I->getType() == PointerType::get(Type::SByteTy)) {
+      // Convert a getelementptr sbyte * %reg111, uint 16 freely back to
+      // anything that is a pointer type...
+      //
+      BasicBlock::iterator It = I;
+    
+      // Check to see if the second argument is an expression that can
+      // be converted to the appropriate size... if so, allow it.
+      //
+      std::vector<Value*> Indices;
+      const Type *ElTy = ConvertableToGEP(NewVal->getType(), I->getOperand(1),
+                                          Indices, &It);
+      assert(ElTy != 0 && "GEP Conversion Failure!");
+      
+      Res = new GetElementPtrInst(NewVal, Indices, Name);
+    } else {
+      // Convert a getelementptr ulong * %reg123, uint %N
+      // to        getelementptr  long * %reg123, uint %N
+      // ... where the type must simply stay the same size...
+      //
+      GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
+      std::vector<Value*> Indices(GEP->idx_begin(), GEP->idx_end());
+      Res = new GetElementPtrInst(NewVal, Indices, Name);
+    }
+#endif
+    break;
 
   case Instruction::PHINode: {
     PHINode *OldPN = cast<PHINode>(I);
@@ -833,7 +1136,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
     while (OldPN->getNumOperands()) {
       BasicBlock *BB = OldPN->getIncomingBlock(0);
       Value *OldVal = OldPN->getIncomingValue(0);
-      OldPN->removeIncomingValue(BB);
+      OldPN->removeIncomingValue(BB, false);
       Value *V = ConvertExpressionToType(OldVal, NewTy, VMC);
       NewPN->addIncoming(V, BB);
     }
@@ -843,12 +1146,42 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
 
   case Instruction::Call: {
     Value *Meth = I->getOperand(0);
-    vector<Value*> Params(I->op_begin()+1, I->op_end());
+    std::vector<Value*> Params(I->op_begin()+1, I->op_end());
+
+    if (Meth == OldVal) {   // Changing the function pointer?
+      const PointerType *NewPTy = cast<PointerType>(NewVal->getType());
+      const FunctionType *NewTy = cast<FunctionType>(NewPTy->getElementType());
+      const FunctionType::ParamTypes &PTs = NewTy->getParamTypes();
+
+      // Get an iterator to the call instruction so that we can insert casts for
+      // operands if needbe.  Note that we do not require operands to be
+      // convertable, we can insert casts if they are convertible but not
+      // compatible.  The reason for this is that we prefer to have resolved
+      // functions but casted arguments if possible.
+      //
+      BasicBlock::iterator It = I;
+
+      // Convert over all of the call operands to their new types... but only
+      // convert over the part that is not in the vararg section of the call.
+      //
+      for (unsigned i = 0; i < PTs.size(); ++i)
+        if (Params[i]->getType() != PTs[i]) {
+          // Create a cast to convert it to the right type, we know that this
+          // is a lossless cast...
+          //
+          Params[i] = new CastInst(Params[i], PTs[i],  "callarg.cast." +
+                                   Params[i]->getName(), It);
+        }
+      Meth = NewVal;  // Update call destination to new value
+
+    } else {                   // Changing an argument, must be in vararg area
+      std::vector<Value*>::iterator OI =
+        find(Params.begin(), Params.end(), OldVal);
+      assert (OI != Params.end() && "Not using value!");
 
-    vector<Value*>::iterator OI = find(Params.begin(), Params.end(), OldVal);
-    assert (OI != Params.end() && "Not using value!");
+      *OI = NewVal;
+    }
 
-    *OI = NewVal;
     Res = new CallInst(Meth, Params, Name);
     break;
   }
@@ -857,14 +1190,16 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
     return;
   }
 
-  BasicBlock::iterator It = find(BIL.begin(), BIL.end(), I);
-  assert(It != BIL.end() && "Instruction not in own basic block??");
-  BIL.insert(It, Res);   // Keep It pointing to old instruction
+  // If the instruction was newly created, insert it into the instruction
+  // stream.
+  //
+  BasicBlock::iterator It = I;
+  assert(It != BB->end() && "Instruction not in own basic block??");
+  BB->getInstList().insert(It, Res);   // Keep It pointing to old instruction
 
-#ifdef DEBUG_EXPR_CONVERT
-  cerr << "COT CREATED: "  << (void*)Res << " " << Res;
-  cerr << "In: " << (void*)I << " " << I << "Out: " << (void*)Res << " " << Res;
-#endif
+  DEBUG(cerr << "COT CREATED: "  << (void*)Res << " " << Res
+             << "In: " << (void*)I << " " << I << "Out: " << (void*)Res
+             << " " << Res);
 
   // Add the instruction to the expression map
   VMC.ExprMap[I] = Res;
@@ -880,52 +1215,38 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
         Use->replaceUsesOfWith(I, Res);
     }
 
-    if (I->use_empty()) {
-      // Now we just need to remove the old instruction so we don't get infinite
-      // loops.  Note that we cannot use DCE because DCE won't remove a store
-      // instruction, for example.
-      //
-#ifdef DEBUG_EXPR_CONVERT
-      cerr << "DELETING: " << (void*)I << " " << I;
-#endif
-      BIL.remove(I);
-      VMC.OperandsMapped.erase(I);
-      VMC.ExprMap.erase(I);
-      delete I;
-    } else {
-      for (Value::use_iterator UI = I->use_begin(), UE = I->use_end();
-           UI != UE; ++UI)
-        assert(isa<ValueHandle>((Value*)*UI) &&"Uses of Instruction remain!!!");
-    }
+    for (Value::use_iterator UI = I->use_begin(), UE = I->use_end();
+         UI != UE; ++UI)
+      assert(isa<ValueHandle>((Value*)*UI) &&"Uses of Instruction remain!!!");
   }
 }
 
 
 ValueHandle::ValueHandle(ValueMapCache &VMC, Value *V)
   : Instruction(Type::VoidTy, UserOp1, ""), Cache(VMC) {
-#ifdef DEBUG_EXPR_CONVERT
-  cerr << "VH AQUIRING: " << (void*)V << " " << V;
-#endif
+  //DEBUG(cerr << "VH AQUIRING: " << (void*)V << " " << V);
   Operands.push_back(Use(V, this));
 }
 
+ValueHandle::ValueHandle(const ValueHandle &VH)
+  : Instruction(Type::VoidTy, UserOp1, ""), Cache(VH.Cache) {
+  //DEBUG(cerr << "VH AQUIRING: " << (void*)V << " " << V);
+  Operands.push_back(Use((Value*)VH.getOperand(0), this));
+}
+
 static void RecursiveDelete(ValueMapCache &Cache, Instruction *I) {
   if (!I || !I->use_empty()) return;
 
   assert(I->getParent() && "Inst not in basic block!");
 
-#ifdef DEBUG_EXPR_CONVERT
-  cerr << "VH DELETING: " << (void*)I << " " << I;
-#endif
+  //DEBUG(cerr << "VH DELETING: " << (void*)I << " " << I);
 
   for (User::op_iterator OI = I->op_begin(), OE = I->op_end(); 
-       OI != OE; ++OI) {
-    Instruction *U = dyn_cast<Instruction>(*OI);
-    if (U) {
+       OI != OE; ++OI)
+    if (Instruction *U = dyn_cast<Instruction>(OI->get())) {
       *OI = 0;
-      RecursiveDelete(Cache, dyn_cast<Instruction>(U));
+      RecursiveDelete(Cache, U);
     }
-  }
 
   I->getParent()->getInstList().remove(I);
 
@@ -945,8 +1266,7 @@ ValueHandle::~ValueHandle() {
     //
     RecursiveDelete(Cache, dyn_cast<Instruction>(V));
   } else {
-#ifdef DEBUG_EXPR_CONVERT
-    cerr << "VH RELEASING: " << (void*)Operands[0].get() << " " << Operands[0]->use_size() << " " << Operands[0];
-#endif
+    //DEBUG(cerr << "VH RELEASING: " << (void*)Operands[0].get() << " "
+    //           << Operands[0]->use_size() << " " << Operands[0]);
   }
 }