-// $Id$
-//***************************************************************************
-// File:
-// TraceValues.cpp
-//
-// Purpose:
-// Support for inserting LLVM code to print values at basic block
-// and method exits. Also exports functions to create a call
-// "printf" instruction with one of the signatures listed below.
-//
-// History:
-// 10/11/01 - Vikram Adve - Created
-//**************************************************************************/
-
+//===- TraceValues.cpp - Value Tracing for debugging -------------*- C++ -*--=//
+//
+// Support for inserting LLVM code to print values at basic block and function
+// exits.
+//
+//===----------------------------------------------------------------------===//
#include "llvm/Transforms/Instrumentation/TraceValues.h"
#include "llvm/GlobalVariable.h"
-#include "llvm/ConstPoolVals.h"
-#include "llvm/Type.h"
+#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
-#include "llvm/Instruction.h"
#include "llvm/iMemory.h"
#include "llvm/iTerminators.h"
#include "llvm/iOther.h"
#include "llvm/BasicBlock.h"
-#include "llvm/Method.h"
+#include "llvm/Function.h"
#include "llvm/Module.h"
-#include "llvm/SymbolTable.h"
+#include "llvm/Pass.h"
#include "llvm/Assembly/Writer.h"
-#include "llvm/Support/HashExtras.h"
-#include <strstream>
-#include <hash_map>
+#include "Support/StringExtras.h"
+#include <sstream>
+using std::vector;
+using std::string;
+
+namespace {
+ class InsertTraceCode : public FunctionPass {
+ bool TraceBasicBlockExits, TraceFunctionExits;
+ Function *PrintfFunc;
+ public:
+ InsertTraceCode(bool traceBasicBlockExits, bool traceFunctionExits)
+ : TraceBasicBlockExits(traceBasicBlockExits),
+ TraceFunctionExits(traceFunctionExits) {}
+
+ const char *getPassName() const { return "Trace Code Insertion"; }
+
+ // Add a prototype for printf if it is not already in the program.
+ //
+ bool doInitialization(Module *M);
+
+ //--------------------------------------------------------------------------
+ // Function InsertCodeToTraceValues
+ //
+ // Inserts tracing code for all live values at basic block and/or function
+ // exits as specified by `traceBasicBlockExits' and `traceFunctionExits'.
+ //
+ static bool doit(Function *M, bool traceBasicBlockExits,
+ bool traceFunctionExits, Function *Printf);
+
+ // runOnFunction - This method does the work.
+ //
+ bool runOnFunction(Function *F) {
+ return doit(F, TraceBasicBlockExits, TraceFunctionExits, PrintfFunc);
+ }
+ virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+ AU.preservesCFG();
+ }
+ };
+} // end anonymous namespace
-//*********************** Internal Data Structures *************************/
-const char* const PRINTF = "printf";
+Pass *createTraceValuesPassForFunction() { // Just trace functions
+ return new InsertTraceCode(false, true);
+}
+Pass *createTraceValuesPassForBasicBlocks() { // Trace BB's and functions
+ return new InsertTraceCode(true, true);
+}
-//************************** Internal Functions ****************************/
-static inline GlobalVariable *
-GetStringRef(Module *M, const string &str)
-{
- static hash_map<string, GlobalVariable*> stringRefCache;
- static Module* lastModule = NULL;
-
- if (lastModule != M)
- { // Let's make sure we create separate global references in each module
- stringRefCache.clear();
- lastModule = M;
- }
-
- GlobalVariable* result = stringRefCache[str];
- if (result == NULL)
- {
- ConstPoolArray *Init = ConstPoolArray::get(str);
- result = new GlobalVariable(Init->getType(), /*Const*/true, Init);
- M->getGlobalList().push_back(result);
- stringRefCache[str] = result;
- }
-
- return result;
+
+// Add a prototype for printf if it is not already in the program.
+//
+bool InsertTraceCode::doInitialization(Module *M) {
+ const Type *SBP = PointerType::get(Type::SByteTy);
+ const FunctionType *MTy =
+ FunctionType::get(Type::IntTy, vector<const Type*>(1, SBP), true);
+
+ PrintfFunc = M->getOrInsertFunction("printf", MTy);
+ return false;
}
-static inline bool
-TraceThisOpCode(unsigned opCode)
-{
- // Explicitly test for opCodes *not* to trace so that any new opcodes will
- // be traced by default (VoidTy's are already excluded)
- //
- return (opCode < Instruction::FirstOtherOp &&
- opCode != Instruction::Alloca &&
- opCode != Instruction::PHINode &&
- opCode != Instruction::Cast);
+static inline GlobalVariable *getStringRef(Module *M, const string &str) {
+ // Create a constant internal string reference...
+ Constant *Init = ConstantArray::get(str);
+
+ // Create the global variable and record it in the module
+ // The GV will be renamed to a unique name if needed.
+ GlobalVariable *GV = new GlobalVariable(Init->getType(), true, true, Init,
+ "trstr");
+ M->getGlobalList().push_back(GV);
+ return GV;
}
+
//
-// Check if this instruction has any uses outside its basic block
+// Check if this instruction has any uses outside its basic block,
+// or if it used by either a Call or Return instruction.
//
-static inline bool
-LiveAtBBExit(Instruction* I)
-{
- BasicBlock* bb = I->getParent();
- bool isLive = false;
+static inline bool LiveAtBBExit(const Instruction* I) {
+ const BasicBlock *BB = I->getParent();
for (Value::use_const_iterator U = I->use_begin(); U != I->use_end(); ++U)
- {
- const Instruction* userI = dyn_cast<Instruction>(*U);
- if (userI == NULL || userI->getParent() != bb)
- isLive = true;
- }
-
- return isLive;
+ if (const Instruction *UI = dyn_cast<Instruction>(*U))
+ if (UI->getParent() != BB || isa<ReturnInst>(UI))
+ return true;
+
+ return false;
}
-static void
-FindValuesToTraceInBB(BasicBlock* bb, vector<Instruction*>& valuesToTraceInBB)
-{
- for (BasicBlock::iterator II = bb->begin(); II != bb->end(); ++II)
- if ((*II)->getOpcode() == Instruction::Store
- || (LiveAtBBExit(*II) &&
- (*II)->getType()->isPrimitiveType() &&
- (*II)->getType() != Type::VoidTy &&
- TraceThisOpCode((*II)->getOpcode())))
- {
- valuesToTraceInBB.push_back(*II);
- }
+static inline bool TraceThisOpCode(unsigned opCode) {
+ // Explicitly test for opCodes *not* to trace so that any new opcodes will
+ // be traced by default (VoidTy's are already excluded)
+ //
+ return (opCode < Instruction::FirstOtherOp &&
+ opCode != Instruction::Alloca &&
+ opCode != Instruction::PHINode &&
+ opCode != Instruction::Cast);
}
-//
-// Let's save this code for future use; it has been tested and works:
-//
-// The signatures of the printf methods supported are:
-// int printf(ubyte*, ubyte*, ubyte*, ubyte*, int intValue)
-// int printf(ubyte*, ubyte*, ubyte*, ubyte*, unsigned uintValue)
-// int printf(ubyte*, ubyte*, ubyte*, ubyte*, float floatValue)
-// int printf(ubyte*, ubyte*, ubyte*, ubyte*, double doubleValue)
-// int printf(ubyte*, ubyte*, ubyte*, ubyte*, char* stringValue)
-// int printf(ubyte*, ubyte*, ubyte*, ubyte*, void* ptrValue)
-//
-// The invocation should be:
-// call "printf"(fmt, bbName, valueName, valueTypeName, value).
-//
-Method*
-GetPrintfMethodForType(Module* module, const Type* valueType)
-{
- static const int LASTARGINDEX = 4;
- static PointerType* ubytePtrTy = NULL;
- static vector<const Type*> argTypesVec(LASTARGINDEX + 1);
-
- if (ubytePtrTy == NULL)
- { // create these once since they are invariant
- ubytePtrTy = PointerType::get(ArrayType::get(Type::UByteTy));
- argTypesVec[0] = ubytePtrTy;
- argTypesVec[1] = ubytePtrTy;
- argTypesVec[2] = ubytePtrTy;
- argTypesVec[3] = ubytePtrTy;
- }
-
- SymbolTable* symtab = module->getSymbolTable();
- argTypesVec[LASTARGINDEX] = valueType;
- MethodType* printMethodTy = MethodType::get(Type::IntTy, argTypesVec,
- /*isVarArg*/ false);
-
- Method* printMethod =
- cast<Method>(symtab->lookup(PointerType::get(printMethodTy), PRINTF));
- if (printMethod == NULL)
- { // Create a new method and add it to the module
- printMethod = new Method(printMethodTy, PRINTF);
- module->getMethodList().push_back(printMethod);
-
- // Create the argument list for the method so that the full signature
- // can be declared. The args can be anonymous.
- Method::ArgumentListType &argList = printMethod->getArgumentList();
- for (unsigned i=0; i < argTypesVec.size(); ++i)
- argList.push_back(new MethodArgument(argTypesVec[i]));
- }
-
- return printMethod;
+static bool ShouldTraceValue(const Instruction *I) {
+ return
+ I->getType() != Type::VoidTy && LiveAtBBExit(I) &&
+ TraceThisOpCode(I->getOpcode());
}
-
-Instruction*
-CreatePrintfInstr(Value* val,
- const BasicBlock* bb,
- Module* module,
- unsigned int indent,
- bool isMethodExit)
-{
- strstream fmtString, scopeNameString, valNameString;
- vector<Value*> paramList;
- const Type* valueType = val->getType();
- Method* printMethod = GetPrintfMethodForType(module, valueType);
-
- if (! valueType->isPrimitiveType() ||
- valueType->getPrimitiveID() == Type::VoidTyID ||
- valueType->getPrimitiveID() == Type::TypeTyID ||
- valueType->getPrimitiveID() == Type::LabelTyID)
- {
- assert(0 && "Unsupported type for printing");
- return NULL;
- }
-
- const Value* scopeToUse = (isMethodExit)? (const Value*) bb->getParent()
- : (const Value*) bb;
- if (scopeToUse->hasName())
- scopeNameString << scopeToUse->getName() << ends;
- else
- scopeNameString << scopeToUse << ends;
-
- if (val->hasName())
- valNameString << val->getName() << ends;
- else
- valNameString << val << ends;
+static string getPrintfCodeFor(const Value *V) {
+ if (V == 0) return "";
+ if (V->getType()->isFloatingPoint())
+ return "%g";
+ else if (V->getType() == Type::LabelTy || isa<PointerType>(V->getType()))
+ return "0x%p";
+ else if (V->getType()->isIntegral() || V->getType() == Type::BoolTy)
+ return "%d";
- for (unsigned i=0; i < indent; i++)
- fmtString << " ";
-
- fmtString << " At exit of "
- << ((isMethodExit)? "Method " : "BB ")
- << "%s : val %s = %s ";
-
- GlobalVariable* scopeNameVal = GetStringRef(module, scopeNameString.str());
- GlobalVariable* valNameVal = GetStringRef(module,valNameString.str());
- GlobalVariable* typeNameVal = GetStringRef(module,
- val->getType()->getDescription().c_str());
-
- switch(valueType->getPrimitiveID())
- {
- case Type::BoolTyID:
- case Type::UByteTyID: case Type::UShortTyID:
- case Type::UIntTyID: case Type::ULongTyID:
- case Type::SByteTyID: case Type::ShortTyID:
- case Type::IntTyID: case Type::LongTyID:
- fmtString << " %d\0A";
- break;
-
- case Type::FloatTyID: case Type::DoubleTyID:
- fmtString << " %g\0A";
- break;
-
- case Type::PointerTyID:
- fmtString << " %p\0A";
- break;
-
- default:
- assert(0 && "Should not get here. Check the IF expression above");
- return NULL;
- }
-
- fmtString << ends;
- GlobalVariable* fmtVal = GetStringRef(module, fmtString.str());
-
- paramList.push_back(fmtVal);
- paramList.push_back(scopeNameVal);
- paramList.push_back(valNameVal);
- paramList.push_back(typeNameVal);
- paramList.push_back(val);
-
- free(fmtString.str());
- free(scopeNameString.str());
- free(valNameString.str());
-
- return new CallInst(printMethod, paramList);
+ assert(0 && "Illegal value to print out...");
+ return "";
}
+static void InsertPrintInst(Value *V, BasicBlock *BB, BasicBlock::iterator &BBI,
+ string Message, Function *Printf) {
+ // Escape Message by replacing all % characters with %% chars.
+ unsigned Offset = 0;
+ while ((Offset = Message.find('%', Offset)) != string::npos) {
+ Message.replace(Offset, 1, "%%");
+ Offset += 2; // Skip over the new %'s
+ }
-// The invocation should be:
-// call "printVal"(value).
-//
-static Value *GetPrintMethodForType(Module *Mod, const Type *VTy) {
- MethodType *MTy = MethodType::get(Type::VoidTy, vector<const Type*>(1, VTy),
- /*isVarArg*/ false);
-
- SymbolTable *ST = Mod->getSymbolTableSure();
- if (Value *V = ST->lookup(PointerType::get(MTy), "printVal"))
- return V;
-
- // Create a new method and add it to the module
- Method *M = new Method(MTy, "printVal");
- Mod->getMethodList().push_back(M);
- return M;
-}
+ Module *Mod = BB->getParent()->getParent();
-
-static void
-InsertPrintInsts(Value *Val,
- BasicBlock* BB,
- BasicBlock::iterator &BBI,
- Module *Mod,
- unsigned int indent,
- bool isMethodExit)
-{
- const Type* ValTy = Val->getType();
-
- assert(ValTy->isPrimitiveType() &&
- ValTy->getPrimitiveID() != Type::VoidTyID &&
- ValTy->getPrimitiveID() != Type::TypeTyID &&
- ValTy->getPrimitiveID() != Type::LabelTyID &&
- "Unsupported type for printing");
-
- const Value* scopeToUse =
- isMethodExit ? (const Value*)BB->getParent() : (const Value*)BB;
-
- // Create the marker string...
- strstream scopeNameString;
- WriteAsOperand(scopeNameString, scopeToUse) << " : ";
- WriteAsOperand(scopeNameString, Val) << " = " << ends;
- string fmtString(indent, ' ');
-
- fmtString += string(" At exit of") + scopeNameString.str();
- free(scopeNameString.str());
-
// Turn the marker string into a global variable...
- GlobalVariable *fmtVal = GetStringRef(Mod, fmtString);
+ GlobalVariable *fmtVal = getStringRef(Mod, Message+getPrintfCodeFor(V)+"\n");
+
+ // Turn the format string into an sbyte *
+ Instruction *GEP =
+ new GetElementPtrInst(fmtVal,
+ vector<Value*>(2,ConstantUInt::get(Type::UIntTy, 0)),
+ "trstr");
+ BBI = BB->getInstList().insert(BBI, GEP)+1;
// Insert the first print instruction to print the string flag:
- Instruction *I = new CallInst(GetPrintMethodForType(Mod, fmtVal->getType()),
- vector<Value*>(1, fmtVal));
- BBI = BB->getInstList().insert(BBI, I)+1;
-
- // Insert the next print instruction to print the value:
- I = new CallInst(GetPrintMethodForType(Mod, ValTy),
- vector<Value*>(1, Val));
- BBI = BB->getInstList().insert(BBI, I)+1;
-
- // Print out a newline
- fmtVal = GetStringRef(Mod, "\n");
- I = new CallInst(GetPrintMethodForType(Mod, fmtVal->getType()),
- vector<Value*>(1, fmtVal));
+ vector<Value*> PrintArgs;
+ PrintArgs.push_back(GEP);
+ if (V) PrintArgs.push_back(V);
+ Instruction *I = new CallInst(Printf, PrintArgs, "trace");
BBI = BB->getInstList().insert(BBI, I)+1;
}
-
-
-static LoadInst*
-InsertLoadInst(StoreInst* storeInst,
- BasicBlock *bb,
- BasicBlock::iterator &BBI)
-{
- LoadInst* loadInst = new LoadInst(storeInst->getPtrOperand(),
- storeInst->getIndexVec());
- BBI = bb->getInstList().insert(BBI, loadInst) + 1;
- return loadInst;
+
+
+static void InsertVerbosePrintInst(Value *V, BasicBlock *BB,
+ BasicBlock::iterator &BBI,
+ const string &Message, Function *Printf) {
+ std::ostringstream OutStr;
+ if (V) WriteAsOperand(OutStr, V);
+ InsertPrintInst(V, BB, BBI, Message+OutStr.str()+" = ", Printf);
}
-//
// Insert print instructions at the end of the basic block *bb
// for each value in valueVec[] that is live at the end of that basic block,
// or that is stored to memory in this basic block.
// If the value is stored to memory, we load it back before printing
-// We also return all such loaded values in the vector valuesStoredInMethod
-// for printing at the exit from the method. (Note that in each invocation
-// of the method, this will only get the last value stored for each static
+// We also return all such loaded values in the vector valuesStoredInFunction
+// for printing at the exit from the function. (Note that in each invocation
+// of the function, this will only get the last value stored for each static
// store instruction).
// *bb must be the block in which the value is computed;
// this is not checked here.
//
-static void
-TraceValuesAtBBExit(const vector<Instruction*>& valueVec,
- BasicBlock* bb,
- Module* module,
- unsigned int indent,
- bool isMethodExit,
- vector<Instruction*>* valuesStoredInMethod)
-{
- // Get an iterator to point to the insertion location
+static void TraceValuesAtBBExit(BasicBlock *BB, Function *Printf,
+ vector<Instruction*> *valuesStoredInFunction) {
+ // Get an iterator to point to the insertion location, which is
+ // just before the terminator instruction.
//
- BasicBlock::InstListType& instList = bb->getInstList();
- BasicBlock::iterator here = instList.end()-1;
- assert((*here)->isTerminator());
+ BasicBlock::iterator InsertPos = BB->end()-1;
+ assert((*InsertPos)->isTerminator());
- // Insert a print instruction for each value.
+ // If the terminator is a conditional branch, insert the trace code just
+ // before the instruction that computes the branch condition (just to
+ // avoid putting a call between the CC-setting instruction and the branch).
+ // Use laterInstrSet to mark instructions that come after the setCC instr
+ // because those cannot be traced at the location we choose.
//
- for (unsigned i=0, N=valueVec.size(); i < N; i++)
- {
- Instruction* I = valueVec[i];
- if (I->getOpcode() == Instruction::Store)
- {
- assert(valuesStoredInMethod != NULL &&
- "Should not be printing a store instruction at method exit");
- I = InsertLoadInst((StoreInst*) I, bb, here);
- valuesStoredInMethod->push_back(I);
+ Instruction *SetCC = 0;
+ if (BranchInst *Branch = dyn_cast<BranchInst>(BB->getTerminator()))
+ if (!Branch->isUnconditional())
+ if (Instruction *I = dyn_cast<Instruction>(Branch->getCondition()))
+ if (I->getParent() == BB) {
+ SetCC = I;
+ while (*InsertPos != SetCC)
+ --InsertPos; // Back up until we can insert before the setcc
}
- InsertPrintInsts(I, bb, here, module, indent, isMethodExit);
- }
-}
-
+ // Copy all of the instructions into a vector to avoid problems with Setcc
+ const vector<Instruction*> Insts(BB->begin(), InsertPos);
-static Instruction*
-CreateMethodTraceInst(
- Method* method,
- unsigned int indent,
- const string& msg)
-{
- string fmtString(indent, ' ');
- strstream methodNameString;
- WriteAsOperand(methodNameString, method) << ends;
- fmtString += msg + string(" METHOD ") + methodNameString.str();
- free(methodNameString.str());
-
- GlobalVariable *fmtVal = GetStringRef(method->getParent(), fmtString);
- Instruction *printInst =
- new CallInst(GetPrintMethodForType(method->getParent(), fmtVal->getType()),
- vector<Value*>(1, fmtVal));
+ std::ostringstream OutStr;
+ WriteAsOperand(OutStr, BB, false);
+ InsertPrintInst(0, BB, InsertPos, "LEAVING BB:" + OutStr.str(), Printf);
- return printInst;
+ // Insert a print instruction for each value.
+ //
+ for (vector<Instruction*>::const_iterator II = Insts.begin(),
+ IE = Insts.end(); II != IE; ++II) {
+ Instruction *I = *II;
+ if (StoreInst *SI = dyn_cast<StoreInst>(I)) {
+ assert(valuesStoredInFunction &&
+ "Should not be printing a store instruction at function exit");
+ LoadInst *LI = new LoadInst(SI->getPointerOperand(), SI->copyIndices(),
+ "reload");
+ InsertPos = BB->getInstList().insert(InsertPos, LI) + 1;
+ valuesStoredInFunction->push_back(LI);
+ }
+ if (ShouldTraceValue(I))
+ InsertVerbosePrintInst(I, BB, InsertPos, " ", Printf);
+ }
}
-
-static inline void
-InsertCodeToShowMethodEntry(Method* method,
- BasicBlock* entryBB,
- unsigned int indent)
-{
+static inline void InsertCodeToShowFunctionEntry(Function *M, Function *Printf){
// Get an iterator to point to the insertion location
- BasicBlock::InstListType& instList = entryBB->getInstList();
- BasicBlock::iterator here = instList.begin();
-
- Instruction *printInst = CreateMethodTraceInst(method, indent, "ENTERING");
-
- here = entryBB->getInstList().insert(here, printInst) + 1;
+ BasicBlock *BB = M->getEntryNode();
+ BasicBlock::iterator BBI = BB->begin();
+
+ std::ostringstream OutStr;
+ WriteAsOperand(OutStr, M, true);
+ InsertPrintInst(0, BB, BBI, "ENTERING FUNCTION: " + OutStr.str(), Printf);
+
+ // Now print all the incoming arguments
+ const Function::ArgumentListType &argList = M->getArgumentList();
+ unsigned ArgNo = 0;
+ for (Function::ArgumentListType::const_iterator
+ I = argList.begin(), E = argList.end(); I != E; ++I, ++ArgNo) {
+ InsertVerbosePrintInst((Value*)*I, BB, BBI,
+ " Arg #" + utostr(ArgNo), Printf);
+ }
}
-static inline void
-InsertCodeToShowMethodExit(Method* method,
- BasicBlock* exitBB,
- unsigned int indent)
-{
+static inline void InsertCodeToShowFunctionExit(BasicBlock *BB,
+ Function *Printf) {
// Get an iterator to point to the insertion location
- BasicBlock::InstListType& instList = exitBB->getInstList();
- BasicBlock::iterator here = instList.end()-1;
- assert((*here)->isTerminator());
+ BasicBlock::iterator BBI = BB->end()-1;
+ ReturnInst *Ret = cast<ReturnInst>(*BBI);
- Instruction *printInst = CreateMethodTraceInst(method, indent, "LEAVING ");
+ std::ostringstream OutStr;
+ WriteAsOperand(OutStr, BB->getParent(), true);
+ InsertPrintInst(0, BB, BBI, "LEAVING FUNCTION: " + OutStr.str(), Printf);
- here = exitBB->getInstList().insert(here, printInst) + 1;
+ // print the return value, if any
+ if (BB->getParent()->getReturnType() != Type::VoidTy)
+ InsertPrintInst(Ret->getReturnValue(), BB, BBI, " Returning: ", Printf);
}
-//************************** External Functions ****************************/
-
-
-bool
-InsertTraceCode::doInsertTraceCode(Method *M,
- bool traceBasicBlockExits,
- bool traceMethodExits)
-{
- vector<Instruction*> valuesStoredInMethod;
- Module* module = M->getParent();
- vector<BasicBlock*> exitBlocks;
-
- if (M->isExternal() ||
- (! traceBasicBlockExits && ! traceMethodExits))
+bool InsertTraceCode::doit(Function *M, bool traceBasicBlockExits,
+ bool traceFunctionEvents, Function *Printf) {
+ if (!traceBasicBlockExits && !traceFunctionEvents)
return false;
- if (traceMethodExits)
- InsertCodeToShowMethodEntry(M, M->getEntryNode(), /*indent*/ 0);
+ vector<Instruction*> valuesStoredInFunction;
+ vector<BasicBlock*> exitBlocks;
+
+ if (traceFunctionEvents)
+ InsertCodeToShowFunctionEntry(M, Printf);
- for (Method::iterator BI = M->begin(); BI != M->end(); ++BI)
- {
- BasicBlock* bb = *BI;
- bool isExitBlock = false;
- vector<Instruction*> valuesToTraceInBB;
-
- FindValuesToTraceInBB(bb, valuesToTraceInBB);
-
- if (bb->succ_begin() == bb->succ_end())
- { // record this as an exit block
- exitBlocks.push_back(bb);
- isExitBlock = true;
- }
-
- if (traceBasicBlockExits)
- TraceValuesAtBBExit(valuesToTraceInBB, bb, module,
- /*indent*/ 4, /*isMethodExit*/ false,
- &valuesStoredInMethod);
+ for (Function::iterator BI = M->begin(); BI != M->end(); ++BI) {
+ BasicBlock *BB = *BI;
+ if (isa<ReturnInst>(BB->getTerminator()))
+ exitBlocks.push_back(BB); // record this as an exit block
+
+ if (traceBasicBlockExits)
+ TraceValuesAtBBExit(BB, Printf, &valuesStoredInFunction);
+ }
+
+ if (traceFunctionEvents)
+ for (unsigned i=0; i < exitBlocks.size(); ++i) {
+#if 0
+ TraceValuesAtBBExit(valuesStoredInFunction, exitBlocks[i], module,
+ /*indent*/ 0, /*isFunctionExit*/ true,
+ /*valuesStoredInFunction*/ NULL);
+#endif
+ InsertCodeToShowFunctionExit(exitBlocks[i], Printf);
}
- if (traceMethodExits)
- for (unsigned i=0; i < exitBlocks.size(); ++i)
- {
- TraceValuesAtBBExit(valuesStoredInMethod, exitBlocks[i], module,
- /*indent*/ 0, /*isMethodExit*/ true,
- /*valuesStoredInMethod*/ NULL);
- InsertCodeToShowMethodExit(M, exitBlocks[i], /*indent*/ 0);
- }
-
return true;
}