Merge zizzer:/bk/linux into zeep.eecs.umich.edu:/z/saidi/work/m5-linux

[gem5.git] / arch / alpha / pseudo_inst.cc

diff --git a/arch/alpha/pseudo_inst.cc b/arch/alpha/pseudo_inst.cc
index 50b7d1aafd5388396afd5bca937a27ede1175ab9..f4201ab09c94a3234134af8b1e3c198dcc9208b7 100644 (file)
--- a/arch/alpha/pseudo_inst.cc
+++ b/arch/alpha/pseudo_inst.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,15 +33,44 @@
 #include "sim/param.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_exit.hh"
-#include "sim/sim_stats.hh"
+#include "sim/stat_control.hh"
+#include "sim/stats.hh"
 
 using namespace std;
-using namespace Statistics;
+using namespace Stats;
 
 namespace AlphaPseudo
 {
     bool doStatisticsInsts;
     bool doCheckpointInsts;
+    bool doQuiesce;
+
+    void
+    arm(ExecContext *xc)
+    {
+        xc->kernelStats.arm();
+    }
+
+    void
+    quiesce(ExecContext *xc)
+    {
+        if (!doQuiesce)
+            return;
+
+        xc->suspend();
+        xc->kernelStats.quiesce();
+    }
+
+    void
+    ivlb(ExecContext *xc)
+    {
+        xc->kernelStats.ivlb();
+    }
+
+    void
+    ivle(ExecContext *xc)
+    {
+    }
 
     void
     m5exit_old(ExecContext *xc)
@@ -69,6 +98,7 @@ namespace AlphaPseudo
         Tick when = curTick + NS2Ticks(delay);
         Tick repeat = NS2Ticks(period);
 
+        using namespace Stats;
         SetupEvent(Reset, when, repeat);
     }
 
@@ -84,6 +114,7 @@ namespace AlphaPseudo
         Tick when = curTick + NS2Ticks(delay);
         Tick repeat = NS2Ticks(period);
 
+        using namespace Stats;
         SetupEvent(Dump, when, repeat);
     }
 
@@ -99,6 +130,7 @@ namespace AlphaPseudo
         Tick when = curTick + NS2Ticks(delay);
         Tick repeat = NS2Ticks(period);
 
+        using namespace Stats;
         SetupEvent(Dump|Reset, when, repeat);
     }
 
@@ -114,7 +146,7 @@ namespace AlphaPseudo
         Tick when = curTick + NS2Ticks(delay);
         Tick repeat = NS2Ticks(period);
 
-        SetupCheckpoint(when, repeat);
+        Checkpoint::setup(when, repeat);
     }
 
     class Context : public ParamContext
@@ -126,16 +158,20 @@ namespace AlphaPseudo
 
     Context context("PseudoInsts");
 
+    Param<bool> __quiesce(&context, "quiesce",
+                          "enable quiesce instructions",
+                          true);
     Param<bool> __statistics(&context, "statistics",
-                             "enable the statistics pseudo instructions",
-                             yes);
+                             "enable statistics pseudo instructions",
+                             true);
     Param<bool> __checkpoint(&context, "checkpoint",
-                             "enable the checkpoint pseudo instructions",
-                             yes);
+                             "enable checkpoint pseudo instructions",
+                             true);
 
     void
     Context::checkParams()
     {
+        doQuiesce = __quiesce;
         doStatisticsInsts = __statistics;
         doCheckpointInsts = __checkpoint;
     }