6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-18 14:31:27 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate SimplifyCFG.h file, pull everything into the UnifyMethodExitNodes class

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1613 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-01-31 01:12:06 +00:00
parent 2d4fe48b17
commit 21801532fd
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
View File

@ -10,7 +10,6 @@
#define LLVM_XFORMS_UNIFY_METHOD_EXIT_NODES_H #define LLVM_XFORMS_UNIFY_METHOD_EXIT_NODES_H
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/Analysis/SimplifyCFG.h" // FIXME!!
struct UnifyMethodExitNodes : public MethodPass { struct UnifyMethodExitNodes : public MethodPass {
BasicBlock *ExitNode; BasicBlock *ExitNode;
@ -18,10 +17,17 @@ public:
static AnalysisID ID; // Pass ID static AnalysisID ID; // Pass ID
UnifyMethodExitNodes(AnalysisID id) : ExitNode(0) { assert(ID == id); } UnifyMethodExitNodes(AnalysisID id) : ExitNode(0) { assert(ID == id); }
virtual bool runOnMethod(Method *M) { // UnifyAllExitNodes - Unify all exit nodes of the CFG by creating a new
ExitNode = cfg::UnifyAllExitNodes(M); // BasicBlock, and converting all returns to unconditional branches to this
// new basic block. The singular exit node is returned in ExitNode.
//
// If there are no return stmts in the Method, a null pointer is returned.
//
static bool doit(Method *M, BasicBlock *&ExitNode);
return true; // FIXME: This should return a correct code!!!
virtual bool runOnMethod(Method *M) {
return doit(M, ExitNode);
} }
BasicBlock *getExitNode() const { return ExitNode; } BasicBlock *getExitNode() const { return ExitNode; }

19
lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
View File

@ -5,7 +5,6 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/Analysis/SimplifyCFG.h"
#include "llvm/Transforms/UnifyMethodExitNodes.h" #include "llvm/Transforms/UnifyMethodExitNodes.h"
#include "llvm/BasicBlock.h" #include "llvm/BasicBlock.h"
#include "llvm/Method.h" #include "llvm/Method.h"
@ -23,7 +22,7 @@ AnalysisID UnifyMethodExitNodes::ID(AnalysisID::create<UnifyMethodExitNodes>());
// //
// If there are no return stmts in the Method, a null pointer is returned. // If there are no return stmts in the Method, a null pointer is returned.
// //
BasicBlock *cfg::UnifyAllExitNodes(Method *M) { bool UnifyMethodExitNodes::doit(Method *M, BasicBlock *&ExitNode) {
vector<BasicBlock*> ReturningBlocks; vector<BasicBlock*> ReturningBlocks;
// Loop over all of the blocks in a method, tracking all of the blocks that // Loop over all of the blocks in a method, tracking all of the blocks that
@ -33,16 +32,19 @@ BasicBlock *cfg::UnifyAllExitNodes(Method *M) {
if ((*I)->getTerminator()->getOpcode() == Instruction::Ret) if ((*I)->getTerminator()->getOpcode() == Instruction::Ret)
ReturningBlocks.push_back(*I); ReturningBlocks.push_back(*I);
if (ReturningBlocks.size() == 0) if (ReturningBlocks.size() == 0) {
return 0; // No blocks return ExitNode = 0;
else if (ReturningBlocks.size() == 1) return false; // No blocks return
return ReturningBlocks.front(); // Already has a single return block } else if (ReturningBlocks.size() == 1) {
ExitNode = ReturningBlocks.front(); // Already has a single return block
return false;
}
// Otherwise, we need to insert a new basic block into the method, add a PHI // Otherwise, we need to insert a new basic block into the method, add a PHI
// node (if the function returns a value), and convert all of the return // node (if the function returns a value), and convert all of the return
// instructions into unconditional branches. // instructions into unconditional branches.
// //
BasicBlock *NewRetBlock = new BasicBlock("", M); BasicBlock *NewRetBlock = new BasicBlock("UnifiedExitNode", M);
if (M->getReturnType() != Type::VoidTy) { if (M->getReturnType() != Type::VoidTy) {
// If the method doesn't return void... add a PHI node to the block... // If the method doesn't return void... add a PHI node to the block...
@ -70,5 +72,6 @@ BasicBlock *cfg::UnifyAllExitNodes(Method *M) {
delete (*I)->getInstList().pop_back(); // Remove the return insn delete (*I)->getInstList().pop_back(); // Remove the return insn
(*I)->getInstList().push_back(new BranchInst(NewRetBlock)); (*I)->getInstList().push_back(new BranchInst(NewRetBlock));
} }
return NewRetBlock; ExitNode = NewRetBlock;
return true;
} }