cerc-io/solidity
16
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

Introduce assemblyString

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-08-30 02:17:15 +01:00
parent 50570c6c79
commit bbfb16cf5c
10 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libevmasm/Assembly.cpp
View File

@ -208,6 +208,13 @@ void Assembly::assemblyStream(ostream& _out, string const& _prefix, StringMap co
_out << endl << _prefix << "auxdata: 0x" << toHex(m_auxiliaryData) << endl;
}
string Assembly::assemblyString(StringMap const& _sourceCodes) const
{
ostringstream tmp;
assemblyStream(tmp, "", _sourceCodes);
return tmp.str();
}
Json::Value Assembly::createJsonValue(string _name, int _begin, int _end, string _value, string _jumpType)
{
Json::Value value;

3
libevmasm/Assembly.h
View File

@ -121,6 +121,9 @@ public:
Assembly& optimise(bool _enable, bool _isCreation = true, size_t _runs = 200);
/// Create a text representation of the assembly.
std::string assemblyString(
StringMap const& _sourceCodes = StringMap()
) const;
void assemblyStream(
std::ostream& _out,
std::string const& _prefix = "",

5
liblll/Compiler.cpp
View File

@ -72,14 +72,13 @@ std::string dev::eth::compileLLLToAsm(std::string const& _src, bool _opt, std::v
{
CompilerState cs;
cs.populateStandard();
stringstream ret;
auto assembly = CodeFragment::compile(_src, cs).assembly(cs);
if (_opt)
assembly = assembly.optimise(true);
assembly.assemblyStream(ret);
string ret = assembly.assemblyString();
for (auto i: cs.treesToKill)
killBigints(i);
return ret.str();
return ret;
}
catch (Exception const& _e)
{

4
libsolidity/codegen/Compiler.h
View File

@ -60,9 +60,9 @@ public:
/// @returns Only the runtime object (without constructor).
eth::LinkerObject runtimeObject() const { return m_context.assembledRuntimeObject(m_runtimeSub); }
/// @arg _sourceCodes is the map of input files to source code strings
void assemblyStream(std::ostream& _stream, StringMap const& _sourceCodes = StringMap()) const
std::string assemblyString(StringMap const& _sourceCodes = StringMap()) const
{
m_context.assemblyStream(_stream, _sourceCodes);
return m_context.assemblyString(_sourceCodes);
}
/// @arg _sourceCodes is the map of input files to source code strings
Json::Value assemblyJSON(StringMap const& _sourceCodes = StringMap()) const

4
libsolidity/codegen/CompilerContext.h
View File

@ -209,9 +209,9 @@ public:
eth::Assembly& nonConstAssembly() { return *m_asm; }
/// @arg _sourceCodes is the map of input files to source code strings
void assemblyStream(std::ostream& _stream, StringMap const& _sourceCodes = StringMap()) const
std::string assemblyString(StringMap const& _sourceCodes = StringMap()) const
{
m_asm->assemblyStream(_stream, "", _sourceCodes);
return m_asm->assemblyString(_sourceCodes);
}
/// @arg _sourceCodes is the map of input files to source code strings

4
libsolidity/interface/AssemblyStack.cpp
View File

@ -91,9 +91,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
eth::Assembly assembly;
assembly::CodeGenerator::assemble(*m_parserResult, *m_analysisInfo, assembly);
object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble());
ostringstream tmp;
assembly.assemblyStream(tmp);
object.assembly = tmp.str();
object.assembly = assembly.assemblyString();
return object;
}
case Machine::EVM15:

9
libsolidity/interface/CompilerStack.cpp
View File

@ -347,15 +347,14 @@ eth::LinkerObject const& CompilerStack::cloneObject(string const& _contractName)
return contract(_contractName).cloneObject;
}
void CompilerStack::assemblyStream(ostream& _outStream, string const& _contractName, StringMap _sourceCodes) const
/// FIXME: cache this string
string CompilerStack::assemblyString(string const& _contractName, StringMap _sourceCodes) const
{
Contract const& currentContract = contract(_contractName);
if (currentContract.compiler)
currentContract.compiler->assemblyStream(_outStream, _sourceCodes);
return currentContract.compiler->assemblyString(_sourceCodes);
else
{
_outStream << "Contract not fully implemented" << endl;
}
return string();
}
/// FIXME: cache the JSON

4
libsolidity/interface/CompilerStack.h
View File

@ -190,10 +190,10 @@ public:
/// if the contract does not (yet) have bytecode.
std::string const* runtimeSourceMapping(std::string const& _contractName = "") const;
/// Streams a verbose version of the assembly to @a _outStream.
/// @return a verbose text representation of the assembly.
/// @arg _sourceCodes is the map of input files to source code strings
/// Prerequisite: Successful compilation.
void assemblyStream(std::ostream& _outStream, std::string const& _contractName = "", StringMap _sourceCodes = StringMap()) const;
std::string assemblyString(std::string const& _contractName = "", StringMap _sourceCodes = StringMap()) const;
/// @returns a JSON representation of the assembly.
/// @arg _sourceCodes is the map of input files to source code strings

4
libsolidity/interface/StandardCompiler.cpp
View File

@ -400,9 +400,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
// EVM
Json::Value evmData(Json::objectValue);
// @TODO: add ir
ostringstream tmp;
m_compilerStack.assemblyStream(tmp, contractName, createSourceList(_input));
evmData["assembly"] = tmp.str();
evmData["assembly"] = m_compilerStack.assemblyString(contractName, createSourceList(_input));
evmData["legacyAssembly"] = m_compilerStack.assemblyJSON(contractName, createSourceList(_input));
evmData["methodIdentifiers"] = m_compilerStack.methodIdentifiers(contractName);
evmData["gasEstimates"] = m_compilerStack.gasEstimates(contractName);

7
solc/CommandLineInterface.cpp
View File

@ -1156,9 +1156,8 @@ void CommandLineInterface::outputCompilationResults()
}
else
{
stringstream data;
m_compiler->assemblyStream(data, contract, m_sourceCodes);
createFile(m_compiler->filesystemFriendlyName(contract) + ".evm", data.str());
string ret = m_compiler->assemblyString(contract, m_sourceCodes);
createFile(m_compiler->filesystemFriendlyName(contract) + ".evm", ret));
}
}
else
@ -1167,7 +1166,7 @@ void CommandLineInterface::outputCompilationResults()
if (m_args.count(g_argAsmJson)
cout << m_compiler->assemblyJSON(contract, m_sourceCodes);
else
m_compiler->assemblyStream(cout, contract, m_sourceCodes);
cout << m_compiler->assemblyString(contract, m_sourceCodes);
}
}