Initial light-weight OoO CPU checkin, along with gcc-3.4 fixes.

SConscript:
    Include new files.
arch/alpha/isa_desc:
    Make the eaCompPtr and memAccPtr non-const so that execute() can be called on them.
arch/alpha/isa_traits.hh:
    Add enum for total number of data registers.
arch/isa_parser.py:
base/traceflags.py:
    Include new light-weight OoO CPU model.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
    Changes to abstract more away from the base dyn inst class.
cpu/beta_cpu/2bit_local_pred.cc:
cpu/beta_cpu/2bit_local_pred.hh:
cpu/beta_cpu/tournament_pred.cc:
cpu/beta_cpu/tournament_pred.hh:
    Remove redundant SatCounter class.
cpu/beta_cpu/alpha_dyn_inst.cc:
cpu/beta_cpu/alpha_full_cpu.cc:
cpu/beta_cpu/alpha_full_cpu.hh:
cpu/beta_cpu/bpred_unit.cc:
cpu/beta_cpu/inst_queue.cc:
cpu/beta_cpu/mem_dep_unit.cc:
cpu/beta_cpu/ras.cc:
cpu/beta_cpu/rename_map.cc:
cpu/beta_cpu/rename_map.hh:
cpu/beta_cpu/rob.cc:
    Fix for gcc-3.4
cpu/beta_cpu/alpha_dyn_inst.hh:
cpu/beta_cpu/alpha_dyn_inst_impl.hh:
    Fixes for gcc-3.4.
    Include more variables and functions that are specific to AlphaDynInst which were once in BaseDynInst.
cpu/beta_cpu/alpha_full_cpu_builder.cc:
    Make params match the current params inherited from BaseCPU.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
    Fixes for gcc-3.4
cpu/beta_cpu/full_cpu.cc:
    Use new params pointer in BaseCPU.
    Fix for gcc-3.4.
cpu/beta_cpu/full_cpu.hh:
    Use new params class from BaseCPU.
cpu/beta_cpu/iew_impl.hh:
    Remove unused function.
cpu/simple_cpu/simple_cpu.cc:
    Remove unused global variable.
cpu/static_inst.hh:
    Include OoODynInst for new lightweight OoO CPU

--HG--
extra : convert_revision : 34d9f2e64ca0313377391e0d059bf09c040286fa

1 files changed, 4 insertions, 49 deletions

diff --git a/cpu/beta_cpu/2bit_local_pred.hh b/cpu/beta_cpu/2bit_local_pred.hh
index 32a7972d0..cda7d3e65 100644
--- a/cpu/beta_cpu/2bit_local_pred.hh
+++ b/cpu/beta_cpu/2bit_local_pred.hh
@@ -1,8 +1,9 @@
-#ifndef __2BIT_LOCAL_PRED_HH__
-#define __2BIT_LOCAL_PRED_HH__
+#ifndef __CPU_BETA_CPU_2BIT_LOCAL_PRED_HH__
+#define __CPU_BETA_CPU_2BIT_LOCAL_PRED_HH__
 
 // For Addr type.
 #include "arch/alpha/isa_traits.hh"
+#include "cpu/beta_cpu/sat_counter.hh"
 
 class DefaultBP
 {
@@ -34,52 +35,6 @@ class DefaultBP
 
     inline unsigned getLocalIndex(Addr &PC);
 
-    /**
-     * Private counter class for the internal saturating counters.
-     * Implements an n bit saturating counter and provides methods to
-     * increment, decrement, and read it.
-     * @todo Consider making this something that more closely mimics a
-     * built in class so you can use ++ or --.
-     */
-    class SatCounter
-    {
-      public:
-        /**
-         * Constructor for the counter.
-         * @param bits How many bits the counter will have.
-         */
-        SatCounter(unsigned bits);
-
-        /**
-         * Constructor for the counter.
-         * @param bits How many bits the counter will have.
-         * @param initial_val Starting value for each counter.
-         */
-        SatCounter(unsigned bits, unsigned initial_val);
-
-        /**
-         * Increments the counter's current value.
-         */
-        void increment();
-
-        /**
-         * Decrements the counter's current value.
-         */
-        void decrement();
-
-        /**
-         * Read the counter's value.
-         */
-        uint8_t read()
-        {
-            return counter;
-        }
-
-      private:
-        uint8_t maxVal;
-        uint8_t counter;
-    };
-
     /** Array of counters that make up the local predictor. */
     SatCounter *localCtrs;
 
@@ -96,4 +51,4 @@ class DefaultBP
     unsigned indexMask;
 };
 
-#endif // __2BIT_LOCAL_PRED_HH__
+#endif // __CPU_BETA_CPU_2BIT_LOCAL_PRED_HH__