[Avida-cvs] [avida-svn] r937 - development/source/cpu

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2006-09-10 13:56:04 -0400 (Sun, 10 Sep 2006)
New Revision: 937

Modified:
   development/source/cpu/cHardwareCPU.cc
Log:
Adjust cHardwareCPU::PrintStatus to handle variable numbers of registers.

Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc	2006-09-09 21:53:48 UTC (rev 936)
+++ development/source/cpu/cHardwareCPU.cc	2006-09-10 17:56:04 UTC (rev 937)
@@ -615,20 +615,14 @@
 
 void cHardwareCPU::PrintStatus(ostream& fp)
 {
-  fp << organism->GetPhenotype().GetTimeUsed() << " "
-  << "IP:" << IP().GetPosition() << "    "
+  fp << organism->GetPhenotype().GetTimeUsed() << " " << "IP:" << IP().GetPosition() << "    ";
   
-  << "AX:" << GetRegister(REG_AX) << " "
-  << setbase(16) << "[0x" << GetRegister(REG_AX) << "]  " << setbase(10)
+  for (int i = 0; i < NUM_REGISTERS; i++) {
+    fp << static_cast<char>('A' + i) << "X:" << GetRegister(i) << " ";
+    fp << setbase(16) << "[0x" << GetRegister(i) << "]  " << setbase(10);
+  }
+  fp << endl;
   
-  << "BX:" << GetRegister(REG_BX) << " "
-  << setbase(16) << "[0x" << GetRegister(REG_BX) << "]  " << setbase(10)
-  
-  << "CX:" << GetRegister(REG_CX) << " "
-  << setbase(16) << "[0x" << GetRegister(REG_CX) << "]" << setbase(10)
-  
-  << endl;
-  
   fp << "  R-Head:" << GetHead(nHardware::HEAD_READ).GetPosition() << " "
     << "W-Head:" << GetHead(nHardware::HEAD_WRITE).GetPosition()  << " "
     << "F-Head:" << GetHead(nHardware::HEAD_FLOW).GetPosition()   << "  "