From 1574f3a60d5382cc8b8d716f452320e0ff657fd9 Mon Sep 17 00:00:00 2001
From: cdkersey <chad.d.kersey@gmail.com>
Date: Mon, 11 Nov 2013 14:57:27 -0500
Subject: [PATCH] Hexadecimal register numbers are confusing.

---
 src/core.cpp        | 2 +-
 src/instruction.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core.cpp b/src/core.cpp
index 3835ef50..23cc87aa 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -117,7 +117,7 @@ void Core::step() {
   if (USE_DEBUG >= 3) {
     D(3, "Register state:");
     for (unsigned i = 0; i < reg[0].size(); ++i) {
-      D_RAW("  %r" << i << ':');
+      D_RAW(dec << "  %r" << i << ':');
       for (unsigned j = 0; j < reg.size(); ++j) 
         D_RAW(' ' << hex << reg[j][i] << ' ');
       D_RAW('(' << shadowReg[i] << ')' << endl);
diff --git a/src/instruction.cpp b/src/instruction.cpp
index a2c70892..aaddb5d4 100644
--- a/src/instruction.cpp
+++ b/src/instruction.cpp
@@ -84,6 +84,8 @@ Instruction::InstTableEntry Instruction::instTable[] = {
 };
 
 ostream &Harp::operator<<(ostream& os, Instruction &inst) {
+  os << dec;
+
   if (inst.predicated) {
     os << "@p" << inst.pred << " ? ";
   }