[Avida-cvs] [Avida2-svn] r403 - in development: Avida.xcodeproj source/cpu source/viewer

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2005-11-17 16:32:54 -0500 (Thu, 17 Nov 2005)
New Revision: 403

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/cpu/cHardwareCPU.h
   development/source/viewer/cStatsScreen.h
   development/source/viewer/cZoomScreen.cc
Log:
Update ZoomView to handle some of the changes from the standardized CPU interface.

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2005-11-17 21:14:48 UTC (rev 402)
+++ development/Avida.xcodeproj/project.pbxproj	2005-11-17 21:32:54 UTC (rev 403)
@@ -772,7 +772,7 @@
 		DCC315CF076253A5008F7A48 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		DCC315D0076253A5008F7A48 /* task_event_gen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.cc; sourceTree = "<group>"; };
 		DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.old.cc; sourceTree = "<group>"; };
-		DCC3164D07626CF3008F7A48 /* primitive */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = primitive; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCC3164D07626CF3008F7A48 /* primitive */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = primitive; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

Modified: development/source/cpu/cHardwareCPU.h
===================================================================
--- development/source/cpu/cHardwareCPU.h	2005-11-17 21:14:48 UTC (rev 402)
+++ development/source/cpu/cHardwareCPU.h	2005-11-17 21:32:54 UTC (rev 403)
@@ -181,7 +181,7 @@
   
   // Non-Standard Methods
   
-  int GetActiveStack(int stack_id) const { return threads[cur_thread].cur_stack; }
+  int GetActiveStack() const { return threads[cur_thread].cur_stack; }
   bool GetMalActive() const   { return mal_active; }
   
   

Modified: development/source/viewer/cStatsScreen.h
===================================================================
--- development/source/viewer/cStatsScreen.h	2005-11-17 21:14:48 UTC (rev 402)
+++ development/source/viewer/cStatsScreen.h	2005-11-17 21:32:54 UTC (rev 403)
@@ -21,7 +21,7 @@
   int task_cols;
 public:
   cStatsScreen(cWorld* world, int y_size, int x_size, int y_start, int x_start, cViewInfo& in_info)
-    : m_world(world), cScreen(y_size, x_size, y_start, x_start, in_info), task_offset(0)
+    : cScreen(y_size, x_size, y_start, x_start, in_info), m_world(world), task_offset(0)
   {
     task_rows = Height() - 16;
     task_cols = Width() / 20;

Modified: development/source/viewer/cZoomScreen.cc
===================================================================
--- development/source/viewer/cZoomScreen.cc	2005-11-17 21:14:48 UTC (rev 402)
+++ development/source/viewer/cZoomScreen.cc	2005-11-17 21:32:54 UTC (rev 403)
@@ -720,10 +720,10 @@
   Print(10, 43, "%2d/%2d", hardware4Stack.GetCurThread() + 1,
         hardware4Stack.GetNumThreads());
   
-  Print(12, 34, "%14d", hardware4Stack.Stack(0).Top());
-  Print(13, 34, "%14d", hardware4Stack.Stack(1).Top());
-  Print(14, 34, "%14d", hardware4Stack.Stack(2).Top());
-  Print(15, 34, "%14d", hardware4Stack.Stack(3).Top());
+  Print(12, 34, "%14d", hardware4Stack.GetStack(0, 0));
+  Print(13, 34, "%14d", hardware4Stack.GetStack(0, 1));
+  Print(14, 34, "%14d", hardware4Stack.GetStack(0, 2));
+  Print(15, 34, "%14d", hardware4Stack.GetStack(0, 3));
   
   cHeadMultiMem inst_ptr(hardware4Stack.IP());
   const cInstSet & inst_set = hardware4Stack.GetInstSet();
@@ -756,11 +756,11 @@
   Print(10, 43, "%2d/%2d", hardware4Stack.GetCurThread() + 1,
         hardware4Stack.GetNumThreads());
   
-  Print(12, 34, "%14d", hardware4Stack.Stack(0).Top());
-  Print(13, 34, "%14d", hardware4Stack.Stack(1).Top());
-  Print(14, 34, "%14d", hardware4Stack.Stack(2).Top());
-  Print(15, 34, "%14d", hardware4Stack.Stack(3).Top());
-  
+  Print(12, 34, "%14d", hardware4Stack.GetStack(0, 0));
+  Print(13, 34, "%14d", hardware4Stack.GetStack(0, 1));
+  Print(14, 34, "%14d", hardware4Stack.GetStack(0, 2));
+  Print(15, 34, "%14d", hardware4Stack.GetStack(0, 3));
+    
   cHeadMultiMem inst_ptr(hardware4Stack.IP());
   const cInstSet & inst_set = hardware4Stack.GetInstSet();
   
@@ -995,7 +995,7 @@
   // Place the stacks onto the screen.
   SetBoldColor(COLOR_CYAN);
   for (int i = 0; i < 4; i++) {
-    Print(REG_Y+2 + i, REG_X+6, "%11d", hardware4Stack.Stack(i, cur_view_thread).Top());
+    Print(REG_Y+2 + i, REG_X+6, "%11d", hardware4Stack.GetStack(0, i, cur_view_thread));
   }
   
   // Place the active stack onto the screen.
@@ -1138,7 +1138,7 @@
   // Place the stacks onto the screen.
   SetBoldColor(COLOR_CYAN);
   for (int i = 0; i < 4; i++) {
-    Print(REG_Y+2 + i, REG_X+6, "%11d", hardware4Stack.Stack(i, cur_view_thread).Top());
+    Print(REG_Y+2 + i, REG_X+6, "%11d", hardware4Stack.GetStack(0, i, cur_view_thread));
   }
   
   // Place the active stack onto the screen.