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

Merge pull request #2327 from ethereum/assembler-object

Browse Source 
Return assembler object in AssemblyStack
This commit is contained in:
chriseth 2017-06-14 14:28:06 +02:00 committed by GitHub
commit e232a105f0
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsolidity/interface/AssemblyStack.cpp
View File

@ -77,7 +77,7 @@ bool AssemblyStack::analyzeParsed()
return m_analysisSuccessful;
}
eth::LinkerObject AssemblyStack::assemble(Machine _machine) const
MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
{
solAssert(m_analysisSuccessful, "");
solAssert(m_parserResult, "");
@ -87,21 +87,29 @@ eth::LinkerObject AssemblyStack::assemble(Machine _machine) const
{
case Machine::EVM:
{
MachineAssemblyObject object;
eth::Assembly assembly;
assembly::CodeGenerator::assemble(*m_parserResult, *m_analysisInfo, assembly);
return assembly.assemble();
object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble());
ostringstream tmp;
assembly.stream(tmp);
object.assembly = tmp.str();
return object;
}
case Machine::EVM15:
{
MachineAssemblyObject object;
julia::EVMAssembly assembly(true);
julia::CodeTransform(assembly, *m_analysisInfo, true).run(*m_parserResult);
return assembly.finalize();
object.bytecode = make_shared<eth::LinkerObject>(assembly.finalize());
/// TOOD: fill out text representation
return object;
}
case Machine::eWasm:
solUnimplemented("eWasm backend is not yet implemented.");
}
// unreachable
return eth::LinkerObject();
return MachineAssemblyObject();
}
string AssemblyStack::print() const

8
libsolidity/interface/AssemblyStack.h
View File

@ -38,6 +38,12 @@ struct AsmAnalysisInfo;
struct Block;
}
struct MachineAssemblyObject
{
std::shared_ptr<eth::LinkerObject> bytecode;
std::string assembly;
};
/*
* Full assembly stack that can support EVM-assembly and JULIA as input and EVM, EVM1.5 and
* eWasm as output.
@ -64,7 +70,7 @@ public:
bool analyze(assembly::Block const& _block, Scanner const* _scanner = nullptr);
/// Run the assembly step (should only be called after parseAndAnalyze).
eth::LinkerObject assemble(Machine _machine) const;
MachineAssemblyObject assemble(Machine _machine) const;
/// @returns the errors generated during parsing, analysis (and potentially assembly).
ErrorList const& errors() const { return m_errors; }

20
solc/CommandLineInterface.cpp
View File

@ -1103,9 +1103,14 @@ bool CommandLineInterface::assemble(
"eWasm";
cout << endl << "======= " << src.first << " (" << machine << ") =======" << endl;
AssemblyStack& stack = assemblyStacks[src.first];
cout << endl << "Pretty printed source:" << endl;
cout << stack.print() << endl;
MachineAssemblyObject object;
try
{
cout << stack.assemble(_targetMachine).toHex() << endl;
object = stack.assemble(_targetMachine);
}
catch (Exception const& _exception)
{
@ -1117,7 +1122,18 @@ bool CommandLineInterface::assemble(
cerr << "Unknown exception while assembling." << endl;
return false;
}
cout << stack.print() << endl;
cout << endl << "Binary representation:" << endl;
if (object.bytecode)
cout << object.bytecode->toHex() << endl;
else
cerr << "No binary representation found." << endl;
cout << endl << "Text representation:" << endl;
if (!object.assembly.empty())
cout << object.assembly << endl;
else
cerr << "No text representation found." << endl;
}
return true;