From f0d213e6b56da5be8088008bf2ceadb7fd0030f7 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 29 May 2017 23:50:46 +0100 Subject: Introduce MachineAssemblyObject --- solc/CommandLineInterface.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index b2e257ee..e755c3b5 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -1082,9 +1082,10 @@ bool CommandLineInterface::assemble( "eWasm"; cout << endl << "======= " << src.first << " (" << machine << ") =======" << endl; AssemblyStack& stack = assemblyStacks[src.first]; + MachineAssemblyObject object; try { - cout << stack.assemble(_targetMachine).toHex() << endl; + object = stack.assemble(_targetMachine); } catch (Exception const& _exception) { @@ -1096,6 +1097,10 @@ bool CommandLineInterface::assemble( cerr << "Unknown exception while assembling." << endl; return false; } + if (object.bytecode) + cout << object.bytecode->toHex() << endl; + else + cerr << "No binary representation found." << endl; cout << stack.print() << endl; } -- cgit From ca92bda886740f7c59aaf44aaa8a15e25136c9dc Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 29 May 2017 23:58:03 +0100 Subject: Supply text representation of assembly --- solc/CommandLineInterface.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index e755c3b5..7509d1f2 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -1101,6 +1101,10 @@ bool CommandLineInterface::assemble( cout << object.bytecode->toHex() << endl; else cerr << "No binary representation found." << endl; + if (!object.assembly.empty()) + cout << object.assembly << endl; + else + cerr << "No text representation found." << endl; cout << stack.print() << endl; } -- cgit From 762bec9116d74a1022e4d06bd7112e4758a64b10 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 30 May 2017 00:12:38 +0100 Subject: Nicer machine output in CLI --- solc/CommandLineInterface.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 7509d1f2..a79f1633 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -1082,6 +1082,10 @@ 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 { @@ -1097,15 +1101,18 @@ bool CommandLineInterface::assemble( cerr << "Unknown exception while assembling." << endl; return false; } + + 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; - cout << stack.print() << endl; } return true; -- cgit