6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-19 04:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Minor cleanups

Browse Source 
Iterate from tarj_begin -> tarj_end, not from tarj_begin -> NULL


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8260 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-08-31 19:29:52 +00:00
parent 8d0a23ab42
commit 0c0023b754
2 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
View File

@ -14,7 +14,6 @@
#include "llvm/Analysis/DataStructure.h" #include "llvm/Analysis/DataStructure.h"
#include "llvm/Analysis/DSGraph.h" #include "llvm/Analysis/DSGraph.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/Function.h"
#include "llvm/iMemory.h" #include "llvm/iMemory.h"
#include "llvm/iOther.h" #include "llvm/iOther.h"
#include "llvm/Support/InstVisitor.h" #include "llvm/Support/InstVisitor.h"
@ -24,7 +23,6 @@
#include "Support/STLExtras.h" #include "Support/STLExtras.h"
#include "Support/hash_map" #include "Support/hash_map"
#include "Support/hash_set" #include "Support/hash_set"
#include <iostream>
///-------------------------------------------------------------------------- ///--------------------------------------------------------------------------
@ -263,10 +261,8 @@ public:
/// } /// }
/// ///
/// ///
void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S, void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S,
ModRefTable& ModRefAfter) ModRefTable& ModRefAfter) {
{
ModRefTable ModRefCurrent; ModRefTable ModRefCurrent;
ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap; ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap;
ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap; ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap;
@ -417,27 +413,26 @@ void MemoryDepAnalysis::print(std::ostream &O) const
/// ///
/// Run the pass on a function /// Run the pass on a function
/// ///
bool MemoryDepAnalysis::runOnFunction(Function& func) bool MemoryDepAnalysis::runOnFunction(Function &F) {
{ assert(!F.isExternal());
assert(! func.isExternal());
// Get the FunctionModRefInfo holding IPModRef results for this function. // Get the FunctionModRefInfo holding IPModRef results for this function.
// Use the TD graph recorded within the FunctionModRefInfo object, which // Use the TD graph recorded within the FunctionModRefInfo object, which
// may not be the same as the original TD graph computed by DS analysis. // may not be the same as the original TD graph computed by DS analysis.
// //
funcModRef = &getAnalysis<IPModRef>().getFunctionModRefInfo(func); funcModRef = &getAnalysis<IPModRef>().getFunctionModRefInfo(F);
funcGraph = &funcModRef->getFuncGraph(); funcGraph = &funcModRef->getFuncGraph();
// TEMPORARY: ptr to depGraph (later just becomes "this"). // TEMPORARY: ptr to depGraph (later just becomes "this").
assert(funcMap.find(&func) == funcMap.end() && "Analyzing function twice?"); assert(!funcMap.count(&F) && "Analyzing function twice?");
funcDepGraph = funcMap[&func] = new DependenceGraph(); funcDepGraph = funcMap[&F] = new DependenceGraph();
ModRefTable ModRefAfter; ModRefTable ModRefAfter;
SCC<Function*>* nextSCC; SCC<Function*>* nextSCC;
for (TarjanSCC_iterator<Function*> tarjSCCiter = tarj_begin(&func); for (TarjanSCC_iterator<Function*> I = tarj_begin(&F), E = tarj_end(&F);
(nextSCC = *tarjSCCiter) != NULL; ++tarjSCCiter) I != E; ++I)
ProcessSCC(*nextSCC, ModRefAfter); ProcessSCC(**I, ModRefAfter);
return true; return true;
} }

23
lib/Analysis/IPA/MemoryDepAnalysis.cpp
View File

@ -14,7 +14,6 @@
#include "llvm/Analysis/DataStructure.h" #include "llvm/Analysis/DataStructure.h"
#include "llvm/Analysis/DSGraph.h" #include "llvm/Analysis/DSGraph.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/Function.h"
#include "llvm/iMemory.h" #include "llvm/iMemory.h"
#include "llvm/iOther.h" #include "llvm/iOther.h"
#include "llvm/Support/InstVisitor.h" #include "llvm/Support/InstVisitor.h"
@ -24,7 +23,6 @@
#include "Support/STLExtras.h" #include "Support/STLExtras.h"
#include "Support/hash_map" #include "Support/hash_map"
#include "Support/hash_set" #include "Support/hash_set"
#include <iostream>
///-------------------------------------------------------------------------- ///--------------------------------------------------------------------------
@ -263,10 +261,8 @@ public:
/// } /// }
/// ///
/// ///
void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S, void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S,
ModRefTable& ModRefAfter) ModRefTable& ModRefAfter) {
{
ModRefTable ModRefCurrent; ModRefTable ModRefCurrent;
ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap; ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap;
ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap; ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap;
@ -417,27 +413,26 @@ void MemoryDepAnalysis::print(std::ostream &O) const
/// ///
/// Run the pass on a function /// Run the pass on a function
/// ///
bool MemoryDepAnalysis::runOnFunction(Function& func) bool MemoryDepAnalysis::runOnFunction(Function &F) {
{ assert(!F.isExternal());
assert(! func.isExternal());
// Get the FunctionModRefInfo holding IPModRef results for this function. // Get the FunctionModRefInfo holding IPModRef results for this function.
// Use the TD graph recorded within the FunctionModRefInfo object, which // Use the TD graph recorded within the FunctionModRefInfo object, which
// may not be the same as the original TD graph computed by DS analysis. // may not be the same as the original TD graph computed by DS analysis.
// //
funcModRef = &getAnalysis<IPModRef>().getFunctionModRefInfo(func); funcModRef = &getAnalysis<IPModRef>().getFunctionModRefInfo(F);
funcGraph = &funcModRef->getFuncGraph(); funcGraph = &funcModRef->getFuncGraph();
// TEMPORARY: ptr to depGraph (later just becomes "this"). // TEMPORARY: ptr to depGraph (later just becomes "this").
assert(funcMap.find(&func) == funcMap.end() && "Analyzing function twice?"); assert(!funcMap.count(&F) && "Analyzing function twice?");
funcDepGraph = funcMap[&func] = new DependenceGraph(); funcDepGraph = funcMap[&F] = new DependenceGraph();
ModRefTable ModRefAfter; ModRefTable ModRefAfter;
SCC<Function*>* nextSCC; SCC<Function*>* nextSCC;
for (TarjanSCC_iterator<Function*> tarjSCCiter = tarj_begin(&func); for (TarjanSCC_iterator<Function*> I = tarj_begin(&F), E = tarj_end(&F);
(nextSCC = *tarjSCCiter) != NULL; ++tarjSCCiter) I != E; ++I)
ProcessSCC(*nextSCC, ModRefAfter); ProcessSCC(**I, ModRefAfter);
return true; return true;
} }