mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-20 09:24:58 +00:00
Method.h no longer includes BasicBlock.h
Method::inst_* is now in llvm/Support/InstIterator.h GraphTraits specializations for BasicBlock and Methods are now in llvm/Support/CFG.h git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1746 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
3c34a46c7e
commit
221d688a5e
@ -16,6 +16,7 @@
|
|||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
#include "llvm/iOther.h"
|
#include "llvm/iOther.h"
|
||||||
#include "llvm/iTerminators.h"
|
#include "llvm/iTerminators.h"
|
||||||
|
#include "llvm/Support/InstIterator.h"// FIXME: CallGraph should use method uses
|
||||||
#include "Support/STLExtras.h"
|
#include "Support/STLExtras.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
@ -46,8 +47,7 @@ void cfg::CallGraph::addToCallGraph(Method *M) {
|
|||||||
if (!M->hasInternalLinkage())
|
if (!M->hasInternalLinkage())
|
||||||
Root->addCalledMethod(Node);
|
Root->addCalledMethod(Node);
|
||||||
|
|
||||||
for (Method::inst_iterator I = M->inst_begin(), E = M->inst_end();
|
for (inst_iterator I = inst_begin(M), E = inst_end(M); I != E; ++I) {
|
||||||
I != E; ++I) {
|
|
||||||
// Dynamic calls will cause Null nodes to be created
|
// Dynamic calls will cause Null nodes to be created
|
||||||
if (CallInst *CI = dyn_cast<CallInst>(*I))
|
if (CallInst *CI = dyn_cast<CallInst>(*I))
|
||||||
Node->addCalledMethod(getNodeFor(CI->getCalledMethod()));
|
Node->addCalledMethod(getNodeFor(CI->getCalledMethod()));
|
||||||
@ -138,8 +138,7 @@ bool IsLeafMethod(const Method* M, const cfg::CallGraph* CG) {
|
|||||||
return (cgn->begin() == cgn->end());
|
return (cgn->begin() == cgn->end());
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Method::const_inst_iterator I = M->inst_begin(), E = M->inst_end();
|
for (const_inst_iterator I = inst_begin(M), E = inst_end(M); I != E; ++I)
|
||||||
I != E; ++I)
|
|
||||||
if ((*I)->getOpcode() == Instruction::Call)
|
if ((*I)->getOpcode() == Instruction::Call)
|
||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include "llvm/Instruction.h"
|
#include "llvm/Instruction.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
|
#include "llvm/Support/InstIterator.h"
|
||||||
#include "Support/CommandLine.h"
|
#include "Support/CommandLine.h"
|
||||||
|
|
||||||
AnalysisID FindUnsafePointerTypes::ID(AnalysisID::create<FindUnsafePointerTypes>());
|
AnalysisID FindUnsafePointerTypes::ID(AnalysisID::create<FindUnsafePointerTypes>());
|
||||||
@ -58,8 +59,7 @@ bool FindUnsafePointerTypes::run(Module *Mod) {
|
|||||||
for (Module::iterator MI = Mod->begin(), ME = Mod->end();
|
for (Module::iterator MI = Mod->begin(), ME = Mod->end();
|
||||||
MI != ME; ++MI) {
|
MI != ME; ++MI) {
|
||||||
const Method *M = *MI; // We don't need/want write access
|
const Method *M = *MI; // We don't need/want write access
|
||||||
for (Method::const_inst_iterator I = M->inst_begin(), E = M->inst_end();
|
for (const_inst_iterator I = inst_begin(M), E = inst_end(M); I != E; ++I) {
|
||||||
I != E; ++I) {
|
|
||||||
const Instruction *Inst = *I;
|
const Instruction *Inst = *I;
|
||||||
const Type *ITy = Inst->getType();
|
const Type *ITy = Inst->getType();
|
||||||
if (ITy->isPointerType() && !UnsafeTypes.count((PointerType*)ITy))
|
if (ITy->isPointerType() && !UnsafeTypes.count((PointerType*)ITy))
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include "llvm/DerivedTypes.h"
|
#include "llvm/DerivedTypes.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/Support/InstIterator.h"
|
||||||
|
|
||||||
AnalysisID FindUsedTypes::ID(AnalysisID::create<FindUsedTypes>());
|
AnalysisID FindUsedTypes::ID(AnalysisID::create<FindUsedTypes>());
|
||||||
AnalysisID FindUsedTypes::IncludeSymbolTableID(AnalysisID::create<FindUsedTypes>());
|
AnalysisID FindUsedTypes::IncludeSymbolTableID(AnalysisID::create<FindUsedTypes>());
|
||||||
@ -59,7 +60,7 @@ bool FindUsedTypes::run(Module *m) {
|
|||||||
// Loop over all of the instructions in the method, adding their return type
|
// Loop over all of the instructions in the method, adding their return type
|
||||||
// as well as the types of their operands.
|
// as well as the types of their operands.
|
||||||
//
|
//
|
||||||
for (Method::const_inst_iterator II = M->inst_begin(), IE = M->inst_end();
|
for (const_inst_iterator II = inst_begin(M), IE = inst_end(M);
|
||||||
II != IE; ++II) {
|
II != IE; ++II) {
|
||||||
const Instruction *I = *II;
|
const Instruction *I = *II;
|
||||||
const Type *Ty = I->getType();
|
const Type *Ty = I->getType();
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include "BBLiveVar.h"
|
#include "BBLiveVar.h"
|
||||||
#include "llvm/CodeGen/MachineInstr.h"
|
#include "llvm/CodeGen/MachineInstr.h"
|
||||||
#include "llvm/BasicBlock.h"
|
#include "llvm/BasicBlock.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/PostOrderIterator.h"
|
#include "Support/PostOrderIterator.h"
|
||||||
#include "Support/SetOperations.h"
|
#include "Support/SetOperations.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
#include "llvm/Analysis/LoopInfo.h"
|
#include "llvm/Analysis/LoopInfo.h"
|
||||||
#include "llvm/Analysis/Dominators.h"
|
#include "llvm/Analysis/Dominators.h"
|
||||||
#include "llvm/BasicBlock.h"
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/DepthFirstIterator.h"
|
#include "Support/DepthFirstIterator.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include "llvm/Analysis/Dominators.h"
|
#include "llvm/Analysis/Dominators.h"
|
||||||
#include "llvm/Transforms/UnifyMethodExitNodes.h"
|
#include "llvm/Transforms/UnifyMethodExitNodes.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/DepthFirstIterator.h"
|
#include "Support/DepthFirstIterator.h"
|
||||||
#include "Support/STLExtras.h"
|
#include "Support/STLExtras.h"
|
||||||
#include "Support/SetOperations.h"
|
#include "Support/SetOperations.h"
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include "llvm/Bytecode/Primitives.h"
|
#include "llvm/Bytecode/Primitives.h"
|
||||||
#include "llvm/SymTabValue.h"
|
#include "llvm/SymTabValue.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/Instruction.h"
|
#include "llvm/Instruction.h"
|
||||||
#include "llvm/DerivedTypes.h"
|
#include "llvm/DerivedTypes.h"
|
||||||
#include <map>
|
#include <map>
|
||||||
|
@ -171,7 +171,7 @@ void SlotCalculator::incorporateMethod(const Method *M) {
|
|||||||
SC_DEBUG("Inserting Instructions:\n");
|
SC_DEBUG("Inserting Instructions:\n");
|
||||||
|
|
||||||
// Add all of the instructions to the type planes...
|
// Add all of the instructions to the type planes...
|
||||||
for_each(M->inst_begin(), M->inst_end(),
|
for_each(inst_begin(M), inst_end(M),
|
||||||
bind_obj(this, &SlotCalculator::insertValue));
|
bind_obj(this, &SlotCalculator::insertValue));
|
||||||
|
|
||||||
if (M->hasSymbolTable() && !IgnoreNamedNodes) {
|
if (M->hasSymbolTable() && !IgnoreNamedNodes) {
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
|
|
||||||
#include "SchedPriorities.h"
|
#include "SchedPriorities.h"
|
||||||
#include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
|
#include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/PostOrderIterator.h"
|
#include "Support/PostOrderIterator.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using std::cerr;
|
using std::cerr;
|
||||||
|
@ -189,15 +189,18 @@ LabelNode::dumpNode(int indent) const
|
|||||||
|
|
||||||
InstrForest::InstrForest(Method *M)
|
InstrForest::InstrForest(Method *M)
|
||||||
{
|
{
|
||||||
for (Method::inst_iterator I = M->inst_begin(); I != M->inst_end(); ++I)
|
for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
|
||||||
this->buildTreeForInstruction(*I);
|
BasicBlock *BB = *MI;
|
||||||
|
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
|
||||||
|
buildTreeForInstruction(*I);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
InstrForest::~InstrForest()
|
InstrForest::~InstrForest()
|
||||||
{
|
{
|
||||||
for (std::hash_map<const Instruction*,InstructionNode*>::iterator I = begin();
|
for (std::hash_map<const Instruction*,InstructionNode*>::iterator I = begin();
|
||||||
I != end(); ++I)
|
I != end(); ++I)
|
||||||
delete (*I).second;
|
delete I->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "llvm/Target/MachineFrameInfo.h"
|
#include "llvm/Target/MachineFrameInfo.h"
|
||||||
#include "llvm/Target/MachineCacheInfo.h"
|
#include "llvm/Target/MachineCacheInfo.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/iOther.h"
|
#include "llvm/iOther.h"
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
@ -56,11 +57,11 @@ ComputeMaxOptionalArgsSize(const TargetMachine& target, const Method* method)
|
|||||||
|
|
||||||
unsigned int maxSize = 0;
|
unsigned int maxSize = 0;
|
||||||
|
|
||||||
for (Method::const_inst_iterator I=method->inst_begin(),E=method->inst_end();
|
for (Method::const_iterator MI=method->begin(), ME=method->end();
|
||||||
I != E; ++I)
|
MI != ME; ++MI) {
|
||||||
if ((*I)->getOpcode() == Instruction::Call)
|
const BasicBlock *BB = *MI;
|
||||||
{
|
for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I != E; ++I)
|
||||||
CallInst* callInst = cast<CallInst>(*I);
|
if (CallInst *callInst = dyn_cast<CallInst>(*I)) {
|
||||||
unsigned int numOperands = callInst->getNumOperands() - 1;
|
unsigned int numOperands = callInst->getNumOperands() - 1;
|
||||||
int numExtra = (int) numOperands - frameInfo.getNumFixedOutgoingArgs();
|
int numExtra = (int) numOperands - frameInfo.getNumFixedOutgoingArgs();
|
||||||
if (numExtra <= 0)
|
if (numExtra <= 0)
|
||||||
@ -84,7 +85,7 @@ ComputeMaxOptionalArgsSize(const TargetMachine& target, const Method* method)
|
|||||||
if (maxSize < sizeForThisCall)
|
if (maxSize < sizeForThisCall)
|
||||||
maxSize = sizeForThisCall;
|
maxSize = sizeForThisCall;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return maxSize;
|
return maxSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "llvm/CodeGen/MachineInstr.h"
|
#include "llvm/CodeGen/MachineInstr.h"
|
||||||
#include "llvm/Target/TargetMachine.h"
|
#include "llvm/Target/TargetMachine.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "Support/SetOperations.h"
|
#include "Support/SetOperations.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using std::cerr;
|
using std::cerr;
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#include "llvm/Analysis/LoopInfo.h"
|
#include "llvm/Analysis/LoopInfo.h"
|
||||||
#include "llvm/Target/TargetMachine.h"
|
#include "llvm/Target/TargetMachine.h"
|
||||||
#include "llvm/Target/MachineFrameInfo.h"
|
#include "llvm/Target/MachineFrameInfo.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
#include "llvm/Type.h"
|
#include "llvm/Type.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -1034,10 +1034,12 @@ MethodInfo::MethodInfo(Method *M) : Annotation(MethodInfoAID) {
|
|||||||
|
|
||||||
// Iterate over all of the instructions...
|
// Iterate over all of the instructions...
|
||||||
unsigned InstNum = 0;
|
unsigned InstNum = 0;
|
||||||
for (Method::inst_iterator MI = M->inst_begin(), ME = M->inst_end();
|
for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
|
||||||
MI != ME; ++MI) {
|
BasicBlock *BB = *MI;
|
||||||
Instruction *I = *MI; // For each instruction...
|
for (BasicBlock::iterator II = BB->begin(), IE = BB->end(); II != IE; ++II){
|
||||||
I->addAnnotation(new InstNumber(++InstNum, getValueSlot(I))); // Add Annote
|
Instruction *I = *II; // For each instruction... Add Annote
|
||||||
|
I->addAnnotation(new InstNumber(++InstNum, getValueSlot(I)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "Support/DataTypes.h"
|
#include "Support/DataTypes.h"
|
||||||
#include "llvm/Assembly/CachedWriter.h"
|
#include "llvm/Assembly/CachedWriter.h"
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "llvm/Transforms/Linker.h"
|
#include "llvm/Transforms/Linker.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/GlobalVariable.h"
|
#include "llvm/GlobalVariable.h"
|
||||||
#include "llvm/SymbolTable.h"
|
#include "llvm/SymbolTable.h"
|
||||||
#include "llvm/DerivedTypes.h"
|
#include "llvm/DerivedTypes.h"
|
||||||
@ -337,13 +338,16 @@ static bool LinkMethodBody(Method *Dest, const Method *Src,
|
|||||||
// in the Source method as operands. Loop through all of the operands of the
|
// in the Source method as operands. Loop through all of the operands of the
|
||||||
// methods and patch them up to point to the local versions...
|
// methods and patch them up to point to the local versions...
|
||||||
//
|
//
|
||||||
for (Method::inst_iterator I = Dest->inst_begin(), E = Dest->inst_end();
|
for (Method::iterator BI = Dest->begin(), BE = Dest->end();
|
||||||
I != E; ++I) {
|
BI != BE; ++BI) {
|
||||||
Instruction *Inst = *I;
|
BasicBlock *BB = *BI;
|
||||||
|
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
|
||||||
for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end();
|
Instruction *Inst = *I;
|
||||||
OI != OE; ++OI)
|
|
||||||
*OI = RemapOperand(*OI, LocalMap, &GlobalMap);
|
for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end();
|
||||||
|
OI != OE; ++OI)
|
||||||
|
*OI = RemapOperand(*OI, LocalMap, &GlobalMap);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
|
|
||||||
#include "SchedPriorities.h"
|
#include "SchedPriorities.h"
|
||||||
#include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
|
#include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/PostOrderIterator.h"
|
#include "Support/PostOrderIterator.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using std::cerr;
|
using std::cerr;
|
||||||
|
@ -189,15 +189,18 @@ LabelNode::dumpNode(int indent) const
|
|||||||
|
|
||||||
InstrForest::InstrForest(Method *M)
|
InstrForest::InstrForest(Method *M)
|
||||||
{
|
{
|
||||||
for (Method::inst_iterator I = M->inst_begin(); I != M->inst_end(); ++I)
|
for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
|
||||||
this->buildTreeForInstruction(*I);
|
BasicBlock *BB = *MI;
|
||||||
|
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
|
||||||
|
buildTreeForInstruction(*I);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
InstrForest::~InstrForest()
|
InstrForest::~InstrForest()
|
||||||
{
|
{
|
||||||
for (std::hash_map<const Instruction*,InstructionNode*>::iterator I = begin();
|
for (std::hash_map<const Instruction*,InstructionNode*>::iterator I = begin();
|
||||||
I != end(); ++I)
|
I != end(); ++I)
|
||||||
delete (*I).second;
|
delete I->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include "BBLiveVar.h"
|
#include "BBLiveVar.h"
|
||||||
#include "llvm/CodeGen/MachineInstr.h"
|
#include "llvm/CodeGen/MachineInstr.h"
|
||||||
#include "llvm/BasicBlock.h"
|
#include "llvm/BasicBlock.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/PostOrderIterator.h"
|
#include "Support/PostOrderIterator.h"
|
||||||
#include "Support/SetOperations.h"
|
#include "Support/SetOperations.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "llvm/CodeGen/MachineInstr.h"
|
#include "llvm/CodeGen/MachineInstr.h"
|
||||||
#include "llvm/Target/TargetMachine.h"
|
#include "llvm/Target/TargetMachine.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "Support/SetOperations.h"
|
#include "Support/SetOperations.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using std::cerr;
|
using std::cerr;
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#include "llvm/Analysis/LoopInfo.h"
|
#include "llvm/Analysis/LoopInfo.h"
|
||||||
#include "llvm/Target/TargetMachine.h"
|
#include "llvm/Target/TargetMachine.h"
|
||||||
#include "llvm/Target/MachineFrameInfo.h"
|
#include "llvm/Target/MachineFrameInfo.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
#include "llvm/Type.h"
|
#include "llvm/Type.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#include "llvm/CodeGen/RegisterAllocation.h"
|
#include "llvm/CodeGen/RegisterAllocation.h"
|
||||||
#include "llvm/CodeGen/MachineInstr.h"
|
#include "llvm/CodeGen/MachineInstr.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/PassManager.h"
|
#include "llvm/PassManager.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using std::cerr;
|
using std::cerr;
|
||||||
@ -229,7 +230,11 @@ struct FreeMachineCodeForMethod : public MethodPass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool runOnMethod(Method *M) {
|
bool runOnMethod(Method *M) {
|
||||||
for_each(M->inst_begin(), M->inst_end(), freeMachineCode);
|
for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI)
|
||||||
|
for (BasicBlock::iterator I = (*MI)->begin(), E = (*MI)->end();
|
||||||
|
I != E; ++I)
|
||||||
|
freeMachineCode(*I);
|
||||||
|
|
||||||
// Don't destruct MachineCodeForMethod - The global printer needs it
|
// Don't destruct MachineCodeForMethod - The global printer needs it
|
||||||
//MachineCodeForMethod::destruct(M);
|
//MachineCodeForMethod::destruct(M);
|
||||||
return false;
|
return false;
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
#include "llvm/Analysis/Writer.h"
|
#include "llvm/Analysis/Writer.h"
|
||||||
#include "llvm/iTerminators.h"
|
#include "llvm/iTerminators.h"
|
||||||
#include "llvm/iPHINode.h"
|
#include "llvm/iPHINode.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/STLExtras.h"
|
#include "Support/STLExtras.h"
|
||||||
#include "Support/DepthFirstIterator.h"
|
#include "Support/DepthFirstIterator.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
@ -156,10 +157,12 @@ bool ADCE::doADCE(cfg::DominanceFrontier &CDG) {
|
|||||||
|
|
||||||
#ifdef DEBUG_ADCE
|
#ifdef DEBUG_ADCE
|
||||||
cerr << "Current Method: X = Live\n";
|
cerr << "Current Method: X = Live\n";
|
||||||
for (Method::inst_iterator IL = M->inst_begin(); IL != M->inst_end(); ++IL) {
|
for (Method::iterator I = M->begin(), E = M->end(); I != E; ++I)
|
||||||
if (LiveSet.count(*IL)) cerr << "X ";
|
for (BasicBlock::iterator BI = (*I)->begin(), BE = (*I)->end();
|
||||||
cerr << *IL;
|
BI != BE; ++BI) {
|
||||||
}
|
if (LiveSet.count(*BI)) cerr << "X ";
|
||||||
|
cerr << *BI;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// After the worklist is processed, recursively walk the CFG in depth first
|
// After the worklist is processed, recursively walk the CFG in depth first
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include "llvm/iPHINode.h"
|
#include "llvm/iPHINode.h"
|
||||||
#include "llvm/iOther.h"
|
#include "llvm/iOther.h"
|
||||||
#include "llvm/Type.h"
|
#include "llvm/Type.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/ConstantVals.h"
|
#include "llvm/ConstantVals.h"
|
||||||
#include "Support/STLExtras.h"
|
#include "Support/STLExtras.h"
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include "llvm/SymbolTable.h"
|
#include "llvm/SymbolTable.h"
|
||||||
#include "llvm/iPHINode.h"
|
#include "llvm/iPHINode.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "Support/STLExtras.h"
|
#include "Support/STLExtras.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#include "llvm/Transforms/Scalar/ConstantHandling.h"
|
#include "llvm/Transforms/Scalar/ConstantHandling.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
#include "llvm/iMemory.h"
|
#include "llvm/iMemory.h"
|
||||||
|
#include "llvm/Support/InstIterator.h"
|
||||||
#include "../TransformInternals.h"
|
#include "../TransformInternals.h"
|
||||||
|
|
||||||
static Instruction *CombineBinOp(BinaryOperator *I) {
|
static Instruction *CombineBinOp(BinaryOperator *I) {
|
||||||
@ -126,7 +127,7 @@ bool InstructionCombining::CombineInstruction(Instruction *I) {
|
|||||||
|
|
||||||
bool InstructionCombining::doit(Method *M) {
|
bool InstructionCombining::doit(Method *M) {
|
||||||
// Start the worklist out with all of the instructions in the method in it.
|
// Start the worklist out with all of the instructions in the method in it.
|
||||||
std::vector<Instruction*> WorkList(M->inst_begin(), M->inst_end());
|
std::vector<Instruction*> WorkList(inst_begin(M), inst_end(M));
|
||||||
|
|
||||||
while (!WorkList.empty()) {
|
while (!WorkList.empty()) {
|
||||||
Instruction *I = WorkList.back(); // Get an instruction from the worklist
|
Instruction *I = WorkList.back(); // Get an instruction from the worklist
|
||||||
|
@ -244,39 +244,36 @@ bool SCCP::doSCCP() {
|
|||||||
// constants if we have found them to be of constant values.
|
// constants if we have found them to be of constant values.
|
||||||
//
|
//
|
||||||
bool MadeChanges = false;
|
bool MadeChanges = false;
|
||||||
for (Method::inst_iterator II = M->inst_begin(); II != M->inst_end(); ) {
|
for (Method::iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
|
||||||
Instruction *Inst = *II;
|
BasicBlock *BB = *MI;
|
||||||
InstVal &IV = ValueState[Inst];
|
for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) {
|
||||||
if (IV.isConstant()) {
|
Instruction *Inst = *BI;
|
||||||
Constant *Const = IV.getConstant();
|
InstVal &IV = ValueState[Inst];
|
||||||
// cerr << "Constant: " << Inst << " is: " << Const;
|
if (IV.isConstant()) {
|
||||||
|
Constant *Const = IV.getConstant();
|
||||||
|
// cerr << "Constant: " << Inst << " is: " << Const;
|
||||||
|
|
||||||
// Replaces all of the uses of a variable with uses of the constant.
|
// Replaces all of the uses of a variable with uses of the constant.
|
||||||
Inst->replaceAllUsesWith(Const);
|
Inst->replaceAllUsesWith(Const);
|
||||||
|
|
||||||
// Remove the operator from the list of definitions...
|
// Remove the operator from the list of definitions...
|
||||||
Inst->getParent()->getInstList().remove(II.getInstructionIterator());
|
BB->getInstList().remove(BI);
|
||||||
|
|
||||||
// The new constant inherits the old name of the operator...
|
// The new constant inherits the old name of the operator...
|
||||||
if (Inst->hasName() && !Const->hasName())
|
if (Inst->hasName() && !Const->hasName())
|
||||||
Const->setName(Inst->getName(), M->getSymbolTableSure());
|
Const->setName(Inst->getName(), M->getSymbolTableSure());
|
||||||
|
|
||||||
// Delete the operator now...
|
// Delete the operator now...
|
||||||
delete Inst;
|
delete Inst;
|
||||||
|
|
||||||
// Incrementing the iterator in an unchecked manner could mess up the
|
// Hey, we just changed something!
|
||||||
// internals of 'II'. To make sure everything is happy, tell it we might
|
MadeChanges = true;
|
||||||
// have broken it.
|
} else if (TerminatorInst *TI = dyn_cast<TerminatorInst>(Inst)) {
|
||||||
II.resyncInstructionIterator();
|
MadeChanges |= ConstantFoldTerminator(TI);
|
||||||
|
}
|
||||||
|
|
||||||
// Hey, we just changed something!
|
++BI;
|
||||||
MadeChanges = true;
|
|
||||||
continue; // Skip the ++II at the end of the loop here...
|
|
||||||
} else if (Inst->isTerminator()) {
|
|
||||||
MadeChanges |= ConstantFoldTerminator(cast<TerminatorInst>(Inst));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
++II;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge identical constants last: this is important because we may have just
|
// Merge identical constants last: this is important because we may have just
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "llvm/Transforms/Linker.h"
|
#include "llvm/Transforms/Linker.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/GlobalVariable.h"
|
#include "llvm/GlobalVariable.h"
|
||||||
#include "llvm/SymbolTable.h"
|
#include "llvm/SymbolTable.h"
|
||||||
#include "llvm/DerivedTypes.h"
|
#include "llvm/DerivedTypes.h"
|
||||||
@ -337,13 +338,16 @@ static bool LinkMethodBody(Method *Dest, const Method *Src,
|
|||||||
// in the Source method as operands. Loop through all of the operands of the
|
// in the Source method as operands. Loop through all of the operands of the
|
||||||
// methods and patch them up to point to the local versions...
|
// methods and patch them up to point to the local versions...
|
||||||
//
|
//
|
||||||
for (Method::inst_iterator I = Dest->inst_begin(), E = Dest->inst_end();
|
for (Method::iterator BI = Dest->begin(), BE = Dest->end();
|
||||||
I != E; ++I) {
|
BI != BE; ++BI) {
|
||||||
Instruction *Inst = *I;
|
BasicBlock *BB = *BI;
|
||||||
|
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
|
||||||
for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end();
|
Instruction *Inst = *I;
|
||||||
OI != OE; ++OI)
|
|
||||||
*OI = RemapOperand(*OI, LocalMap, &GlobalMap);
|
for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end();
|
||||||
|
OI != OE; ++OI)
|
||||||
|
*OI = RemapOperand(*OI, LocalMap, &GlobalMap);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include "llvm/Analysis/Dominators.h"
|
#include "llvm/Analysis/Dominators.h"
|
||||||
#include "llvm/Transforms/UnifyMethodExitNodes.h"
|
#include "llvm/Transforms/UnifyMethodExitNodes.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/DepthFirstIterator.h"
|
#include "Support/DepthFirstIterator.h"
|
||||||
#include "Support/STLExtras.h"
|
#include "Support/STLExtras.h"
|
||||||
#include "Support/SetOperations.h"
|
#include "Support/SetOperations.h"
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
#include "llvm/Instruction.h"
|
#include "llvm/Instruction.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
#include "llvm/SymbolTable.h"
|
#include "llvm/SymbolTable.h"
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "llvm/Transforms/Linker.h"
|
#include "llvm/Transforms/Linker.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "llvm/GlobalVariable.h"
|
#include "llvm/GlobalVariable.h"
|
||||||
#include "llvm/SymbolTable.h"
|
#include "llvm/SymbolTable.h"
|
||||||
#include "llvm/DerivedTypes.h"
|
#include "llvm/DerivedTypes.h"
|
||||||
@ -337,13 +338,16 @@ static bool LinkMethodBody(Method *Dest, const Method *Src,
|
|||||||
// in the Source method as operands. Loop through all of the operands of the
|
// in the Source method as operands. Loop through all of the operands of the
|
||||||
// methods and patch them up to point to the local versions...
|
// methods and patch them up to point to the local versions...
|
||||||
//
|
//
|
||||||
for (Method::inst_iterator I = Dest->inst_begin(), E = Dest->inst_end();
|
for (Method::iterator BI = Dest->begin(), BE = Dest->end();
|
||||||
I != E; ++I) {
|
BI != BE; ++BI) {
|
||||||
Instruction *Inst = *I;
|
BasicBlock *BB = *BI;
|
||||||
|
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
|
||||||
for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end();
|
Instruction *Inst = *I;
|
||||||
OI != OE; ++OI)
|
|
||||||
*OI = RemapOperand(*OI, LocalMap, &GlobalMap);
|
for (Instruction::op_iterator OI = Inst->op_begin(), OE = Inst->op_end();
|
||||||
|
OI != OE; ++OI)
|
||||||
|
*OI = RemapOperand(*OI, LocalMap, &GlobalMap);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include "llvm/PassManager.h"
|
#include "llvm/PassManager.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/BasicBlock.h"
|
||||||
#include "Support/STLExtras.h"
|
#include "Support/STLExtras.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ void SlotCalculator::incorporateMethod(const Method *M) {
|
|||||||
SC_DEBUG("Inserting Instructions:\n");
|
SC_DEBUG("Inserting Instructions:\n");
|
||||||
|
|
||||||
// Add all of the instructions to the type planes...
|
// Add all of the instructions to the type planes...
|
||||||
for_each(M->inst_begin(), M->inst_end(),
|
for_each(inst_begin(M), inst_end(M),
|
||||||
bind_obj(this, &SlotCalculator::insertValue));
|
bind_obj(this, &SlotCalculator::insertValue));
|
||||||
|
|
||||||
if (M->hasSymbolTable() && !IgnoreNamedNodes) {
|
if (M->hasSymbolTable() && !IgnoreNamedNodes) {
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#include "llvm/Analysis/LoopInfo.h"
|
#include "llvm/Analysis/LoopInfo.h"
|
||||||
#include "llvm/Analysis/FindUnsafePointerTypes.h"
|
#include "llvm/Analysis/FindUnsafePointerTypes.h"
|
||||||
#include "llvm/Analysis/FindUsedTypes.h"
|
#include "llvm/Analysis/FindUsedTypes.h"
|
||||||
|
#include "llvm/Support/InstIterator.h"
|
||||||
#include "Support/CommandLine.h"
|
#include "Support/CommandLine.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
@ -119,8 +120,7 @@ struct InstForest : public MethodPass {
|
|||||||
struct IndVars : public MethodPass {
|
struct IndVars : public MethodPass {
|
||||||
void doit(Method *M) {
|
void doit(Method *M) {
|
||||||
cfg::LoopInfo &LI = getAnalysis<cfg::LoopInfo>();
|
cfg::LoopInfo &LI = getAnalysis<cfg::LoopInfo>();
|
||||||
for (Method::inst_iterator I = M->inst_begin(), E = M->inst_end();
|
for (inst_iterator I = inst_begin(M), E = inst_end(M); I != E; ++I)
|
||||||
I != E; ++I)
|
|
||||||
if (PHINode *PN = dyn_cast<PHINode>(*I)) {
|
if (PHINode *PN = dyn_cast<PHINode>(*I)) {
|
||||||
InductionVariable IV(PN, &LI);
|
InductionVariable IV(PN, &LI);
|
||||||
if (IV.InductionType != InductionVariable::Unknown)
|
if (IV.InductionType != InductionVariable::Unknown)
|
||||||
@ -137,8 +137,7 @@ struct IndVars : public MethodPass {
|
|||||||
struct Exprs : public MethodPass {
|
struct Exprs : public MethodPass {
|
||||||
static void doit(Method *M) {
|
static void doit(Method *M) {
|
||||||
cout << "Classified expressions for: " << M->getName() << "\n";
|
cout << "Classified expressions for: " << M->getName() << "\n";
|
||||||
Method::inst_iterator I = M->inst_begin(), E = M->inst_end();
|
for (inst_iterator I = inst_begin(M), E = inst_end(M); I != E; ++I) {
|
||||||
for (; I != E; ++I) {
|
|
||||||
cout << *I;
|
cout << *I;
|
||||||
|
|
||||||
if ((*I)->getType() == Type::VoidTy) continue;
|
if ((*I)->getType() == Type::VoidTy) continue;
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "llvm/Assembly/Writer.h"
|
#include "llvm/Assembly/Writer.h"
|
||||||
#include "llvm/Bytecode/Reader.h"
|
#include "llvm/Bytecode/Reader.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/DepthFirstIterator.h"
|
#include "Support/DepthFirstIterator.h"
|
||||||
#include "Support/PostOrderIterator.h"
|
#include "Support/PostOrderIterator.h"
|
||||||
#include "Support/CommandLine.h"
|
#include "Support/CommandLine.h"
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "llvm/Assembly/Writer.h"
|
#include "llvm/Assembly/Writer.h"
|
||||||
#include "llvm/Bytecode/Reader.h"
|
#include "llvm/Bytecode/Reader.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/DepthFirstIterator.h"
|
#include "Support/DepthFirstIterator.h"
|
||||||
#include "Support/PostOrderIterator.h"
|
#include "Support/PostOrderIterator.h"
|
||||||
#include "Support/CommandLine.h"
|
#include "Support/CommandLine.h"
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "llvm/Assembly/Writer.h"
|
#include "llvm/Assembly/Writer.h"
|
||||||
#include "llvm/Bytecode/Reader.h"
|
#include "llvm/Bytecode/Reader.h"
|
||||||
#include "llvm/Method.h"
|
#include "llvm/Method.h"
|
||||||
|
#include "llvm/Support/CFG.h"
|
||||||
#include "Support/DepthFirstIterator.h"
|
#include "Support/DepthFirstIterator.h"
|
||||||
#include "Support/PostOrderIterator.h"
|
#include "Support/PostOrderIterator.h"
|
||||||
#include "Support/CommandLine.h"
|
#include "Support/CommandLine.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user