cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle assembly in one go to allow for different stacks.

Browse Source
This commit is contained in:
chriseth 2017-05-23 12:13:34 +02:00
parent 9a23603af2
commit f2804c49ed
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
solc/CommandLineInterface.cpp
View File

@ -36,6 +36,7 @@
#include <libsolidity/interface/SourceReferenceFormatter.h> #include <libsolidity/interface/SourceReferenceFormatter.h>
#include <libsolidity/interface/GasEstimator.h> #include <libsolidity/interface/GasEstimator.h>
#include <libsolidity/formal/Why3Translator.h> #include <libsolidity/formal/Why3Translator.h>
#include <libsolidity/inlineasm/AsmStack.h>
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
#include <libevmasm/GasMeter.h> #include <libevmasm/GasMeter.h>
@ -954,10 +955,9 @@ void CommandLineInterface::handleAst(string const& _argStr)
bool CommandLineInterface::actOnInput() bool CommandLineInterface::actOnInput()
{ {
if (m_args.count(g_argStandardJSON)) if (m_args.count(g_argStandardJSON) || m_onlyAssemble)
// Already done in "processInput" phase.
return true; return true;
else if (m_onlyAssemble)
outputAssembly();
else if (m_onlyLink) else if (m_onlyLink)
writeLinkedFiles(); writeLinkedFiles();
else else
@ -1022,17 +1022,18 @@ bool CommandLineInterface::assemble()
{ {
bool successful = true; bool successful = true;
map<string, shared_ptr<Scanner>> scanners; map<string, shared_ptr<Scanner>> scanners;
map<string, assembly::InlineAssemblyStack> assemblyStacks;
for (auto const& src: m_sourceCodes) for (auto const& src: m_sourceCodes)
{ {
try try
{ {
auto scanner = make_shared<Scanner>(CharStream(src.second), src.first); auto scanner = make_shared<Scanner>(CharStream(src.second), src.first);
scanners[src.first] = scanner; scanners[src.first] = scanner;
if (!m_assemblyStacks[src.first].parse(scanner)) if (!assemblyStacks[src.first].parse(scanner))
successful = false; successful = false;
else else
//@TODO we should not just throw away the result here //@TODO we should not just throw away the result here
m_assemblyStacks[src.first].assemble(); assemblyStacks[src.first].assemble();
} }
catch (Exception const& _exception) catch (Exception const& _exception)
{ {
@ -1045,7 +1046,7 @@ bool CommandLineInterface::assemble()
return false; return false;
} }
} }
for (auto const& stack: m_assemblyStacks) for (auto const& stack: assemblyStacks)
{ {
for (auto const& error: stack.second.errors()) for (auto const& error: stack.second.errors())
SourceReferenceFormatter::printExceptionInformation( SourceReferenceFormatter::printExceptionInformation(
@ -1058,18 +1059,18 @@ bool CommandLineInterface::assemble()
successful = false; successful = false;
} }
return successful; if (!successful)
} return false;
void CommandLineInterface::outputAssembly()
{
for (auto const& src: m_sourceCodes) for (auto const& src: m_sourceCodes)
{ {
cout << endl << "======= " << src.first << " =======" << endl; cout << endl << "======= " << src.first << " =======" << endl;
eth::Assembly assembly = m_assemblyStacks[src.first].assemble(); eth::Assembly assembly = assemblyStacks[src.first].assemble();
cout << assembly.assemble().toHex() << endl; cout << assembly.assemble().toHex() << endl;
assembly.stream(cout, "", m_sourceCodes); assembly.stream(cout, "", m_sourceCodes);
} }
return true;
} }
void CommandLineInterface::outputCompilationResults() void CommandLineInterface::outputCompilationResults()

3
solc/CommandLineInterface.h
View File

@ -22,7 +22,6 @@
#pragma once #pragma once
#include <libsolidity/interface/CompilerStack.h> #include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/inlineasm/AsmStack.h>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
@ -104,8 +103,6 @@ private:
std::map<std::string, h160> m_libraries; std::map<std::string, h160> m_libraries;
/// Solidity compiler stack /// Solidity compiler stack
std::unique_ptr<dev::solidity::CompilerStack> m_compiler; std::unique_ptr<dev::solidity::CompilerStack> m_compiler;
/// Assembly stacks for assembly-only mode
std::map<std::string, assembly::InlineAssemblyStack> m_assemblyStacks;
}; };
} }