forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-20 11:46:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmcc

Browse source
This commit is contained in:
artur-zawlocki 2014-10-13 15:21:43 +01:00
commit 7c78ecbdb2
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
evmcc/Compiler.cpp
View file

@ -5,6 +5,8 @@
#include <llvm/IR/IRBuilder.h>
#include <llvm/IR/CFG.h>
#include <llvm/ADT/PostOrderIterator.h>
//#include <llvm/Transforms/Scalar.h>
#include <libevmface/Instruction.h>
@ -902,36 +904,26 @@ void Compiler::linkBasicBlocks()
auto phi = llvm::cast<llvm::PHINode>(instIt);
for (auto predIt = llvm::pred_begin(_llbb); predIt != llvm::pred_end(_llbb); ++predIt)
{
// TODO: In case entry block is reached - report error
auto& predBB = findBasicBlock(*predIt);
// assert(valueIdx < predBB.getStack().size()); // TODO: Report error
phi->addIncoming(predBB.getStack().get(valueIdx), predBB);
auto value = predBB.getStack().get(valueIdx);
phi->addIncoming(value, predBB);
}
}
};
// Link basic blocks
for (auto&& p : basicBlocks)
// TODO: It is crappy visiting of basic blocks.
llvm::SmallPtrSet<llvm::BasicBlock*, 32> visitSet;
for (auto&& bb : basicBlocks) // TODO: External loop is to visit unreable blocks that can also have phi nodes
{
BasicBlock& bb = p.second;
completePhiNodes(bb.llvm());
}
completePhiNodes(m_jumpTableBlock->llvm());
/*
llvm::BasicBlock* llvmBB = bb.llvm();
size_t valueIdx = 0;
auto firstNonPhi = llvmBB->getFirstNonPHI();
for (auto instIt = llvmBB->begin(); &*instIt != firstNonPhi; ++instIt, ++valueIdx)
for (auto it = llvm::po_ext_begin(bb.second.llvm(), visitSet),
end = llvm::po_ext_end(bb.second.llvm(), visitSet); it != end; ++it)
{
auto phi = llvm::cast<llvm::PHINode>(instIt);
for (auto predIt = llvm::pred_begin(llvmBB); predIt != llvm::pred_end(llvmBB); ++predIt)
{
auto& predBB = findBasicBlock(*predIt);
assert(valueIdx < predBB.getStack().size()); // TODO: Report error
phi->addIncoming(predBB.getStack().get(valueIdx), predBB);
}
std::cerr << it->getName().str() << std::endl;
completePhiNodes(*it);
}
*/
}
}
}