X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FExecutionEngine%2FInterpreter%2FExecution.cpp;h=26ef06bc982a01bd87935c8744b00d32eee6f896;hb=77113b627237fe2850676cccd809de1e05f03952;hp=4c8be259835b0c570d13688ee0409bef6bd7955f;hpb=fddc755a6f6042457b04d1c070e2a032add56b39;p=oota-llvm.git diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 4c8be259835..26ef06bc982 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -6,48 +6,48 @@ #include "Interpreter.h" #include "ExecutionAnnotations.h" -#include "llvm/iPHINode.h" -#include "llvm/iOther.h" -#include "llvm/iTerminators.h" -#include "llvm/iMemory.h" +#include "llvm/Module.h" +#include "llvm/Instructions.h" #include "llvm/DerivedTypes.h" #include "llvm/Constants.h" #include "llvm/Assembly/Writer.h" -#include "llvm/Target/TargetData.h" #include "Support/CommandLine.h" +#include "Support/Statistic.h" #include // For fmod #include #include -using std::vector; -using std::cout; -using std::cerr; -static cl::opt -QuietMode("quiet", cl::desc("Do not emit any non-program output")); +Interpreter *TheEE = 0; -static cl::alias -QuietModeA("q", cl::desc("Alias for -quiet"), cl::aliasopt(QuietMode)); +namespace { + Statistic<> NumDynamicInsts("lli", "Number of dynamic instructions executed"); -static cl::opt -ArrayChecksEnabled("array-checks", cl::desc("Enable array bound checks")); + cl::opt + QuietMode("quiet", cl::desc("Do not emit any non-program output"), + cl::init(true)); -static cl::opt -AbortOnExceptions("abort-on-exception", - cl::desc("Halt execution on a machine exception")); + cl::alias + QuietModeA("q", cl::desc("Alias for -quiet"), cl::aliasopt(QuietMode)); + + cl::opt + ArrayChecksEnabled("array-checks", cl::desc("Enable array bound checks")); + + cl::opt + AbortOnExceptions("abort-on-exception", + cl::desc("Halt execution on a machine exception")); +} // Create a TargetData structure to handle memory addressing and size/alignment // computations // -TargetData TD("lli Interpreter"); CachedWriter CW; // Object to accelerate printing of LLVM - #ifdef PROFILE_STRUCTURE_FIELDS static cl::opt ProfileStructureFields("profilestructfields", cl::desc("Profile Structure Field Accesses")); #include -static std::map > FieldAccessCounts; +static std::map > FieldAccessCounts; #endif sigjmp_buf SignalRecoverBuffer; @@ -82,48 +82,12 @@ static unsigned getOperandSlot(Value *V) { return SN->SlotNum; } -#define GET_CONST_VAL(TY, CLASS) \ - case Type::TY##TyID: Result.TY##Val = cast(C)->getValue(); break - // Operations used by constant expr implementations... static GenericValue executeCastOperation(Value *Src, const Type *DestTy, ExecutionContext &SF); -static GenericValue executeGEPOperation(Value *Src, User::op_iterator IdxBegin, - User::op_iterator IdxEnd, - ExecutionContext &SF); static GenericValue executeAddInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF); + const Type *Ty); -static GenericValue getConstantValue(const Constant *C) { - GenericValue Result; - switch (C->getType()->getPrimitiveID()) { - GET_CONST_VAL(Bool , ConstantBool); - GET_CONST_VAL(UByte , ConstantUInt); - GET_CONST_VAL(SByte , ConstantSInt); - GET_CONST_VAL(UShort , ConstantUInt); - GET_CONST_VAL(Short , ConstantSInt); - GET_CONST_VAL(UInt , ConstantUInt); - GET_CONST_VAL(Int , ConstantSInt); - GET_CONST_VAL(ULong , ConstantUInt); - GET_CONST_VAL(Long , ConstantSInt); - GET_CONST_VAL(Float , ConstantFP); - GET_CONST_VAL(Double , ConstantFP); - case Type::PointerTyID: - if (isa(C)) { - Result.PointerVal = 0; - } else if (const ConstantPointerRef *CPR = dyn_cast(C)){ - GlobalAddress *Address = - (GlobalAddress*)CPR->getValue()->getOrCreateAnnotation(GlobalAddressAID); - Result.PointerVal = (PointerTy)Address->Ptr; - } else { - assert(0 && "Unknown constant pointer type!"); - } - break; - default: - cout << "ERROR: Constant unimp for type: " << C->getType() << "\n"; - } - return Result; -} static GenericValue getOperandValue(Value *V, ExecutionContext &SF) { if (ConstantExpr *CE = dyn_cast(V)) { @@ -131,25 +95,21 @@ static GenericValue getOperandValue(Value *V, ExecutionContext &SF) { case Instruction::Cast: return executeCastOperation(CE->getOperand(0), CE->getType(), SF); case Instruction::GetElementPtr: - return executeGEPOperation(CE->getOperand(0), CE->op_begin()+1, - CE->op_end(), SF); + return TheEE->executeGEPOperation(CE->getOperand(0), CE->op_begin()+1, + CE->op_end(), SF); case Instruction::Add: return executeAddInst(getOperandValue(CE->getOperand(0), SF), getOperandValue(CE->getOperand(1), SF), - CE->getType(), SF); + CE->getType()); default: - cerr << "Unhandled ConstantExpr: " << CE << "\n"; + std::cerr << "Unhandled ConstantExpr: " << CE << "\n"; abort(); - { GenericValue V; return V; } + return GenericValue(); } } else if (Constant *CPV = dyn_cast(V)) { - return getConstantValue(CPV); + return TheEE->getConstantValue(CPV); } else if (GlobalValue *GV = dyn_cast(V)) { - GlobalAddress *Address = - (GlobalAddress*)GV->getOrCreateAnnotation(GlobalAddressAID); - GenericValue Result; - Result.PointerVal = (PointerTy)(GenericValue*)Address->Ptr; - return Result; + return PTOGV(TheEE->getPointerToGlobal(GV)); } else { unsigned TyP = V->getType()->getUniqueID(); // TypePlane for value unsigned OpSlot = getOperandSlot(V); @@ -161,23 +121,23 @@ static GenericValue getOperandValue(Value *V, ExecutionContext &SF) { static void printOperandInfo(Value *V, ExecutionContext &SF) { if (isa(V)) { - cout << "Constant Pool Value\n"; + std::cout << "Constant Pool Value\n"; } else if (isa(V)) { - cout << "Global Value\n"; + std::cout << "Global Value\n"; } else { unsigned TyP = V->getType()->getUniqueID(); // TypePlane for value unsigned Slot = getOperandSlot(V); - cout << "Value=" << (void*)V << " TypeID=" << TyP << " Slot=" << Slot - << " Addr=" << &SF.Values[TyP][Slot] << " SF=" << &SF - << " Contents=0x"; + std::cout << "Value=" << (void*)V << " TypeID=" << TyP << " Slot=" << Slot + << " Addr=" << &SF.Values[TyP][Slot] << " SF=" << &SF + << " Contents=0x"; const unsigned char *Buf = (const unsigned char*)&SF.Values[TyP][Slot]; for (unsigned i = 0; i < sizeof(GenericValue); ++i) { unsigned char Cur = Buf[i]; - cout << ( Cur >= 160? char((Cur>>4)+'A'-10) : char((Cur>>4) + '0')) - << ((Cur&15) >= 10? char((Cur&15)+'A'-10) : char((Cur&15) + '0')); + std::cout << ( Cur >= 160?char((Cur>>4)+'A'-10):char((Cur>>4) + '0')) + << ((Cur&15) >= 10?char((Cur&15)+'A'-10):char((Cur&15) + '0')); } - cout << "\n"; + std::cout << "\n"; } } @@ -186,7 +146,7 @@ static void printOperandInfo(Value *V, ExecutionContext &SF) { static void SetValue(Value *V, GenericValue Val, ExecutionContext &SF) { unsigned TyP = V->getType()->getUniqueID(); // TypePlane for value - //cout << "Setting value: " << &SF.Values[TyP][getOperandSlot(V)] << "\n"; + //std::cout << "Setting value: " << &SF.Values[TyP][getOperandSlot(V)]<< "\n"; SF.Values[TyP][getOperandSlot(V)] = Val; } @@ -196,85 +156,12 @@ static void SetValue(Value *V, GenericValue Val, ExecutionContext &SF) { //===----------------------------------------------------------------------===// void Interpreter::initializeExecutionEngine() { - AnnotationManager::registerAnnotationFactory(MethodInfoAID, - &MethodInfo::Create); - AnnotationManager::registerAnnotationFactory(GlobalAddressAID, - &GlobalAddress::Create); + TheEE = this; + AnnotationManager::registerAnnotationFactory(FunctionInfoAID, + &FunctionInfo::Create); initializeSignalHandlers(); } -static void StoreValueToMemory(GenericValue Val, GenericValue *Ptr, - const Type *Ty); - -// InitializeMemory - Recursive function to apply a Constant value into the -// specified memory location... -// -static void InitializeMemory(const Constant *Init, char *Addr) { - - if (Init->getType()->isFirstClassType()) { - GenericValue Val = getConstantValue(Init); - StoreValueToMemory(Val, (GenericValue*)Addr, Init->getType()); - return; - } - - switch (Init->getType()->getPrimitiveID()) { - case Type::ArrayTyID: { - const ConstantArray *CPA = cast(Init); - const vector &Val = CPA->getValues(); - unsigned ElementSize = - TD.getTypeSize(cast(CPA->getType())->getElementType()); - for (unsigned i = 0; i < Val.size(); ++i) - InitializeMemory(cast(Val[i].get()), Addr+i*ElementSize); - return; - } - - case Type::StructTyID: { - const ConstantStruct *CPS = cast(Init); - const StructLayout *SL=TD.getStructLayout(cast(CPS->getType())); - const vector &Val = CPS->getValues(); - for (unsigned i = 0; i < Val.size(); ++i) - InitializeMemory(cast(Val[i].get()), - Addr+SL->MemberOffsets[i]); - return; - } - - default: - CW << "Bad Type: " << Init->getType() << "\n"; - assert(0 && "Unknown constant type to initialize memory with!"); - } -} - -Annotation *GlobalAddress::Create(AnnotationID AID, const Annotable *O, void *){ - assert(AID == GlobalAddressAID); - - // This annotation will only be created on GlobalValue objects... - GlobalValue *GVal = cast((Value*)O); - - if (isa(GVal)) { - // The GlobalAddress object for a function is just a pointer to function - // itself. Don't delete it when the annotation is gone though! - return new GlobalAddress(GVal, false); - } - - // Handle the case of a global variable... - assert(isa(GVal) && - "Global value found that isn't a function or global variable!"); - GlobalVariable *GV = cast(GVal); - - // First off, we must allocate space for the global variable to point at... - const Type *Ty = GV->getType()->getElementType(); // Type to be allocated - - // Allocate enough memory to hold the type... - void *Addr = calloc(1, TD.getTypeSize(Ty)); - assert(Addr != 0 && "Null pointer returned by malloc!"); - - // Initialize the memory if there is an initializer... - if (GV->hasInitializer()) - InitializeMemory(GV->getInitializer(), (char*)Addr); - - return new GlobalAddress(Addr, true); // Simply invoke the ctor -} - //===----------------------------------------------------------------------===// // Binary Instruction Implementations //===----------------------------------------------------------------------===// @@ -283,7 +170,7 @@ Annotation *GlobalAddress::Create(AnnotationID AID, const Annotable *O, void *){ case Type::TY##TyID: Dest.TY##Val = Src1.TY##Val OP Src2.TY##Val; break static GenericValue executeAddInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_BINARY_OPERATOR(+, UByte); @@ -296,15 +183,15 @@ static GenericValue executeAddInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(+, Long); IMPLEMENT_BINARY_OPERATOR(+, Float); IMPLEMENT_BINARY_OPERATOR(+, Double); - IMPLEMENT_BINARY_OPERATOR(+, Pointer); default: - cout << "Unhandled type for Add instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Add instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeSubInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_BINARY_OPERATOR(-, UByte); @@ -317,15 +204,15 @@ static GenericValue executeSubInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(-, Long); IMPLEMENT_BINARY_OPERATOR(-, Float); IMPLEMENT_BINARY_OPERATOR(-, Double); - IMPLEMENT_BINARY_OPERATOR(-, Pointer); default: - cout << "Unhandled type for Sub instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Sub instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeMulInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_BINARY_OPERATOR(*, UByte); @@ -338,15 +225,15 @@ static GenericValue executeMulInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(*, Long); IMPLEMENT_BINARY_OPERATOR(*, Float); IMPLEMENT_BINARY_OPERATOR(*, Double); - IMPLEMENT_BINARY_OPERATOR(*, Pointer); default: - cout << "Unhandled type for Mul instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Mul instruction: " << Ty << "\n"; + abort(); } return Dest; } static GenericValue executeDivInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_BINARY_OPERATOR(/, UByte); @@ -359,15 +246,15 @@ static GenericValue executeDivInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(/, Long); IMPLEMENT_BINARY_OPERATOR(/, Float); IMPLEMENT_BINARY_OPERATOR(/, Double); - IMPLEMENT_BINARY_OPERATOR(/, Pointer); default: - cout << "Unhandled type for Div instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Div instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeRemInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_BINARY_OPERATOR(%, UByte); @@ -378,7 +265,6 @@ static GenericValue executeRemInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(%, Int); IMPLEMENT_BINARY_OPERATOR(%, ULong); IMPLEMENT_BINARY_OPERATOR(%, Long); - IMPLEMENT_BINARY_OPERATOR(%, Pointer); case Type::FloatTyID: Dest.FloatVal = fmod(Src1.FloatVal, Src2.FloatVal); break; @@ -386,15 +272,17 @@ static GenericValue executeRemInst(GenericValue Src1, GenericValue Src2, Dest.DoubleVal = fmod(Src1.DoubleVal, Src2.DoubleVal); break; default: - cout << "Unhandled type for Rem instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Rem instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeAndInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { + IMPLEMENT_BINARY_OPERATOR(&, Bool); IMPLEMENT_BINARY_OPERATOR(&, UByte); IMPLEMENT_BINARY_OPERATOR(&, SByte); IMPLEMENT_BINARY_OPERATOR(&, UShort); @@ -403,18 +291,19 @@ static GenericValue executeAndInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(&, Int); IMPLEMENT_BINARY_OPERATOR(&, ULong); IMPLEMENT_BINARY_OPERATOR(&, Long); - IMPLEMENT_BINARY_OPERATOR(&, Pointer); default: - cout << "Unhandled type for And instruction: " << Ty << "\n"; + std::cout << "Unhandled type for And instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeOrInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { + IMPLEMENT_BINARY_OPERATOR(|, Bool); IMPLEMENT_BINARY_OPERATOR(|, UByte); IMPLEMENT_BINARY_OPERATOR(|, SByte); IMPLEMENT_BINARY_OPERATOR(|, UShort); @@ -423,18 +312,19 @@ static GenericValue executeOrInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(|, Int); IMPLEMENT_BINARY_OPERATOR(|, ULong); IMPLEMENT_BINARY_OPERATOR(|, Long); - IMPLEMENT_BINARY_OPERATOR(|, Pointer); default: - cout << "Unhandled type for Or instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Or instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeXorInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { + IMPLEMENT_BINARY_OPERATOR(^, Bool); IMPLEMENT_BINARY_OPERATOR(^, UByte); IMPLEMENT_BINARY_OPERATOR(^, SByte); IMPLEMENT_BINARY_OPERATOR(^, UShort); @@ -443,9 +333,9 @@ static GenericValue executeXorInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_BINARY_OPERATOR(^, Int); IMPLEMENT_BINARY_OPERATOR(^, ULong); IMPLEMENT_BINARY_OPERATOR(^, Long); - IMPLEMENT_BINARY_OPERATOR(^, Pointer); default: - cout << "Unhandled type for Xor instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Xor instruction: " << *Ty << "\n"; + abort(); } return Dest; } @@ -454,8 +344,17 @@ static GenericValue executeXorInst(GenericValue Src1, GenericValue Src2, #define IMPLEMENT_SETCC(OP, TY) \ case Type::TY##TyID: Dest.BoolVal = Src1.TY##Val OP Src2.TY##Val; break +// Handle pointers specially because they must be compared with only as much +// width as the host has. We _do not_ want to be comparing 64 bit values when +// running on a 32-bit target, otherwise the upper 32 bits might mess up +// comparisons if they contain garbage. +#define IMPLEMENT_POINTERSETCC(OP) \ + case Type::PointerTyID: \ + Dest.BoolVal = (void*)(intptr_t)Src1.PointerVal OP \ + (void*)(intptr_t)Src2.PointerVal; break + static GenericValue executeSetEQInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_SETCC(==, UByte); @@ -468,15 +367,16 @@ static GenericValue executeSetEQInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(==, Long); IMPLEMENT_SETCC(==, Float); IMPLEMENT_SETCC(==, Double); - IMPLEMENT_SETCC(==, Pointer); + IMPLEMENT_POINTERSETCC(==); default: - cout << "Unhandled type for SetEQ instruction: " << Ty << "\n"; + std::cout << "Unhandled type for SetEQ instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeSetNEInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_SETCC(!=, UByte); @@ -489,16 +389,17 @@ static GenericValue executeSetNEInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(!=, Long); IMPLEMENT_SETCC(!=, Float); IMPLEMENT_SETCC(!=, Double); - IMPLEMENT_SETCC(!=, Pointer); + IMPLEMENT_POINTERSETCC(!=); default: - cout << "Unhandled type for SetNE instruction: " << Ty << "\n"; + std::cout << "Unhandled type for SetNE instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeSetLEInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_SETCC(<=, UByte); @@ -511,15 +412,16 @@ static GenericValue executeSetLEInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(<=, Long); IMPLEMENT_SETCC(<=, Float); IMPLEMENT_SETCC(<=, Double); - IMPLEMENT_SETCC(<=, Pointer); + IMPLEMENT_POINTERSETCC(<=); default: - cout << "Unhandled type for SetLE instruction: " << Ty << "\n"; + std::cout << "Unhandled type for SetLE instruction: " << Ty << "\n"; + abort(); } return Dest; } static GenericValue executeSetGEInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_SETCC(>=, UByte); @@ -532,15 +434,16 @@ static GenericValue executeSetGEInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(>=, Long); IMPLEMENT_SETCC(>=, Float); IMPLEMENT_SETCC(>=, Double); - IMPLEMENT_SETCC(>=, Pointer); + IMPLEMENT_POINTERSETCC(>=); default: - cout << "Unhandled type for SetGE instruction: " << Ty << "\n"; + std::cout << "Unhandled type for SetGE instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeSetLTInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_SETCC(<, UByte); @@ -553,15 +456,16 @@ static GenericValue executeSetLTInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(<, Long); IMPLEMENT_SETCC(<, Float); IMPLEMENT_SETCC(<, Double); - IMPLEMENT_SETCC(<, Pointer); + IMPLEMENT_POINTERSETCC(<); default: - cout << "Unhandled type for SetLT instruction: " << Ty << "\n"; + std::cout << "Unhandled type for SetLT instruction: " << *Ty << "\n"; + abort(); } return Dest; } static GenericValue executeSetGTInst(GenericValue Src1, GenericValue Src2, - const Type *Ty, ExecutionContext &SF) { + const Type *Ty) { GenericValue Dest; switch (Ty->getPrimitiveID()) { IMPLEMENT_SETCC(>, UByte); @@ -574,9 +478,10 @@ static GenericValue executeSetGTInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(>, Long); IMPLEMENT_SETCC(>, Float); IMPLEMENT_SETCC(>, Double); - IMPLEMENT_SETCC(>, Pointer); + IMPLEMENT_POINTERSETCC(>); default: - cout << "Unhandled type for SetGT instruction: " << Ty << "\n"; + std::cout << "Unhandled type for SetGT instruction: " << *Ty << "\n"; + abort(); } return Dest; } @@ -588,23 +493,23 @@ static void executeBinaryInst(BinaryOperator &I, ExecutionContext &SF) { GenericValue R; // Result switch (I.getOpcode()) { - case Instruction::Add: R = executeAddInst (Src1, Src2, Ty, SF); break; - case Instruction::Sub: R = executeSubInst (Src1, Src2, Ty, SF); break; - case Instruction::Mul: R = executeMulInst (Src1, Src2, Ty, SF); break; - case Instruction::Div: R = executeDivInst (Src1, Src2, Ty, SF); break; - case Instruction::Rem: R = executeRemInst (Src1, Src2, Ty, SF); break; - case Instruction::And: R = executeAndInst (Src1, Src2, Ty, SF); break; - case Instruction::Or: R = executeOrInst (Src1, Src2, Ty, SF); break; - case Instruction::Xor: R = executeXorInst (Src1, Src2, Ty, SF); break; - case Instruction::SetEQ: R = executeSetEQInst(Src1, Src2, Ty, SF); break; - case Instruction::SetNE: R = executeSetNEInst(Src1, Src2, Ty, SF); break; - case Instruction::SetLE: R = executeSetLEInst(Src1, Src2, Ty, SF); break; - case Instruction::SetGE: R = executeSetGEInst(Src1, Src2, Ty, SF); break; - case Instruction::SetLT: R = executeSetLTInst(Src1, Src2, Ty, SF); break; - case Instruction::SetGT: R = executeSetGTInst(Src1, Src2, Ty, SF); break; + case Instruction::Add: R = executeAddInst (Src1, Src2, Ty); break; + case Instruction::Sub: R = executeSubInst (Src1, Src2, Ty); break; + case Instruction::Mul: R = executeMulInst (Src1, Src2, Ty); break; + case Instruction::Div: R = executeDivInst (Src1, Src2, Ty); break; + case Instruction::Rem: R = executeRemInst (Src1, Src2, Ty); break; + case Instruction::And: R = executeAndInst (Src1, Src2, Ty); break; + case Instruction::Or: R = executeOrInst (Src1, Src2, Ty); break; + case Instruction::Xor: R = executeXorInst (Src1, Src2, Ty); break; + case Instruction::SetEQ: R = executeSetEQInst(Src1, Src2, Ty); break; + case Instruction::SetNE: R = executeSetNEInst(Src1, Src2, Ty); break; + case Instruction::SetLE: R = executeSetLEInst(Src1, Src2, Ty); break; + case Instruction::SetGE: R = executeSetGEInst(Src1, Src2, Ty); break; + case Instruction::SetLT: R = executeSetLTInst(Src1, Src2, Ty); break; + case Instruction::SetGT: R = executeSetGTInst(Src1, Src2, Ty); break; default: - cout << "Don't know how to handle this binary operator!\n-->" << I; - R = Src1; + std::cout << "Don't know how to handle this binary operator!\n-->" << I; + abort(); } SetValue(&I, R, SF); @@ -619,10 +524,10 @@ static void PerformExitStuff() { // Print out structure field accounting information... if (!FieldAccessCounts.empty()) { CW << "Profile Field Access Counts:\n"; - std::map >::iterator + std::map >::iterator I = FieldAccessCounts.begin(), E = FieldAccessCounts.end(); for (; I != E; ++I) { - vector &OfC = I->second; + std::vector &OfC = I->second; CW << " '" << (Value*)I->first << "'\t- Sum="; unsigned Sum = 0; @@ -639,9 +544,9 @@ static void PerformExitStuff() { CW << "\n"; CW << "Profile Field Access Percentages:\n"; - cout.precision(3); + std::cout.precision(3); for (I = FieldAccessCounts.begin(); I != E; ++I) { - vector &OfC = I->second; + std::vector &OfC = I->second; unsigned Sum = 0; for (unsigned i = 0; i < OfC.size(); ++i) Sum += OfC[i]; @@ -662,9 +567,9 @@ static void PerformExitStuff() { void Interpreter::exitCalled(GenericValue GV) { if (!QuietMode) { - cout << "Program returned "; + std::cout << "Program returned "; print(Type::IntTy, GV); - cout << " via 'void exit(int)'\n"; + std::cout << " via 'void exit(int)'\n"; } ExitCode = GV.SByteVal; @@ -683,7 +588,7 @@ void Interpreter::executeRetInst(ReturnInst &I, ExecutionContext &SF) { } // Save previously executing meth - const Function *M = ECStack.back().CurMethod; + const Function *M = ECStack.back().CurFunction; // Pop the current stack frame... this invalidates SF ECStack.pop_back(); @@ -694,7 +599,7 @@ void Interpreter::executeRetInst(ReturnInst &I, ExecutionContext &SF) { CW << "Function " << M->getType() << " \"" << M->getName() << "\" returned "; print(RetTy, Result); - cout << "\n"; + std::cout << "\n"; } if (RetTy->isIntegral()) @@ -722,25 +627,77 @@ void Interpreter::executeRetInst(ReturnInst &I, ExecutionContext &SF) { CW << "Function " << M->getType() << " \"" << M->getName() << "\" returned "; print(RetTy, Result); - cout << "\n"; + std::cout << "\n"; } } void Interpreter::executeBrInst(BranchInst &I, ExecutionContext &SF) { - SF.PrevBB = SF.CurBB; // Update PrevBB so that PHI nodes work... BasicBlock *Dest; Dest = I.getSuccessor(0); // Uncond branches have a fixed dest... if (!I.isUnconditional()) { Value *Cond = I.getCondition(); - GenericValue CondVal = getOperandValue(Cond, SF); - if (CondVal.BoolVal == 0) // If false cond... + if (getOperandValue(Cond, SF).BoolVal == 0) // If false cond... Dest = I.getSuccessor(1); } + SwitchToNewBasicBlock(Dest, SF); +} + +void Interpreter::executeSwitchInst(SwitchInst &I, ExecutionContext &SF) { + GenericValue CondVal = getOperandValue(I.getOperand(0), SF); + const Type *ElTy = I.getOperand(0)->getType(); + + // Check to see if any of the cases match... + BasicBlock *Dest = 0; + for (unsigned i = 2, e = I.getNumOperands(); i != e; i += 2) + if (executeSetEQInst(CondVal, + getOperandValue(I.getOperand(i), SF), ElTy).BoolVal) { + Dest = cast(I.getOperand(i+1)); + break; + } + + if (!Dest) Dest = I.getDefaultDest(); // No cases matched: use default + SwitchToNewBasicBlock(Dest, SF); +} + +// SwitchToNewBasicBlock - This method is used to jump to a new basic block. +// This function handles the actual updating of block and instruction iterators +// as well as execution of all of the PHI nodes in the destination block. +// +// This method does this because all of the PHI nodes must be executed +// atomically, reading their inputs before any of the results are updated. Not +// doing this can cause problems if the PHI nodes depend on other PHI nodes for +// their inputs. If the input PHI node is updated before it is read, incorrect +// results can happen. Thus we use a two phase approach. +// +void Interpreter::SwitchToNewBasicBlock(BasicBlock *Dest, ExecutionContext &SF){ + BasicBlock *PrevBB = SF.CurBB; // Remember where we came from... SF.CurBB = Dest; // Update CurBB to branch destination SF.CurInst = SF.CurBB->begin(); // Update new instruction ptr... + + if (!isa(SF.CurInst)) return; // Nothing fancy to do + + // Loop over all of the PHI nodes in the current block, reading their inputs. + std::vector ResultValues; + + for (; PHINode *PN = dyn_cast(SF.CurInst); ++SF.CurInst) { + // Search for the value corresponding to this previous bb... + int i = PN->getBasicBlockIndex(PrevBB); + assert(i != -1 && "PHINode doesn't contain entry for predecessor??"); + Value *IncomingValue = PN->getIncomingValue(i); + + // Save the incoming value for this PHI node... + ResultValues.push_back(getOperandValue(IncomingValue, SF)); + } + + // Now loop over all of the PHI nodes setting their values... + SF.CurInst = SF.CurBB->begin(); + for (unsigned i = 0; PHINode *PN = dyn_cast(SF.CurInst); + ++SF.CurInst, ++i) + SetValue(PN, ResultValues[i], SF); } + //===----------------------------------------------------------------------===// // Memory Instruction Implementations //===----------------------------------------------------------------------===// @@ -755,8 +712,7 @@ void Interpreter::executeAllocInst(AllocationInst &I, ExecutionContext &SF) { // FIXME: Don't use CALLOC, use a tainted malloc. void *Memory = calloc(NumElements, TD.getTypeSize(Ty)); - GenericValue Result; - Result.PointerVal = (PointerTy)Memory; + GenericValue Result = PTOGV(Memory); assert(Result.PointerVal != 0 && "Null pointer returned by malloc!"); SetValue(&I, Result, SF); @@ -768,15 +724,15 @@ static void executeFreeInst(FreeInst &I, ExecutionContext &SF) { assert(isa(I.getOperand(0)->getType()) && "Freeing nonptr?"); GenericValue Value = getOperandValue(I.getOperand(0), SF); // TODO: Check to make sure memory is allocated - free((void*)Value.PointerVal); // Free memory + free(GVTOP(Value)); // Free memory } // getElementOffset - The workhorse for getelementptr. // -static GenericValue executeGEPOperation(Value *Ptr, User::op_iterator I, - User::op_iterator E, - ExecutionContext &SF) { +GenericValue Interpreter::executeGEPOperation(Value *Ptr, User::op_iterator I, + User::op_iterator E, + ExecutionContext &SF) { assert(isa(Ptr->getType()) && "Cannot getElementOffset of a nonpointer type!"); @@ -795,7 +751,7 @@ static GenericValue executeGEPOperation(Value *Ptr, User::op_iterator I, #ifdef PROFILE_STRUCTURE_FIELDS if (ProfileStructureFields) { // Do accounting for this field... - vector &OfC = FieldAccessCounts[STy]; + std::vector &OfC = FieldAccessCounts[STy]; if (OfC.size() == 0) OfC.resize(STy->getElementTypes().size()); OfC[Index]++; } @@ -805,14 +761,14 @@ static GenericValue executeGEPOperation(Value *Ptr, User::op_iterator I, Ty = STy->getElementTypes()[Index]; } else if (const SequentialType *ST = cast(Ty)) { - // Get the index number for the array... which must be uint type... + // Get the index number for the array... which must be long type... assert((*I)->getType() == Type::LongTy); unsigned Idx = getOperandValue(*I, SF).LongVal; if (const ArrayType *AT = dyn_cast(ST)) if (Idx >= AT->getNumElements() && ArrayChecksEnabled) { - cerr << "Out of range memory access to element #" << Idx - << " of a " << AT->getNumElements() << " element array." - << " Subscript #" << *I << "\n"; + std::cerr << "Out of range memory access to element #" << Idx + << " of a " << AT->getNumElements() << " element array." + << " Subscript #" << *I << "\n"; // Get outta here!!! siglongjmp(SignalRecoverBuffer, SIGTRAP); } @@ -829,189 +785,62 @@ static GenericValue executeGEPOperation(Value *Ptr, User::op_iterator I, } static void executeGEPInst(GetElementPtrInst &I, ExecutionContext &SF) { - SetValue(&I, executeGEPOperation(I.getPointerOperand(), + SetValue(&I, TheEE->executeGEPOperation(I.getPointerOperand(), I.idx_begin(), I.idx_end(), SF), SF); } -static void executeLoadInst(LoadInst &I, ExecutionContext &SF) { +void Interpreter::executeLoadInst(LoadInst &I, ExecutionContext &SF) { GenericValue SRC = getOperandValue(I.getPointerOperand(), SF); - GenericValue *Ptr = (GenericValue*)SRC.PointerVal; - GenericValue Result; - - if (TD.isLittleEndian()) { - switch (I.getType()->getPrimitiveID()) { - case Type::BoolTyID: - case Type::UByteTyID: - case Type::SByteTyID: Result.Untyped[0] = Ptr->UByteVal; break; - case Type::UShortTyID: - case Type::ShortTyID: Result.Untyped[0] = Ptr->UShortVal & 255; - Result.Untyped[1] = (Ptr->UShortVal >> 8) & 255; - break; - case Type::FloatTyID: - case Type::UIntTyID: - case Type::IntTyID: Result.Untyped[0] = Ptr->UIntVal & 255; - Result.Untyped[1] = (Ptr->UIntVal >> 8) & 255; - Result.Untyped[2] = (Ptr->UIntVal >> 16) & 255; - Result.Untyped[3] = (Ptr->UIntVal >> 24) & 255; - break; - case Type::DoubleTyID: - case Type::ULongTyID: - case Type::LongTyID: - case Type::PointerTyID: Result.Untyped[0] = Ptr->ULongVal & 255; - Result.Untyped[1] = (Ptr->ULongVal >> 8) & 255; - Result.Untyped[2] = (Ptr->ULongVal >> 16) & 255; - Result.Untyped[3] = (Ptr->ULongVal >> 24) & 255; - Result.Untyped[4] = (Ptr->ULongVal >> 32) & 255; - Result.Untyped[5] = (Ptr->ULongVal >> 40) & 255; - Result.Untyped[6] = (Ptr->ULongVal >> 48) & 255; - Result.Untyped[7] = (Ptr->ULongVal >> 56) & 255; - break; - default: - cout << "Cannot load value of type " << I.getType() << "!\n"; - } - } else { - switch (I.getType()->getPrimitiveID()) { - case Type::BoolTyID: - case Type::UByteTyID: - case Type::SByteTyID: Result.Untyped[0] = Ptr->UByteVal; break; - case Type::UShortTyID: - case Type::ShortTyID: Result.Untyped[1] = Ptr->UShortVal & 255; - Result.Untyped[0] = (Ptr->UShortVal >> 8) & 255; - break; - case Type::FloatTyID: - case Type::UIntTyID: - case Type::IntTyID: Result.Untyped[3] = Ptr->UIntVal & 255; - Result.Untyped[2] = (Ptr->UIntVal >> 8) & 255; - Result.Untyped[1] = (Ptr->UIntVal >> 16) & 255; - Result.Untyped[0] = (Ptr->UIntVal >> 24) & 255; - break; - case Type::DoubleTyID: - case Type::ULongTyID: - case Type::LongTyID: - case Type::PointerTyID: Result.Untyped[7] = Ptr->ULongVal & 255; - Result.Untyped[6] = (Ptr->ULongVal >> 8) & 255; - Result.Untyped[5] = (Ptr->ULongVal >> 16) & 255; - Result.Untyped[4] = (Ptr->ULongVal >> 24) & 255; - Result.Untyped[3] = (Ptr->ULongVal >> 32) & 255; - Result.Untyped[2] = (Ptr->ULongVal >> 40) & 255; - Result.Untyped[1] = (Ptr->ULongVal >> 48) & 255; - Result.Untyped[0] = (Ptr->ULongVal >> 56) & 255; - break; - default: - cout << "Cannot load value of type " << I.getType() << "!\n"; - } - } - + GenericValue *Ptr = (GenericValue*)GVTOP(SRC); + GenericValue Result = LoadValueFromMemory(Ptr, I.getType()); SetValue(&I, Result, SF); } -static void StoreValueToMemory(GenericValue Val, GenericValue *Ptr, - const Type *Ty) { - if (TD.isLittleEndian()) { - switch (Ty->getPrimitiveID()) { - case Type::BoolTyID: - case Type::UByteTyID: - case Type::SByteTyID: Ptr->Untyped[0] = Val.UByteVal; break; - case Type::UShortTyID: - case Type::ShortTyID: Ptr->Untyped[0] = Val.UShortVal & 255; - Ptr->Untyped[1] = (Val.UShortVal >> 8) & 255; - break; - case Type::FloatTyID: - case Type::UIntTyID: - case Type::IntTyID: Ptr->Untyped[0] = Val.UIntVal & 255; - Ptr->Untyped[1] = (Val.UIntVal >> 8) & 255; - Ptr->Untyped[2] = (Val.UIntVal >> 16) & 255; - Ptr->Untyped[3] = (Val.UIntVal >> 24) & 255; - break; - case Type::DoubleTyID: - case Type::ULongTyID: - case Type::LongTyID: - case Type::PointerTyID: Ptr->Untyped[0] = Val.ULongVal & 255; - Ptr->Untyped[1] = (Val.ULongVal >> 8) & 255; - Ptr->Untyped[2] = (Val.ULongVal >> 16) & 255; - Ptr->Untyped[3] = (Val.ULongVal >> 24) & 255; - Ptr->Untyped[4] = (Val.ULongVal >> 32) & 255; - Ptr->Untyped[5] = (Val.ULongVal >> 40) & 255; - Ptr->Untyped[6] = (Val.ULongVal >> 48) & 255; - Ptr->Untyped[7] = (Val.ULongVal >> 56) & 255; - break; - default: - cout << "Cannot load value of type " << Ty << "!\n"; - } - } else { - switch (Ty->getPrimitiveID()) { - case Type::BoolTyID: - case Type::UByteTyID: - case Type::SByteTyID: Ptr->Untyped[0] = Val.UByteVal; break; - case Type::UShortTyID: - case Type::ShortTyID: Ptr->Untyped[1] = Val.UShortVal & 255; - Ptr->Untyped[0] = (Val.UShortVal >> 8) & 255; - break; - case Type::FloatTyID: - case Type::UIntTyID: - case Type::IntTyID: Ptr->Untyped[3] = Val.UIntVal & 255; - Ptr->Untyped[2] = (Val.UIntVal >> 8) & 255; - Ptr->Untyped[1] = (Val.UIntVal >> 16) & 255; - Ptr->Untyped[0] = (Val.UIntVal >> 24) & 255; - break; - case Type::DoubleTyID: - case Type::ULongTyID: - case Type::LongTyID: - case Type::PointerTyID: Ptr->Untyped[7] = Val.ULongVal & 255; - Ptr->Untyped[6] = (Val.ULongVal >> 8) & 255; - Ptr->Untyped[5] = (Val.ULongVal >> 16) & 255; - Ptr->Untyped[4] = (Val.ULongVal >> 24) & 255; - Ptr->Untyped[3] = (Val.ULongVal >> 32) & 255; - Ptr->Untyped[2] = (Val.ULongVal >> 40) & 255; - Ptr->Untyped[1] = (Val.ULongVal >> 48) & 255; - Ptr->Untyped[0] = (Val.ULongVal >> 56) & 255; - break; - default: - cout << "Cannot load value of type " << Ty << "!\n"; - } - } -} - -static void executeStoreInst(StoreInst &I, ExecutionContext &SF) { +void Interpreter::executeStoreInst(StoreInst &I, ExecutionContext &SF) { GenericValue Val = getOperandValue(I.getOperand(0), SF); GenericValue SRC = getOperandValue(I.getPointerOperand(), SF); - StoreValueToMemory(Val, (GenericValue *)SRC.PointerVal, I.getType()); + StoreValueToMemory(Val, (GenericValue *)GVTOP(SRC), + I.getOperand(0)->getType()); } + //===----------------------------------------------------------------------===// // Miscellaneous Instruction Implementations //===----------------------------------------------------------------------===// void Interpreter::executeCallInst(CallInst &I, ExecutionContext &SF) { ECStack.back().Caller = &I; - vector ArgVals; + std::vector ArgVals; ArgVals.reserve(I.getNumOperands()-1); - for (unsigned i = 1; i < I.getNumOperands(); ++i) + for (unsigned i = 1; i < I.getNumOperands(); ++i) { ArgVals.push_back(getOperandValue(I.getOperand(i), SF)); + // Promote all integral types whose size is < sizeof(int) into ints. We do + // this by zero or sign extending the value as appropriate according to the + // source type. + if (I.getOperand(i)->getType()->isIntegral() && + I.getOperand(i)->getType()->getPrimitiveSize() < 4) { + const Type *Ty = I.getOperand(i)->getType(); + if (Ty == Type::ShortTy) + ArgVals.back().IntVal = ArgVals.back().ShortVal; + else if (Ty == Type::UShortTy) + ArgVals.back().UIntVal = ArgVals.back().UShortVal; + else if (Ty == Type::SByteTy) + ArgVals.back().IntVal = ArgVals.back().SByteVal; + else if (Ty == Type::UByteTy) + ArgVals.back().UIntVal = ArgVals.back().UByteVal; + else if (Ty == Type::BoolTy) + ArgVals.back().UIntVal = ArgVals.back().BoolVal; + else + assert(0 && "Unknown type!"); + } + } // To handle indirect calls, we must get the pointer value from the argument // and treat it as a function pointer. GenericValue SRC = getOperandValue(I.getCalledValue(), SF); - callMethod((Function*)SRC.PointerVal, ArgVals); -} - -static void executePHINode(PHINode &I, ExecutionContext &SF) { - BasicBlock *PrevBB = SF.PrevBB; - Value *IncomingValue = 0; - - // Search for the value corresponding to this previous bb... - for (unsigned i = I.getNumIncomingValues(); i > 0;) { - if (I.getIncomingBlock(--i) == PrevBB) { - IncomingValue = I.getIncomingValue(i); - break; - } - } - assert(IncomingValue && "No PHI node predecessor for current PrevBB!"); - - // Found the value, set as the result... - SetValue(&I, getOperandValue(IncomingValue, SF), SF); + callFunction((Function*)GVTOP(SRC), ArgVals); } #define IMPLEMENT_SHIFT(OP, TY) \ @@ -1032,9 +861,8 @@ static void executeShlInst(ShiftInst &I, ExecutionContext &SF) { IMPLEMENT_SHIFT(<<, Int); IMPLEMENT_SHIFT(<<, ULong); IMPLEMENT_SHIFT(<<, Long); - IMPLEMENT_SHIFT(<<, Pointer); default: - cout << "Unhandled type for Shl instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Shl instruction: " << *Ty << "\n"; } SetValue(&I, Dest, SF); } @@ -1054,9 +882,9 @@ static void executeShrInst(ShiftInst &I, ExecutionContext &SF) { IMPLEMENT_SHIFT(>>, Int); IMPLEMENT_SHIFT(>>, ULong); IMPLEMENT_SHIFT(>>, Long); - IMPLEMENT_SHIFT(>>, Pointer); default: - cout << "Unhandled type for Shr instruction: " << Ty << "\n"; + std::cout << "Unhandled type for Shr instruction: " << *Ty << "\n"; + abort(); } SetValue(&I, Dest, SF); } @@ -1083,8 +911,8 @@ static void executeShrInst(ShiftInst &I, ExecutionContext &SF) { IMPLEMENT_CAST(DESTTY, DESTCTY, Double) #define IMPLEMENT_CAST_CASE_END() \ - default: cout << "Unhandled cast: " << SrcTy << " to " << Ty << "\n"; \ - break; \ + default: std::cout << "Unhandled cast: " << SrcTy << " to " << Ty << "\n"; \ + abort(); \ } \ break @@ -1107,11 +935,13 @@ static GenericValue executeCastOperation(Value *SrcVal, const Type *Ty, IMPLEMENT_CAST_CASE(Int , ( signed int )); IMPLEMENT_CAST_CASE(ULong , (uint64_t)); IMPLEMENT_CAST_CASE(Long , ( int64_t)); - IMPLEMENT_CAST_CASE(Pointer, (PointerTy)(uint32_t)); + IMPLEMENT_CAST_CASE(Pointer, (PointerTy)); IMPLEMENT_CAST_CASE(Float , (float)); IMPLEMENT_CAST_CASE(Double , (double)); + IMPLEMENT_CAST_CASE(Bool , (bool)); default: - cout << "Unhandled dest type for cast instruction: " << Ty << "\n"; + std::cout << "Unhandled dest type for cast instruction: " << *Ty << "\n"; + abort(); } return Dest; @@ -1122,12 +952,32 @@ static void executeCastInst(CastInst &I, ExecutionContext &SF) { SetValue(&I, executeCastOperation(I.getOperand(0), I.getType(), SF), SF); } +static void executeVarArgInst(VarArgInst &I, ExecutionContext &SF) { + // Get the pointer to the valist element. LLI treats the valist in memory as + // an integer. + GenericValue VAListPtr = getOperandValue(I.getOperand(0), SF); + + // Load the pointer + GenericValue VAList = + TheEE->LoadValueFromMemory((GenericValue *)GVTOP(VAListPtr), Type::UIntTy); + + unsigned Argument = VAList.IntVal++; + + // Update the valist to point to the next argument... + TheEE->StoreValueToMemory(VAList, (GenericValue *)GVTOP(VAListPtr), + Type::UIntTy); + + // Set the value... + assert(Argument < SF.VarArgs.size() && + "Accessing past the last vararg argument!"); + SetValue(&I, SF.VarArgs[Argument], SF); +} //===----------------------------------------------------------------------===// // Dispatch and Execution Code //===----------------------------------------------------------------------===// -MethodInfo::MethodInfo(Function *F) : Annotation(MethodInfoAID) { +FunctionInfo::FunctionInfo(Function *F) : Annotation(FunctionInfoAID) { // Assign slot numbers to the function arguments... for (Function::const_aiterator AI = F->abegin(), E = F->aend(); AI != E; ++AI) AI->addAnnotation(new SlotNumber(getValueSlot(AI))); @@ -1140,7 +990,7 @@ MethodInfo::MethodInfo(Function *F) : Annotation(MethodInfoAID) { II->addAnnotation(new InstNumber(++InstNum, getValueSlot(II))); } -unsigned MethodInfo::getValueSlot(const Value *V) { +unsigned FunctionInfo::getValueSlot(const Value *V) { unsigned Plane = V->getType()->getUniqueID(); if (Plane >= NumPlaneElements.size()) NumPlaneElements.resize(Plane+1, 0); @@ -1149,15 +999,16 @@ unsigned MethodInfo::getValueSlot(const Value *V) { //===----------------------------------------------------------------------===// -// callMethod - Execute the specified function... +// callFunction - Execute the specified function... // -void Interpreter::callMethod(Function *M, const vector &ArgVals) { +void Interpreter::callFunction(Function *F, + const std::vector &ArgVals) { assert((ECStack.empty() || ECStack.back().Caller == 0 || ECStack.back().Caller->getNumOperands()-1 == ArgVals.size()) && "Incorrect number of arguments passed into function call!"); - if (M->isExternal()) { - GenericValue Result = callExternalMethod(M, ArgVals); - const Type *RetTy = M->getReturnType(); + if (F->isExternal()) { + GenericValue Result = callExternalFunction(F, ArgVals); + const Type *RetTy = F->getReturnType(); // Copy the result back into the result variable if we are not returning // void. @@ -1169,10 +1020,10 @@ void Interpreter::callMethod(Function *M, const vector &ArgVals) { SF.Caller = 0; // We returned from the call... } else if (!QuietMode) { // print it. - CW << "Function " << M->getType() << " \"" << M->getName() + CW << "Function " << F->getType() << " \"" << F->getName() << "\" returned "; print(RetTy, Result); - cout << "\n"; + std::cout << "\n"; if (RetTy->isIntegral()) ExitCode = Result.IntVal; // Capture the exit code of the program @@ -1186,34 +1037,39 @@ void Interpreter::callMethod(Function *M, const vector &ArgVals) { // the function. Also calculate the number of values for each type slot // active. // - MethodInfo *MethInfo = (MethodInfo*)M->getOrCreateAnnotation(MethodInfoAID); + FunctionInfo *FuncInfo = + (FunctionInfo*)F->getOrCreateAnnotation(FunctionInfoAID); ECStack.push_back(ExecutionContext()); // Make a new stack frame... ExecutionContext &StackFrame = ECStack.back(); // Fill it in... - StackFrame.CurMethod = M; - StackFrame.CurBB = M->begin(); + StackFrame.CurFunction = F; + StackFrame.CurBB = F->begin(); StackFrame.CurInst = StackFrame.CurBB->begin(); - StackFrame.MethInfo = MethInfo; + StackFrame.FuncInfo = FuncInfo; // Initialize the values to nothing... - StackFrame.Values.resize(MethInfo->NumPlaneElements.size()); - for (unsigned i = 0; i < MethInfo->NumPlaneElements.size(); ++i) { - StackFrame.Values[i].resize(MethInfo->NumPlaneElements[i]); + StackFrame.Values.resize(FuncInfo->NumPlaneElements.size()); + for (unsigned i = 0; i < FuncInfo->NumPlaneElements.size(); ++i) { + StackFrame.Values[i].resize(FuncInfo->NumPlaneElements[i]); // Taint the initial values of stuff memset(&StackFrame.Values[i][0], 42, - MethInfo->NumPlaneElements[i]*sizeof(GenericValue)); + FuncInfo->NumPlaneElements[i]*sizeof(GenericValue)); } - StackFrame.PrevBB = 0; // No previous BB for PHI nodes... - // Run through the function arguments and initialize their values... - assert(ArgVals.size() == M->asize() && + assert((ArgVals.size() == F->asize() || + (ArgVals.size() > F->asize() && F->getFunctionType()->isVarArg())) && "Invalid number of values passed to function invocation!"); + + // Handle non-varargs arguments... unsigned i = 0; - for (Function::aiterator AI = M->abegin(), E = M->aend(); AI != E; ++AI, ++i) + for (Function::aiterator AI = F->abegin(), E = F->aend(); AI != E; ++AI, ++i) SetValue(AI, ArgVals[i], StackFrame); + + // Handle varargs arguments... + StackFrame.VarArgs.assign(ArgVals.begin()+i, ArgVals.end()); } // executeInstruction - Interpret a single instruction, increment the "PC", and @@ -1228,20 +1084,23 @@ bool Interpreter::executeInstruction() { if (Trace) CW << "Run:" << I; + // Track the number of dynamic instructions executed. + ++NumDynamicInsts; + // Set a sigsetjmp buffer so that we can recover if an error happens during // instruction execution... // if (int SigNo = sigsetjmp(SignalRecoverBuffer, 1)) { --SF.CurInst; // Back up to erroring instruction if (SigNo != SIGINT) { - cout << "EXCEPTION OCCURRED [" << strsignal(SigNo) << "]:\n"; + std::cout << "EXCEPTION OCCURRED [" << strsignal(SigNo) << "]:\n"; printStackTrace(); // If -abort-on-exception was specified, terminate LLI instead of trying // to debug it. // if (AbortOnExceptions) exit(1); } else if (SigNo == SIGINT) { - cout << "CTRL-C Detected, execution halted.\n"; + std::cout << "CTRL-C Detected, execution halted.\n"; } InInstruction = false; return true; @@ -1255,6 +1114,9 @@ bool Interpreter::executeInstruction() { // Terminators case Instruction::Ret: executeRetInst (cast(I), SF); break; case Instruction::Br: executeBrInst (cast(I), SF); break; + case Instruction::Switch: executeSwitchInst(cast(I), SF);break; + // Invoke not handled! + // Memory Instructions case Instruction::Alloca: case Instruction::Malloc: executeAllocInst((AllocationInst&)I, SF); break; @@ -1266,12 +1128,14 @@ bool Interpreter::executeInstruction() { // Miscellaneous Instructions case Instruction::Call: executeCallInst (cast (I), SF); break; - case Instruction::PHINode: executePHINode (cast (I), SF); break; + case Instruction::PHINode: assert(0 && "PHI nodes already handled!"); + case Instruction::Cast: executeCastInst (cast (I), SF); break; case Instruction::Shl: executeShlInst (cast(I), SF); break; case Instruction::Shr: executeShrInst (cast(I), SF); break; - case Instruction::Cast: executeCastInst (cast (I), SF); break; + case Instruction::VarArg: executeVarArgInst(cast(I),SF); break; default: - cout << "Don't know how to execute this instruction!\n-->" << I; + std::cout << "Don't know how to execute this instruction!\n-->" << I; + abort(); } } InInstruction = false; @@ -1287,7 +1151,7 @@ bool Interpreter::executeInstruction() { void Interpreter::stepInstruction() { // Do the 'step' command if (ECStack.empty()) { - cout << "Error: no program running, cannot step!\n"; + std::cout << "Error: no program running, cannot step!\n"; return; } @@ -1301,7 +1165,7 @@ void Interpreter::stepInstruction() { // Do the 'step' command // --- UI Stuff... void Interpreter::nextInstruction() { // Do the 'next' command if (ECStack.empty()) { - cout << "Error: no program running, cannot 'next'!\n"; + std::cout << "Error: no program running, cannot 'next'!\n"; return; } @@ -1312,7 +1176,7 @@ void Interpreter::nextInstruction() { // Do the 'next' command // Step into the function... if (executeInstruction()) { // Hit a breakpoint, print current instruction, then return to user... - cout << "Breakpoint hit!\n"; + std::cout << "Breakpoint hit!\n"; printCurrentInstruction(); return; } @@ -1332,7 +1196,7 @@ void Interpreter::nextInstruction() { // Do the 'next' command void Interpreter::run() { if (ECStack.empty()) { - cout << "Error: no program running, cannot run!\n"; + std::cout << "Error: no program running, cannot run!\n"; return; } @@ -1342,16 +1206,16 @@ void Interpreter::run() { HitBreakpoint = executeInstruction(); } - if (HitBreakpoint) { - cout << "Breakpoint hit!\n"; - } + if (HitBreakpoint) + std::cout << "Breakpoint hit!\n"; + // Print the next instruction to execute... printCurrentInstruction(); } void Interpreter::finish() { if (ECStack.empty()) { - cout << "Error: no program running, cannot run!\n"; + std::cout << "Error: no program running, cannot run!\n"; return; } @@ -1362,9 +1226,8 @@ void Interpreter::finish() { HitBreakpoint = executeInstruction(); } - if (HitBreakpoint) { - cout << "Breakpoint hit!\n"; - } + if (HitBreakpoint) + std::cout << "Breakpoint hit!\n"; // Print the next instruction to execute... printCurrentInstruction(); @@ -1378,33 +1241,33 @@ void Interpreter::finish() { void Interpreter::printCurrentInstruction() { if (!ECStack.empty()) { if (ECStack.back().CurBB->begin() == ECStack.back().CurInst) // print label - WriteAsOperand(cout, ECStack.back().CurBB) << ":\n"; + WriteAsOperand(std::cout, ECStack.back().CurBB) << ":\n"; Instruction &I = *ECStack.back().CurInst; InstNumber *IN = (InstNumber*)I.getAnnotation(SlotNumberAID); assert(IN && "Instruction has no numbering annotation!"); - cout << "#" << IN->InstNum << I; + std::cout << "#" << IN->InstNum << I; } } void Interpreter::printValue(const Type *Ty, GenericValue V) { switch (Ty->getPrimitiveID()) { - case Type::BoolTyID: cout << (V.BoolVal?"true":"false"); break; + case Type::BoolTyID: std::cout << (V.BoolVal?"true":"false"); break; case Type::SByteTyID: - cout << (int)V.SByteVal << " '" << V.SByteVal << "'"; break; + std::cout << (int)V.SByteVal << " '" << V.SByteVal << "'"; break; case Type::UByteTyID: - cout << (unsigned)V.UByteVal << " '" << V.UByteVal << "'"; break; - case Type::ShortTyID: cout << V.ShortVal; break; - case Type::UShortTyID: cout << V.UShortVal; break; - case Type::IntTyID: cout << V.IntVal; break; - case Type::UIntTyID: cout << V.UIntVal; break; - case Type::LongTyID: cout << (long)V.LongVal; break; - case Type::ULongTyID: cout << (unsigned long)V.ULongVal; break; - case Type::FloatTyID: cout << V.FloatVal; break; - case Type::DoubleTyID: cout << V.DoubleVal; break; - case Type::PointerTyID:cout << (void*)V.PointerVal; break; + std::cout << (unsigned)V.UByteVal << " '" << V.UByteVal << "'"; break; + case Type::ShortTyID: std::cout << V.ShortVal; break; + case Type::UShortTyID: std::cout << V.UShortVal; break; + case Type::IntTyID: std::cout << V.IntVal; break; + case Type::UIntTyID: std::cout << V.UIntVal; break; + case Type::LongTyID: std::cout << (long)V.LongVal; break; + case Type::ULongTyID: std::cout << (unsigned long)V.ULongVal; break; + case Type::FloatTyID: std::cout << V.FloatVal; break; + case Type::DoubleTyID: std::cout << V.DoubleVal; break; + case Type::PointerTyID:std::cout << (void*)GVTOP(V); break; default: - cout << "- Don't know how to print value of this type!"; + std::cout << "- Don't know how to print value of this type!"; break; } } @@ -1427,7 +1290,7 @@ void Interpreter::print(const std::string &Name) { } else { // Otherwise there should be an annotation for the slot# print(PickedVal->getType(), getOperandValue(PickedVal, ECStack[CurFrame])); - cout << "\n"; + std::cout << "\n"; } } @@ -1435,10 +1298,10 @@ void Interpreter::infoValue(const std::string &Name) { Value *PickedVal = ChooseOneOption(Name, LookupMatchingNames(Name)); if (!PickedVal) return; - cout << "Value: "; + std::cout << "Value: "; print(PickedVal->getType(), getOperandValue(PickedVal, ECStack[CurFrame])); - cout << "\n"; + std::cout << "\n"; printOperandInfo(PickedVal, ECStack[CurFrame]); } @@ -1447,7 +1310,7 @@ void Interpreter::infoValue(const std::string &Name) { // void Interpreter::printStackFrame(int FrameNo) { if (FrameNo == -1) FrameNo = CurFrame; - Function *F = ECStack[FrameNo].CurMethod; + Function *F = ECStack[FrameNo].CurFunction; const Type *RetTy = F->getReturnType(); CW << ((FrameNo == CurFrame) ? '>' : '-') << "#" << FrameNo << ". " @@ -1455,13 +1318,13 @@ void Interpreter::printStackFrame(int FrameNo) { unsigned i = 0; for (Function::aiterator I = F->abegin(), E = F->aend(); I != E; ++I, ++i) { - if (i != 0) cout << ", "; + if (i != 0) std::cout << ", "; CW << *I << "="; printValue(I->getType(), getOperandValue(I, ECStack[FrameNo])); } - cout << ")\n"; + std::cout << ")\n"; if (FrameNo != int(ECStack.size()-1)) { BasicBlock::iterator I = ECStack[FrameNo].CurInst;