#include "llvm/iOther.h"
#include "llvm/iTerminators.h"
#include "llvm/iMemory.h"
-#include "llvm/Type.h"
-#include "llvm/ConstantVals.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/Constants.h"
#include "llvm/Assembly/Writer.h"
#include "llvm/Target/TargetData.h"
#include "llvm/GlobalVariable.h"
using std::cout;
using std::cerr;
-cl::Flag QuietMode ("quiet" , "Do not emit any non-program output");
-cl::Alias QuietModeA("q" , "Alias for -quiet", cl::NoFlags, QuietMode);
-cl::Flag ArrayChecksEnabled("array-checks", "Enable array bound checks");
-cl::Flag AbortOnExceptions("abort-on-exception", "Halt execution on a machine exception");
+static cl::opt<bool>
+QuietMode("quiet", cl::desc("Do not emit any non-program output"));
+
+static cl::alias
+QuietModeA("q", cl::desc("Alias for -quiet"), cl::aliasopt(QuietMode));
+
+static cl::opt<bool>
+ArrayChecksEnabled("array-checks", cl::desc("Enable array bound checks"));
+
+static cl::opt<bool>
+AbortOnExceptions("abort-on-exception",
+ cl::desc("Halt execution on a machine exception"));
// Create a TargetData structure to handle memory addressing and size/alignment
// computations
#ifdef PROFILE_STRUCTURE_FIELDS
-static cl::Flag ProfileStructureFields("profilestructfields",
- "Profile Structure Field Accesses");
+static cl::opt<bool>
+ProfileStructureFields("profilestructfields",
+ cl::desc("Profile Structure Field Accesses"));
#include <map>
static std::map<const StructType *, vector<unsigned> > FieldAccessCounts;
#endif
// InitializeMemory - Recursive function to apply a Constant value into the
// specified memory location...
//
-static void InitializeMemory(Constant *Init, char *Addr) {
+static void InitializeMemory(const Constant *Init, char *Addr) {
#define INITIALIZE_MEMORY(TYID, CLASS, TY) \
case Type::TYID##TyID: { \
TY Tmp = cast<CLASS>(Init)->getValue(); \
#undef INITIALIZE_MEMORY
case Type::ArrayTyID: {
- ConstantArray *CPA = cast<ConstantArray>(Init);
+ const ConstantArray *CPA = cast<ConstantArray>(Init);
const vector<Use> &Val = CPA->getValues();
unsigned ElementSize =
TD.getTypeSize(cast<ArrayType>(CPA->getType())->getElementType());
}
case Type::StructTyID: {
- ConstantStruct *CPS = cast<ConstantStruct>(Init);
+ const ConstantStruct *CPS = cast<ConstantStruct>(Init);
const StructLayout *SL=TD.getStructLayout(cast<StructType>(CPS->getType()));
const vector<Use> &Val = CPS->getValues();
for (unsigned i = 0; i < Val.size(); ++i)
case Type::PointerTyID:
if (isa<ConstantPointerNull>(Init)) {
*(void**)Addr = 0;
- } else if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(Init)) {
+ } else if (const ConstantPointerRef *CPR =
+ dyn_cast<ConstantPointerRef>(Init)) {
GlobalAddress *Address =
(GlobalAddress*)CPR->getValue()->getOrCreateAnnotation(GlobalAddressAID);
*(void**)Addr = (GenericValue*)Address->Ptr;
// This annotation will only be created on GlobalValue objects...
GlobalValue *GVal = cast<GlobalValue>((Value*)O);
- if (isa<Method>(GVal)) {
- // The GlobalAddress object for a method is just a pointer to method itself.
- // Don't delete it when the annotation is gone though!
+ if (isa<Function>(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<GlobalVariable>(GVal) &&
- "Global value found that isn't a method or global variable!");
+ "Global value found that isn't a function or global variable!");
GlobalVariable *GV = cast<GlobalVariable>(GVal);
// First off, we must allocate space for the global variable to point at...
}
+//===----------------------------------------------------------------------===//
+// Unary Instruction Implementations
+//===----------------------------------------------------------------------===//
+
+#define IMPLEMENT_UNARY_OPERATOR(OP, TY) \
+ case Type::TY##TyID: Dest.TY##Val = OP Src.TY##Val; break
+
+static void executeNotInst(UnaryOperator &I, ExecutionContext &SF) {
+ const Type *Ty = I.getOperand(0)->getType();
+ GenericValue Src = getOperandValue(I.getOperand(0), SF);
+ GenericValue Dest;
+ switch (Ty->getPrimitiveID()) {
+ IMPLEMENT_UNARY_OPERATOR(~, UByte);
+ IMPLEMENT_UNARY_OPERATOR(~, SByte);
+ IMPLEMENT_UNARY_OPERATOR(~, UShort);
+ IMPLEMENT_UNARY_OPERATOR(~, Short);
+ IMPLEMENT_UNARY_OPERATOR(~, UInt);
+ IMPLEMENT_UNARY_OPERATOR(~, Int);
+ IMPLEMENT_UNARY_OPERATOR(~, ULong);
+ IMPLEMENT_UNARY_OPERATOR(~, Long);
+ IMPLEMENT_UNARY_OPERATOR(~, Pointer);
+ default:
+ cout << "Unhandled type for Not instruction: " << Ty << "\n";
+ }
+ SetValue(&I, Dest, SF);
+}
+
//===----------------------------------------------------------------------===//
// Binary Instruction Implementations
//===----------------------------------------------------------------------===//
return Dest;
}
-static void executeBinaryInst(BinaryOperator *I, ExecutionContext &SF) {
- const Type *Ty = I->getOperand(0)->getType();
- GenericValue Src1 = getOperandValue(I->getOperand(0), SF);
- GenericValue Src2 = getOperandValue(I->getOperand(1), SF);
+static void executeBinaryInst(BinaryOperator &I, ExecutionContext &SF) {
+ const Type *Ty = I.getOperand(0)->getType();
+ GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
+ GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
GenericValue R; // Result
- switch (I->getOpcode()) {
+ 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;
R = Src1;
}
- SetValue(I, R, SF);
+ SetValue(&I, R, SF);
}
//===----------------------------------------------------------------------===//
PerformExitStuff();
}
-void Interpreter::executeRetInst(ReturnInst *I, ExecutionContext &SF) {
+void Interpreter::executeRetInst(ReturnInst &I, ExecutionContext &SF) {
const Type *RetTy = 0;
GenericValue Result;
// Save away the return value... (if we are not 'ret void')
- if (I->getNumOperands()) {
- RetTy = I->getReturnValue()->getType();
- Result = getOperandValue(I->getReturnValue(), SF);
+ if (I.getNumOperands()) {
+ RetTy = I.getReturnValue()->getType();
+ Result = getOperandValue(I.getReturnValue(), SF);
}
// Save previously executing meth
- const Method *M = ECStack.back().CurMethod;
+ const Function *M = ECStack.back().CurMethod;
// Pop the current stack frame... this invalidates SF
ECStack.pop_back();
if (ECStack.empty()) { // Finished main. Put result into exit code...
if (RetTy) { // Nonvoid return type?
if (!QuietMode) {
- CW << "Method " << M->getType() << " \"" << M->getName()
+ CW << "Function " << M->getType() << " \"" << M->getName()
<< "\" returned ";
print(RetTy, Result);
cout << "\n";
}
if (RetTy->isIntegral())
- ExitCode = Result.SByteVal; // Capture the exit code of the program
+ ExitCode = Result.IntVal; // Capture the exit code of the program
} else {
ExitCode = 0;
}
} else if (!QuietMode) {
// This must be a function that is executing because of a user 'call'
// instruction.
- CW << "Method " << M->getType() << " \"" << M->getName()
+ CW << "Function " << M->getType() << " \"" << M->getName()
<< "\" returned ";
print(RetTy, Result);
cout << "\n";
}
}
-void Interpreter::executeBrInst(BranchInst *I, ExecutionContext &SF) {
+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();
+ 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...
- Dest = I->getSuccessor(1);
+ Dest = I.getSuccessor(1);
}
SF.CurBB = Dest; // Update CurBB to branch destination
SF.CurInst = SF.CurBB->begin(); // Update new instruction ptr...
// Memory Instruction Implementations
//===----------------------------------------------------------------------===//
-void Interpreter::executeAllocInst(AllocationInst *I, ExecutionContext &SF) {
- const Type *Ty = I->getType()->getElementType(); // Type to be allocated
- unsigned NumElements = 1;
+void Interpreter::executeAllocInst(AllocationInst &I, ExecutionContext &SF) {
+ const Type *Ty = I.getType()->getElementType(); // Type to be allocated
- // FIXME: Malloc/Alloca should always have an argument!
- if (I->getNumOperands()) { // Allocating a unsized array type?
- // Get the number of elements being allocated by the array...
- GenericValue NumEl = getOperandValue(I->getOperand(0), SF);
- NumElements = NumEl.UIntVal;
- }
+ // Get the number of elements being allocated by the array...
+ unsigned NumElements = getOperandValue(I.getOperand(0), SF).UIntVal;
// Allocate enough memory to hold the type...
- GenericValue Result;
// FIXME: Don't use CALLOC, use a tainted malloc.
- Result.PointerVal = (PointerTy)calloc(NumElements, TD.getTypeSize(Ty));
+ void *Memory = calloc(NumElements, TD.getTypeSize(Ty));
+
+ GenericValue Result;
+ Result.PointerVal = (PointerTy)Memory;
assert(Result.PointerVal != 0 && "Null pointer returned by malloc!");
- SetValue(I, Result, SF);
+ SetValue(&I, Result, SF);
- if (I->getOpcode() == Instruction::Alloca) {
- // TODO: FIXME: alloca should keep track of memory to free it later...
- }
+ if (I.getOpcode() == Instruction::Alloca)
+ ECStack.back().Allocas.add(Memory);
}
-static void executeFreeInst(FreeInst *I, ExecutionContext &SF) {
- assert(I->getOperand(0)->getType()->isPointerType() && "Freeing nonptr?");
- GenericValue Value = getOperandValue(I->getOperand(0), SF);
+static void executeFreeInst(FreeInst &I, ExecutionContext &SF) {
+ assert(isa<PointerType>(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
}
// function returns the offset that arguments ArgOff+1 -> NumArgs specify for
// the pointer type specified by argument Arg.
//
-static PointerTy getElementOffset(MemAccessInst *I, ExecutionContext &SF) {
- assert(isa<PointerType>(I->getPointerOperand()->getType()) &&
+static PointerTy getElementOffset(MemAccessInst &I, ExecutionContext &SF) {
+ assert(isa<PointerType>(I.getPointerOperand()->getType()) &&
"Cannot getElementOffset of a nonpointer type!");
PointerTy Total = 0;
- const Type *Ty = I->getPointerOperand()->getType();
+ const Type *Ty = I.getPointerOperand()->getType();
- unsigned ArgOff = I->getFirstIndexOperandNumber();
- while (ArgOff < I->getNumOperands()) {
+ unsigned ArgOff = I.getFirstIndexOperandNumber();
+ while (ArgOff < I.getNumOperands()) {
if (const StructType *STy = dyn_cast<StructType>(Ty)) {
const StructLayout *SLO = TD.getStructLayout(STy);
// Indicies must be ubyte constants...
- const ConstantUInt *CPU = cast<ConstantUInt>(I->getOperand(ArgOff++));
+ const ConstantUInt *CPU = cast<ConstantUInt>(I.getOperand(ArgOff++));
assert(CPU->getType() == Type::UByteTy);
unsigned Index = CPU->getValue();
} else if (const SequentialType *ST = cast<SequentialType>(Ty)) {
// Get the index number for the array... which must be uint type...
- assert(I->getOperand(ArgOff)->getType() == Type::UIntTy);
- unsigned Idx = getOperandValue(I->getOperand(ArgOff++), SF).UIntVal;
+ assert(I.getOperand(ArgOff)->getType() == Type::UIntTy);
+ unsigned Idx = getOperandValue(I.getOperand(ArgOff++), SF).UIntVal;
if (const ArrayType *AT = dyn_cast<ArrayType>(ST))
if (Idx >= AT->getNumElements() && ArrayChecksEnabled) {
cerr << "Out of range memory access to element #" << Idx
<< " of a " << AT->getNumElements() << " element array."
- << " Subscript #" << (ArgOff-I->getFirstIndexOperandNumber())
+ << " Subscript #" << (ArgOff-I.getFirstIndexOperandNumber())
<< "\n";
// Get outta here!!!
siglongjmp(SignalRecoverBuffer, SIGTRAP);
return Total;
}
-static void executeGEPInst(GetElementPtrInst *I, ExecutionContext &SF) {
- GenericValue SRC = getOperandValue(I->getPointerOperand(), SF);
+static void executeGEPInst(GetElementPtrInst &I, ExecutionContext &SF) {
+ GenericValue SRC = getOperandValue(I.getPointerOperand(), SF);
PointerTy SrcPtr = SRC.PointerVal;
GenericValue Result;
Result.PointerVal = SrcPtr + getElementOffset(I, SF);
- SetValue(I, Result, SF);
+ SetValue(&I, Result, SF);
}
-static void executeLoadInst(LoadInst *I, ExecutionContext &SF) {
- GenericValue SRC = getOperandValue(I->getPointerOperand(), SF);
+static void executeLoadInst(LoadInst &I, ExecutionContext &SF) {
+ GenericValue SRC = getOperandValue(I.getPointerOperand(), SF);
PointerTy SrcPtr = SRC.PointerVal;
PointerTy Offset = getElementOffset(I, SF); // Handle any structure indices
SrcPtr += Offset;
GenericValue *Ptr = (GenericValue*)SrcPtr;
GenericValue Result;
- switch (I->getType()->getPrimitiveID()) {
+ switch (I.getType()->getPrimitiveID()) {
case Type::BoolTyID:
case Type::UByteTyID:
case Type::SByteTyID: Result.SByteVal = Ptr->SByteVal; break;
case Type::FloatTyID: Result.FloatVal = Ptr->FloatVal; break;
case Type::DoubleTyID: Result.DoubleVal = Ptr->DoubleVal; break;
default:
- cout << "Cannot load value of type " << I->getType() << "!\n";
+ cout << "Cannot load value of type " << I.getType() << "!\n";
}
- SetValue(I, Result, SF);
+ SetValue(&I, Result, SF);
}
-static void executeStoreInst(StoreInst *I, ExecutionContext &SF) {
- GenericValue SRC = getOperandValue(I->getPointerOperand(), SF);
+static void executeStoreInst(StoreInst &I, ExecutionContext &SF) {
+ GenericValue SRC = getOperandValue(I.getPointerOperand(), SF);
PointerTy SrcPtr = SRC.PointerVal;
SrcPtr += getElementOffset(I, SF); // Handle any structure indices
GenericValue *Ptr = (GenericValue *)SrcPtr;
- GenericValue Val = getOperandValue(I->getOperand(0), SF);
+ GenericValue Val = getOperandValue(I.getOperand(0), SF);
- switch (I->getOperand(0)->getType()->getPrimitiveID()) {
+ switch (I.getOperand(0)->getType()->getPrimitiveID()) {
case Type::BoolTyID:
case Type::UByteTyID:
case Type::SByteTyID: Ptr->SByteVal = Val.SByteVal; break;
case Type::FloatTyID: Ptr->FloatVal = Val.FloatVal; break;
case Type::DoubleTyID: Ptr->DoubleVal = Val.DoubleVal; break;
default:
- cout << "Cannot store value of type " << I->getType() << "!\n";
+ cout << "Cannot store value of type " << I.getType() << "!\n";
}
}
// Miscellaneous Instruction Implementations
//===----------------------------------------------------------------------===//
-void Interpreter::executeCallInst(CallInst *I, ExecutionContext &SF) {
- ECStack.back().Caller = I;
+void Interpreter::executeCallInst(CallInst &I, ExecutionContext &SF) {
+ ECStack.back().Caller = &I;
vector<GenericValue> ArgVals;
- ArgVals.reserve(I->getNumOperands()-1);
- for (unsigned i = 1; i < I->getNumOperands(); ++i)
- ArgVals.push_back(getOperandValue(I->getOperand(i), SF));
+ ArgVals.reserve(I.getNumOperands()-1);
+ for (unsigned i = 1; i < I.getNumOperands(); ++i)
+ ArgVals.push_back(getOperandValue(I.getOperand(i), SF));
// To handle indirect calls, we must get the pointer value from the argument
- // and treat it as a method pointer.
- GenericValue SRC = getOperandValue(I->getCalledValue(), SF);
+ // and treat it as a function pointer.
+ GenericValue SRC = getOperandValue(I.getCalledValue(), SF);
- callMethod((Method*)SRC.PointerVal, ArgVals);
+ callMethod((Function*)SRC.PointerVal, ArgVals);
}
-static void executePHINode(PHINode *I, ExecutionContext &SF) {
+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);
+ 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);
+ SetValue(&I, getOperandValue(IncomingValue, SF), SF);
}
#define IMPLEMENT_SHIFT(OP, TY) \
case Type::TY##TyID: Dest.TY##Val = Src1.TY##Val OP Src2.UByteVal; break
-static void executeShlInst(ShiftInst *I, ExecutionContext &SF) {
- const Type *Ty = I->getOperand(0)->getType();
- GenericValue Src1 = getOperandValue(I->getOperand(0), SF);
- GenericValue Src2 = getOperandValue(I->getOperand(1), SF);
+static void executeShlInst(ShiftInst &I, ExecutionContext &SF) {
+ const Type *Ty = I.getOperand(0)->getType();
+ GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
+ GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
GenericValue Dest;
switch (Ty->getPrimitiveID()) {
IMPLEMENT_SHIFT(<<, Int);
IMPLEMENT_SHIFT(<<, ULong);
IMPLEMENT_SHIFT(<<, Long);
+ IMPLEMENT_SHIFT(<<, Pointer);
default:
cout << "Unhandled type for Shl instruction: " << Ty << "\n";
}
- SetValue(I, Dest, SF);
+ SetValue(&I, Dest, SF);
}
-static void executeShrInst(ShiftInst *I, ExecutionContext &SF) {
- const Type *Ty = I->getOperand(0)->getType();
- GenericValue Src1 = getOperandValue(I->getOperand(0), SF);
- GenericValue Src2 = getOperandValue(I->getOperand(1), SF);
+static void executeShrInst(ShiftInst &I, ExecutionContext &SF) {
+ const Type *Ty = I.getOperand(0)->getType();
+ GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
+ GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
GenericValue Dest;
switch (Ty->getPrimitiveID()) {
IMPLEMENT_SHIFT(>>, Int);
IMPLEMENT_SHIFT(>>, ULong);
IMPLEMENT_SHIFT(>>, Long);
+ IMPLEMENT_SHIFT(>>, Pointer);
default:
cout << "Unhandled type for Shr instruction: " << Ty << "\n";
}
- SetValue(I, Dest, SF);
+ SetValue(&I, Dest, SF);
}
#define IMPLEMENT_CAST(DTY, DCTY, STY) \
#define IMPLEMENT_CAST_CASE_START(DESTTY, DESTCTY) \
case Type::DESTTY##TyID: \
switch (SrcTy->getPrimitiveID()) { \
+ IMPLEMENT_CAST(DESTTY, DESTCTY, Bool); \
IMPLEMENT_CAST(DESTTY, DESTCTY, UByte); \
IMPLEMENT_CAST(DESTTY, DESTCTY, SByte); \
IMPLEMENT_CAST(DESTTY, DESTCTY, UShort); \
IMPLEMENT_CAST_CASE_FP_IMP(DESTTY, DESTCTY); \
IMPLEMENT_CAST_CASE_END()
-static void executeCastInst(CastInst *I, ExecutionContext &SF) {
- const Type *Ty = I->getType();
- const Type *SrcTy = I->getOperand(0)->getType();
- GenericValue Src = getOperandValue(I->getOperand(0), SF);
+static void executeCastInst(CastInst &I, ExecutionContext &SF) {
+ const Type *Ty = I.getType();
+ const Type *SrcTy = I.getOperand(0)->getType();
+ GenericValue Src = getOperandValue(I.getOperand(0), SF);
GenericValue Dest;
switch (Ty->getPrimitiveID()) {
IMPLEMENT_CAST_CASE(UByte , (unsigned char));
IMPLEMENT_CAST_CASE(SByte , ( signed char));
IMPLEMENT_CAST_CASE(UShort , (unsigned short));
- IMPLEMENT_CAST_CASE(Short , ( signed char));
+ IMPLEMENT_CAST_CASE(Short , ( signed short));
IMPLEMENT_CAST_CASE(UInt , (unsigned int ));
IMPLEMENT_CAST_CASE(Int , ( signed int ));
IMPLEMENT_CAST_CASE(ULong , (uint64_t));
default:
cout << "Unhandled dest type for cast instruction: " << Ty << "\n";
}
- SetValue(I, Dest, SF);
+ SetValue(&I, Dest, SF);
}
// Dispatch and Execution Code
//===----------------------------------------------------------------------===//
-MethodInfo::MethodInfo(Method *M) : Annotation(MethodInfoAID) {
- // Assign slot numbers to the method arguments...
- const Method::ArgumentListType &ArgList = M->getArgumentList();
- for (Method::ArgumentListType::const_iterator AI = ArgList.begin(),
- AE = ArgList.end(); AI != AE; ++AI) {
- MethodArgument *MA = *AI;
- MA->addAnnotation(new SlotNumber(getValueSlot(MA)));
- }
+MethodInfo::MethodInfo(Function *F) : Annotation(MethodInfoAID) {
+ // 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)));
// Iterate over all of the instructions...
unsigned InstNum = 0;
- for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
- BasicBlock *BB = *MI;
- for (BasicBlock::iterator II = BB->begin(), IE = BB->end(); II != IE; ++II){
- Instruction *I = *II; // For each instruction... Add Annote
- I->addAnnotation(new InstNumber(++InstNum, getValueSlot(I)));
- }
- }
+ for (Function::iterator BB = F->begin(), BBE = F->end(); BB != BBE; ++BB)
+ for (BasicBlock::iterator II = BB->begin(), IE = BB->end(); II != IE; ++II)
+ // For each instruction... Add Annote
+ II->addAnnotation(new InstNumber(++InstNum, getValueSlot(II)));
}
unsigned MethodInfo::getValueSlot(const Value *V) {
//===----------------------------------------------------------------------===//
-// callMethod - Execute the specified method...
+// callMethod - Execute the specified function...
//
-void Interpreter::callMethod(Method *M, const vector<GenericValue> &ArgVals) {
+void Interpreter::callMethod(Function *M, const vector<GenericValue> &ArgVals) {
assert((ECStack.empty() || ECStack.back().Caller == 0 ||
ECStack.back().Caller->getNumOperands()-1 == ArgVals.size()) &&
"Incorrect number of arguments passed into function call!");
SF.Caller = 0; // We returned from the call...
} else if (!QuietMode) {
// print it.
- CW << "Method " << M->getType() << " \"" << M->getName()
+ CW << "Function " << M->getType() << " \"" << M->getName()
<< "\" returned ";
print(RetTy, Result);
cout << "\n";
return;
}
- // Process the method, assigning instruction numbers to the instructions in
- // the method. Also calculate the number of values for each type slot active.
+ // Process the function, assigning instruction numbers to the instructions in
+ // the function. Also calculate the number of values for each type slot
+ // active.
//
MethodInfo *MethInfo = (MethodInfo*)M->getOrCreateAnnotation(MethodInfoAID);
ECStack.push_back(ExecutionContext()); // Make a new stack frame...
ExecutionContext &StackFrame = ECStack.back(); // Fill it in...
StackFrame.CurMethod = M;
- StackFrame.CurBB = M->front();
+ StackFrame.CurBB = M->begin();
StackFrame.CurInst = StackFrame.CurBB->begin();
StackFrame.MethInfo = MethInfo;
StackFrame.PrevBB = 0; // No previous BB for PHI nodes...
- // Run through the method arguments and initialize their values...
- assert(ArgVals.size() == M->getArgumentList().size() &&
- "Invalid number of values passed to method invocation!");
+ // Run through the function arguments and initialize their values...
+ assert(ArgVals.size() == M->asize() &&
+ "Invalid number of values passed to function invocation!");
unsigned i = 0;
- for (Method::ArgumentListType::iterator MI = M->getArgumentList().begin(),
- ME = M->getArgumentList().end(); MI != ME; ++MI, ++i) {
- SetValue(*MI, ArgVals[i], StackFrame);
- }
+ for (Function::aiterator AI = M->abegin(), E = M->aend(); AI != E; ++AI, ++i)
+ SetValue(AI, ArgVals[i], StackFrame);
}
// executeInstruction - Interpret a single instruction, increment the "PC", and
assert(!ECStack.empty() && "No program running, cannot execute inst!");
ExecutionContext &SF = ECStack.back(); // Current stack frame
- Instruction *I = *SF.CurInst++; // Increment before execute
+ Instruction &I = *SF.CurInst++; // Increment before execute
if (Trace)
CW << "Run:" << I;
}
InInstruction = true;
- if (I->isBinaryOp()) {
+ if (I.isBinaryOp()) {
executeBinaryInst(cast<BinaryOperator>(I), SF);
} else {
- switch (I->getOpcode()) {
+ switch (I.getOpcode()) {
+ case Instruction::Not: executeNotInst(cast<UnaryOperator>(I),SF); break;
// Terminators
case Instruction::Ret: executeRetInst (cast<ReturnInst>(I), SF); break;
case Instruction::Br: executeBrInst (cast<BranchInst>(I), SF); break;
// Memory Instructions
case Instruction::Alloca:
- case Instruction::Malloc: executeAllocInst((AllocationInst*)I, SF); break;
+ case Instruction::Malloc: executeAllocInst((AllocationInst&)I, SF); break;
case Instruction::Free: executeFreeInst (cast<FreeInst> (I), SF); break;
case Instruction::Load: executeLoadInst (cast<LoadInst> (I), SF); break;
case Instruction::Store: executeStoreInst(cast<StoreInst>(I), SF); break;
if (CurFrame == -1) return false; // No breakpoint if no code
// Return true if there is a breakpoint annotation on the instruction...
- return (*ECStack[CurFrame].CurInst)->getAnnotation(BreakpointAID) != 0;
+ return ECStack[CurFrame].CurInst->getAnnotation(BreakpointAID) != 0;
}
void Interpreter::stepInstruction() { // Do the 'step' command
// If this is a call instruction, step over the call instruction...
// TODO: ICALL, CALL WITH, ...
- if ((*ECStack.back().CurInst)->getOpcode() == Instruction::Call) {
+ if (ECStack.back().CurInst->getOpcode() == Instruction::Call) {
unsigned StackSize = ECStack.size();
// Step into the function...
if (executeInstruction()) {
if (ECStack.back().CurBB->begin() == ECStack.back().CurInst) // print label
WriteAsOperand(cout, ECStack.back().CurBB) << ":\n";
- Instruction *I = *ECStack.back().CurInst;
- InstNumber *IN = (InstNumber*)I->getAnnotation(SlotNumberAID);
+ Instruction &I = *ECStack.back().CurInst;
+ InstNumber *IN = (InstNumber*)I.getAnnotation(SlotNumberAID);
assert(IN && "Instruction has no numbering annotation!");
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::SByteTyID: cout << V.SByteVal; break;
- case Type::UByteTyID: cout << V.UByteVal; break;
+ case Type::SByteTyID:
+ 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;
Value *PickedVal = ChooseOneOption(Name, LookupMatchingNames(Name));
if (!PickedVal) return;
- if (const Method *M = dyn_cast<const Method>(PickedVal)) {
- CW << M; // Print the method
+ if (const Function *F = dyn_cast<const Function>(PickedVal)) {
+ CW << F; // Print the function
} else if (const Type *Ty = dyn_cast<const Type>(PickedVal)) {
CW << "type %" << Name << " = " << Ty->getDescription() << "\n";
} else if (const BasicBlock *BB = dyn_cast<const BasicBlock>(PickedVal)) {
// printStackFrame - Print information about the specified stack frame, or -1
// for the default one.
//
-void Interpreter::printStackFrame(int FrameNo = -1) {
+void Interpreter::printStackFrame(int FrameNo) {
if (FrameNo == -1) FrameNo = CurFrame;
- Method *Meth = ECStack[FrameNo].CurMethod;
- const Type *RetTy = Meth->getReturnType();
+ Function *F = ECStack[FrameNo].CurMethod;
+ const Type *RetTy = F->getReturnType();
CW << ((FrameNo == CurFrame) ? '>' : '-') << "#" << FrameNo << ". "
- << (Value*)RetTy << " \"" << Meth->getName() << "\"(";
+ << (Value*)RetTy << " \"" << F->getName() << "\"(";
- Method::ArgumentListType &Args = Meth->getArgumentList();
- for (unsigned i = 0; i < Args.size(); ++i) {
+ unsigned i = 0;
+ for (Function::aiterator I = F->abegin(), E = F->aend(); I != E; ++I, ++i) {
if (i != 0) cout << ", ";
- CW << (Value*)Args[i] << "=";
+ CW << *I << "=";
- printValue(Args[i]->getType(), getOperandValue(Args[i], ECStack[FrameNo]));
+ printValue(I->getType(), getOperandValue(I, ECStack[FrameNo]));
}
cout << ")\n";
- CW << *(ECStack[FrameNo].CurInst-(FrameNo != int(ECStack.size()-1)));
+
+ if (FrameNo != int(ECStack.size()-1)) {
+ BasicBlock::iterator I = ECStack[FrameNo].CurInst;
+ CW << --I;
+ } else {
+ CW << *ECStack[FrameNo].CurInst;
+ }
}
projects / oota-llvm.git / blobdiff