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

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

Browse source
This commit is contained in:
Paweł Bylica 2014-10-20 17:37:55 +02:00
commit 150162e33d
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
evmcc/CMakeLists.txt
View file

@ -12,6 +12,7 @@ target_link_libraries(${EXECUTABLE} devcore)
target_link_libraries(${EXECUTABLE} ethcore)
target_link_libraries(${EXECUTABLE} evm)
target_link_libraries(${EXECUTABLE} evmface)
target_link_libraries(${EXECUTABLE} evmjit)
if ("${TARGET_PLATFORM}" STREQUAL "w64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")

11
libevmjit/Compiler.cpp
View file

@ -939,7 +939,6 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
<< " node [shape=record];\n"
<< " entry [share=record, label=\"entry block\"];\n";
// std::map<std::string, BasicBlock*> blocksByName;
std::vector<BasicBlock*> blocks;
for (auto& pair : this->basicBlocks)
{
@ -952,7 +951,6 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
for (auto bb : blocks)
{
std::string blockName = bb->llvm()->getName();
// blocksByName.insert(std::pair<std::string, BasicBlock*>(blockName, bb));
int numOfPhiNodes = 0;
auto firstNonPhiPtr = bb->llvm()->getFirstNonPHI();
@ -961,10 +959,8 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
auto endStackSize = bb->getStack().size();
out << " \"" << blockName << "\" [shape=record, label=\""
<< std::to_string(numOfPhiNodes) << "|"
<< blockName << "|"
<< std::to_string(endStackSize)
<< "\"];\n";
<< numOfPhiNodes << "|" << blockName << "|" << endStackSize
<< "\"];\n";
}
out << " entry -> \"Instr.0\";\n";
@ -978,7 +974,8 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
for (llvm::succ_iterator it = llvm::succ_begin(bb->llvm()); it != end; ++it)
{
std::string succName = it->getName();
out << " \"" << blockName << "\" -> \"" << succName << "\";\n";
out << " \"" << blockName << "\" -> \"" << succName << "\""
<< ((bb == m_jumpTableBlock.get()) ? " [style = dashed];\n" : "\n");
}
}