From 9a23603af2565e0a46c9522f6f68188d415b4715 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 23 May 2017 10:37:51 +0200 Subject: Commandline options. --- solc/CommandLineInterface.cpp | 42 ++++++++++++++++++++++++++++++++++++++++-- solc/CommandLineInterface.h | 6 ++++++ 2 files changed, 46 insertions(+), 2 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index e55e3e7e..cc9d057a 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -80,11 +80,15 @@ static string const g_strBinaryRuntime = "bin-runtime"; static string const g_strCloneBinary = "clone-bin"; static string const g_strCombinedJson = "combined-json"; static string const g_strContracts = "contracts"; +static string const g_strEVM = "evm"; +static string const g_strEVM15 = "evm15"; +static string const g_streWASM = "ewasm"; static string const g_strFormal = "formal"; static string const g_strGas = "gas"; static string const g_strHelp = "help"; static string const g_strInputFile = "input-file"; static string const g_strInterface = "interface"; +static string const g_strJulia = "julia"; static string const g_strLibraries = "libraries"; static string const g_strLink = "link"; static string const g_strMetadata = "metadata"; @@ -121,8 +125,10 @@ static string const g_argFormal = g_strFormal; static string const g_argGas = g_strGas; static string const g_argHelp = g_strHelp; static string const g_argInputFile = g_strInputFile; +static string const g_argJulia = "julia"; static string const g_argLibraries = g_strLibraries; static string const g_argLink = g_strLink; +static string const g_argMachine = "machine"; static string const g_argMetadata = g_strMetadata; static string const g_argNatspecDev = g_strNatspecDev; static string const g_argNatspecUser = g_strNatspecUser; @@ -154,6 +160,14 @@ static set const g_combinedJsonArgs{ g_strSrcMapRuntime }; +/// Possible arguments to for --machine +static set const g_machineArgs +{ + g_strEVM, + g_strEVM15, + g_streWASM +}; + static void version() { cout << @@ -539,7 +553,16 @@ Allowed options)", ) ( g_argAssemble.c_str(), - "Switch to assembly mode, ignoring all options and assumes input is assembly." + "Switch to assembly mode, ignoring all options except --machine and assumes input is assembly." + ) + ( + g_argJulia.c_str(), + "Switch to JULIA mode, ignoring all options except --machine and assumes input is JULIA." + ) + ( + g_argMachine.c_str(), + po::value()->value_name(boost::join(g_machineArgs, ",")), + "Target machine in assembly or JULIA mode." ) ( g_argLink.c_str(), @@ -689,10 +712,25 @@ bool CommandLineInterface::processInput() if (!parseLibraryOption(library)) return false; - if (m_args.count(g_argAssemble)) + if (m_args.count(g_argAssemble) || m_args.count(g_argJulia)) { // switch to assembly mode m_onlyAssemble = true; + if (m_args.count(g_argMachine)) + { + string machine = m_args[g_argMachine].as(); + if (machine == g_strEVM) + m_assemblyMachine = AssemblyMachine::EVM; + else if (machine == g_strEVM15) + m_assemblyMachine = AssemblyMachine::EVM15; + else if (machine == g_streWASM) + m_assemblyMachine = AssemblyMachine::eWasm; + else + { + cerr << "Invalid option for --machine: " << machine << endl; + return false; + } + } return assemble(); } if (m_args.count(g_argLink)) diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h index ebf52625..db21916b 100644 --- a/solc/CommandLineInterface.h +++ b/solc/CommandLineInterface.h @@ -86,6 +86,12 @@ private: bool m_error = false; ///< If true, some error occurred. bool m_onlyAssemble = false; + /// Settings to use in assembly / JULIA mode. + enum class AssemblyInput { JULIA, Assembly }; + enum class AssemblyMachine { EVM, EVM15, eWasm }; + AssemblyInput m_assemblyInput = AssemblyInput::Assembly; + AssemblyMachine m_assemblyMachine = AssemblyMachine::EVM; + bool m_onlyLink = false; /// Compiler arguments variable map -- cgit v1.2.3 From f2804c49ed44583fbfd31857951810f8c3023bc9 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 23 May 2017 12:13:34 +0200 Subject: Handle assembly in one go to allow for different stacks. --- solc/CommandLineInterface.cpp | 23 ++++++++++++----------- solc/CommandLineInterface.h | 3 --- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index cc9d057a..36676119 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -954,10 +955,9 @@ void CommandLineInterface::handleAst(string const& _argStr) bool CommandLineInterface::actOnInput() { - if (m_args.count(g_argStandardJSON)) + if (m_args.count(g_argStandardJSON) || m_onlyAssemble) + // Already done in "processInput" phase. return true; - else if (m_onlyAssemble) - outputAssembly(); else if (m_onlyLink) writeLinkedFiles(); else @@ -1022,17 +1022,18 @@ bool CommandLineInterface::assemble() { bool successful = true; map> scanners; + map assemblyStacks; for (auto const& src: m_sourceCodes) { try { auto scanner = make_shared(CharStream(src.second), src.first); scanners[src.first] = scanner; - if (!m_assemblyStacks[src.first].parse(scanner)) + if (!assemblyStacks[src.first].parse(scanner)) successful = false; else //@TODO we should not just throw away the result here - m_assemblyStacks[src.first].assemble(); + assemblyStacks[src.first].assemble(); } catch (Exception const& _exception) { @@ -1045,7 +1046,7 @@ bool CommandLineInterface::assemble() return false; } } - for (auto const& stack: m_assemblyStacks) + for (auto const& stack: assemblyStacks) { for (auto const& error: stack.second.errors()) SourceReferenceFormatter::printExceptionInformation( @@ -1058,18 +1059,18 @@ bool CommandLineInterface::assemble() successful = false; } - return successful; -} + if (!successful) + return false; -void CommandLineInterface::outputAssembly() -{ for (auto const& src: m_sourceCodes) { 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; assembly.stream(cout, "", m_sourceCodes); } + + return true; } void CommandLineInterface::outputCompilationResults() diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h index db21916b..cf8652f4 100644 --- a/solc/CommandLineInterface.h +++ b/solc/CommandLineInterface.h @@ -22,7 +22,6 @@ #pragma once #include -#include #include #include @@ -104,8 +103,6 @@ private: std::map m_libraries; /// Solidity compiler stack std::unique_ptr m_compiler; - /// Assembly stacks for assembly-only mode - std::map m_assemblyStacks; }; } -- cgit v1.2.3 From eaa13d42a09155200127418762940ca652b050c5 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 23 May 2017 18:57:06 +0200 Subject: Support multiple assembly front and backends. --- solc/CommandLineInterface.cpp | 70 +++++++++++++++++++++++++++---------------- solc/CommandLineInterface.h | 10 ++----- 2 files changed, 47 insertions(+), 33 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 36676119..701cf163 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -35,8 +35,8 @@ #include #include #include +#include #include -#include #include #include @@ -83,7 +83,7 @@ static string const g_strCombinedJson = "combined-json"; static string const g_strContracts = "contracts"; static string const g_strEVM = "evm"; static string const g_strEVM15 = "evm15"; -static string const g_streWASM = "ewasm"; +static string const g_streWasm = "ewasm"; static string const g_strFormal = "formal"; static string const g_strGas = "gas"; static string const g_strHelp = "help"; @@ -166,7 +166,7 @@ static set const g_machineArgs { g_strEVM, g_strEVM15, - g_streWASM + g_streWasm }; static void version() @@ -717,22 +717,26 @@ bool CommandLineInterface::processInput() { // switch to assembly mode m_onlyAssemble = true; + using Input = MultiBackendAssemblyStack::Input; + using Machine = MultiBackendAssemblyStack::Machine; + Input input = m_args.count(g_argJulia) ? Input::JULIA : Input::Assembly; + Machine targetMachine = Machine::EVM; if (m_args.count(g_argMachine)) { string machine = m_args[g_argMachine].as(); if (machine == g_strEVM) - m_assemblyMachine = AssemblyMachine::EVM; + targetMachine = Machine::EVM; else if (machine == g_strEVM15) - m_assemblyMachine = AssemblyMachine::EVM15; - else if (machine == g_streWASM) - m_assemblyMachine = AssemblyMachine::eWasm; + targetMachine = Machine::EVM15; + else if (machine == g_streWasm) + targetMachine = Machine::eWasm; else { cerr << "Invalid option for --machine: " << machine << endl; return false; } } - return assemble(); + return assemble(input, targetMachine); } if (m_args.count(g_argLink)) { @@ -1018,22 +1022,20 @@ void CommandLineInterface::writeLinkedFiles() writeFile(src.first, src.second); } -bool CommandLineInterface::assemble() +bool CommandLineInterface::assemble( + MultiBackendAssemblyStack::Input _input, + MultiBackendAssemblyStack::Machine _targetMachine +) { bool successful = true; - map> scanners; - map assemblyStacks; + map assemblyStacks; for (auto const& src: m_sourceCodes) { + auto& stack = assemblyStacks[src.first] = MultiBackendAssemblyStack(_input, _targetMachine); try { - auto scanner = make_shared(CharStream(src.second), src.first); - scanners[src.first] = scanner; - if (!assemblyStacks[src.first].parse(scanner)) + if (!stack.parseAndAnalyze(src.first, src.second)) successful = false; - else - //@TODO we should not just throw away the result here - assemblyStacks[src.first].assemble(); } catch (Exception const& _exception) { @@ -1046,16 +1048,17 @@ bool CommandLineInterface::assemble() return false; } } - for (auto const& stack: assemblyStacks) + for (auto const& sourceAndStack: assemblyStacks) { - for (auto const& error: stack.second.errors()) + auto const& stack = sourceAndStack.second; + for (auto const& error: stack.errors()) SourceReferenceFormatter::printExceptionInformation( cerr, *error, (error->type() == Error::Type::Warning) ? "Warning" : "Error", - [&](string const& _source) -> Scanner const& { return *scanners.at(_source); } + [&](string const&) -> Scanner const& { return stack.scanner(); } ); - if (!Error::containsOnlyWarnings(stack.second.errors())) + if (!Error::containsOnlyWarnings(stack.errors())) successful = false; } @@ -1064,10 +1067,27 @@ bool CommandLineInterface::assemble() for (auto const& src: m_sourceCodes) { - cout << endl << "======= " << src.first << " =======" << endl; - eth::Assembly assembly = assemblyStacks[src.first].assemble(); - cout << assembly.assemble().toHex() << endl; - assembly.stream(cout, "", m_sourceCodes); + string machine = + _targetMachine == AssemblyStack::Machine::EVM ? "EVM" : + _targetMachine == AssemblyStack::Machine::EVM15 ? "EVM 1.5" : + "eWasm"; + cout << endl << "======= " << src.first << " (" << machine << ") =======" << endl; + AssemblyStack& stack = assemblyStacks[src.first]; + try + { + cout << stack.assemble(_targetMachine).toHex() << endl; + } + catch (Exception const& _exception) + { + cerr << "Exception while assembling: " << boost::diagnostic_information(_exception) << endl; + return false; + } + catch (...) + { + cerr << "Unknown exception while assembling." << endl; + return false; + } + cout << stack.print() << endl; } return true; diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h index cf8652f4..8c79e32d 100644 --- a/solc/CommandLineInterface.h +++ b/solc/CommandLineInterface.h @@ -22,6 +22,7 @@ #pragma once #include +#include #include #include @@ -53,9 +54,7 @@ private: bool link(); void writeLinkedFiles(); - /// Parse assembly input. - bool assemble(); - void outputAssembly(); + bool assemble(MultiBackendAssemblyStack::Input _input, MultiBackendAssemblyStack::Machine _targetMachine); void outputCompilationResults(); @@ -85,11 +84,6 @@ private: bool m_error = false; ///< If true, some error occurred. bool m_onlyAssemble = false; - /// Settings to use in assembly / JULIA mode. - enum class AssemblyInput { JULIA, Assembly }; - enum class AssemblyMachine { EVM, EVM15, eWasm }; - AssemblyInput m_assemblyInput = AssemblyInput::Assembly; - AssemblyMachine m_assemblyMachine = AssemblyMachine::EVM; bool m_onlyLink = false; -- cgit v1.2.3 From 261731f7eea48902983c55163d377e26bbca07da Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 23 May 2017 19:21:14 +0200 Subject: Adapt EVM codegen to new namespace. --- solc/CommandLineInterface.cpp | 18 +++++++++--------- solc/CommandLineInterface.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 701cf163..c14a46e8 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -717,9 +717,9 @@ bool CommandLineInterface::processInput() { // switch to assembly mode m_onlyAssemble = true; - using Input = MultiBackendAssemblyStack::Input; - using Machine = MultiBackendAssemblyStack::Machine; - Input input = m_args.count(g_argJulia) ? Input::JULIA : Input::Assembly; + using Input = AssemblyStack::Language; + using Machine = AssemblyStack::Machine; + Input inputLanguage = m_args.count(g_argJulia) ? Input::JULIA : Input::Assembly; Machine targetMachine = Machine::EVM; if (m_args.count(g_argMachine)) { @@ -736,7 +736,7 @@ bool CommandLineInterface::processInput() return false; } } - return assemble(input, targetMachine); + return assemble(inputLanguage, targetMachine); } if (m_args.count(g_argLink)) { @@ -1023,15 +1023,15 @@ void CommandLineInterface::writeLinkedFiles() } bool CommandLineInterface::assemble( - MultiBackendAssemblyStack::Input _input, - MultiBackendAssemblyStack::Machine _targetMachine + AssemblyStack::Language _language, + AssemblyStack::Machine _targetMachine ) { bool successful = true; - map assemblyStacks; + map assemblyStacks; for (auto const& src: m_sourceCodes) { - auto& stack = assemblyStacks[src.first] = MultiBackendAssemblyStack(_input, _targetMachine); + auto& stack = assemblyStacks[src.first] = AssemblyStack(_language); try { if (!stack.parseAndAnalyze(src.first, src.second)) diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h index 8c79e32d..b482c20b 100644 --- a/solc/CommandLineInterface.h +++ b/solc/CommandLineInterface.h @@ -22,7 +22,7 @@ #pragma once #include -#include +#include #include #include @@ -54,7 +54,7 @@ private: bool link(); void writeLinkedFiles(); - bool assemble(MultiBackendAssemblyStack::Input _input, MultiBackendAssemblyStack::Machine _targetMachine); + bool assemble(AssemblyStack::Language _language, AssemblyStack::Machine _targetMachine); void outputCompilationResults(); -- cgit v1.2.3