From 0b893fd30938f3bc1ab65e66ab440eeec34e81f6 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 29 Jul 2014 20:25:42 +0200
Subject: [PATCH] Other dumps.

---
 eth/main.cpp | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index 0f351c136..8f741106a 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -47,6 +47,8 @@ using namespace boost::algorithm;
 using eth::Instruction;
 using eth::c_instructionInfo;
 
+#undef RETURN
+
 bool isTrue(std::string const& _m)
 {
 	return _m == "on" || _m == "yes" || _m == "true" || _m == "1";
@@ -582,19 +584,38 @@ int main(int argc, char** argv)
 				state = state.fromPending(index);
 				bytes r = t.rlp();
 				e.setup(&r);
-				e.go([&](uint64_t steps, Instruction instr, unsigned newMemSize, bigint gasCost, void* vvm, void const* vextVM)
-				{
-					eth::VM* vm = (VM*)vvm;
-					eth::ExtVM const* ext = (ExtVM const*)vextVM;
-					f << endl << "    STACK" << endl;
-					for (auto i: vm->stack())
-						f << (h256)i << endl;
-					f << "    MEMORY" << endl << eth::memDump(vm->memory());
-					f << "    STORAGE" << endl;
-					for (auto const& i: ext->state().storage(ext->myAddress))
-						f << showbase << hex << i.first << ": " << i.second << endl;
-					f << dec << ext->level << " | " << ext->myAddress << " | #" << steps << " | " << hex << setw(4) << setfill('0') << vm->curPC() << " : " << c_instructionInfo.at(instr).name << " | " << dec << vm->gas() << " | -" << dec << gasCost << " | " << newMemSize << "x32";
-				});
+
+				if (format == "pretty")
+					e.go([&](uint64_t steps, Instruction instr, unsigned newMemSize, bigint gasCost, void* vvm, void const* vextVM)
+					{
+						eth::VM* vm = (VM*)vvm;
+						eth::ExtVM const* ext = (ExtVM const*)vextVM;
+						f << endl << "    STACK" << endl;
+						for (auto i: vm->stack())
+							f << (h256)i << endl;
+						f << "    MEMORY" << endl << eth::memDump(vm->memory());
+						f << "    STORAGE" << endl;
+						for (auto const& i: ext->state().storage(ext->myAddress))
+							f << showbase << hex << i.first << ": " << i.second << endl;
+						f << dec << ext->level << " | " << ext->myAddress << " | #" << steps << " | " << hex << setw(4) << setfill('0') << vm->curPC() << " : " << c_instructionInfo.at(instr).name << " | " << dec << vm->gas() << " | -" << dec << gasCost << " | " << newMemSize << "x32";
+					});
+				else if (format == "standard")
+					e.go([&](uint64_t, Instruction instr, unsigned, bigint, void* vvm, void const* vextVM)
+					{
+						eth::VM* vm = (VM*)vvm;
+						eth::ExtVM const* ext = (ExtVM const*)vextVM;
+						f << ext->myAddress << " " << hex << toHex(eth::toCompactBigEndian(vm->curPC(), 1)) << " " << hex << toHex(eth::toCompactBigEndian((int)(byte)instr, 1)) << " " << hex << toHex(eth::toCompactBigEndian((uint64_t)vm->gas(), 1)) << endl;
+					});
+				else if (format == "standard+")
+					e.go([&](uint64_t, Instruction instr, unsigned, bigint, void* vvm, void const* vextVM)
+					{
+						eth::VM* vm = (VM*)vvm;
+						eth::ExtVM const* ext = (ExtVM const*)vextVM;
+						if (instr == Instruction::STOP || instr == Instruction::RETURN || instr == Instruction::SUICIDE)
+							for (auto const& i: ext->state().storage(ext->myAddress))
+								f << toHex(eth::toCompactBigEndian(i.first, 1)) << " " << toHex(eth::toCompactBigEndian(i.second, 1)) << endl;
+						f << ext->myAddress << " " << hex << toHex(eth::toCompactBigEndian(vm->curPC(), 1)) << " " << hex << toHex(eth::toCompactBigEndian((int)(byte)instr, 1)) << " " << hex << toHex(eth::toCompactBigEndian((uint64_t)vm->gas(), 1)) << endl;
+					});
 			}
 			else if (cmd == "inspect")
 			{