From: Martin Perner <martin@perner.cc>
Date: Tue, 2 Nov 2010 14:17:03 +0000 (+0100)
Subject: sim: bugfix/feature @ help/status
X-Git-Tag: bootrom_v1~190
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=7288f6840dfa13178a5ef53831f0673fce962911;p=calu.git

sim: bugfix/feature @ help/status
---

diff --git a/3b_sim/sim.cpp b/3b_sim/sim.cpp
index 55be21d..764f216 100644
--- a/3b_sim/sim.cpp
+++ b/3b_sim/sim.cpp
@@ -60,7 +60,7 @@ class CHelpExec
 		{
 			cout << "Available commands: " << endl;
 			for(auto iter = m_completers.begin(); iter != m_completers.end(); ++iter) {
-				cout << setw(15) << (*iter).get<0>() << ": " << (*iter).get<2>() << endl;
+				cout << setw(19) << setfill(' ') << (*iter).get<0>() << ": " << (*iter).get<2>() << endl;
 			}
 		}
 };
@@ -389,7 +389,7 @@ void printStatus(const vector<string>&)
 {
 	CDat stackp = global_cpu->getStack();
 	CDat stackd = global_cpu->getRAM(stackp);
-	cout << "Stack pointer: " << stackp << " @stackpointer: " << stackd << endl;
+	cout << "Stack pointer: 0x" << std::hex << setw(8) << setfill('0') << stackp << " @stackpointer: 0x" << setw(8) << stackd << std::dec << " (" << stackd << ")" << endl;
 	cout << "PSW: 0x" << std::hex << setw(8) << setfill('0') << global_cpu->getFlags() << std::dec << endl;
 	cout << "cur PC: 0x" << std::hex << setw(8) << setfill('0') << global_cpu->getCurPC() << " next PC: 0x" << setw(8) << setfill('0') << global_cpu->getNextPC() << std::dec << endl;