Fix up code for initial release. The main bug that remains is properly forwarding data from stores to loads, specifically when they are of differing sizes.

cpu/base_dyn_inst.cc:
    Remove unused commented out code.
cpu/base_dyn_inst.hh:
    Fix up comments.
cpu/beta_cpu/2bit_local_pred.cc:
    Reorder code to match header file.
cpu/beta_cpu/2bit_local_pred.hh:
    Update comments.
cpu/beta_cpu/alpha_dyn_inst.hh:
    Remove useless comments.
cpu/beta_cpu/alpha_dyn_inst_impl.hh:
cpu/beta_cpu/alpha_full_cpu_impl.hh:
cpu/beta_cpu/comm.hh:
cpu/beta_cpu/iew_impl.hh:
    Remove unused commented code.
cpu/beta_cpu/alpha_full_cpu.hh:
    Remove obsolete comment.
cpu/beta_cpu/alpha_impl.hh:
cpu/beta_cpu/full_cpu.hh:
    Alphabetize includes.
cpu/beta_cpu/bpred_unit.hh:
    Remove unused global history code.
cpu/beta_cpu/btb.hh:
cpu/beta_cpu/free_list.hh:
    Use full path in #defines.
cpu/beta_cpu/commit.hh:
cpu/beta_cpu/decode.hh:
    Reorder functions.
cpu/beta_cpu/commit_impl.hh:
    Remove obsolete commented code.
cpu/beta_cpu/fetch.hh:
    Remove obsolete comments.
cpu/beta_cpu/fetch_impl.hh:
cpu/beta_cpu/rename_impl.hh:
    Remove commented code.
cpu/beta_cpu/full_cpu.cc:
    Remove useless defines.
cpu/beta_cpu/inst_queue.hh:
    Use full path for #defines.
cpu/beta_cpu/inst_queue_impl.hh:
    Reorder functions to match header file.
cpu/beta_cpu/mem_dep_unit.hh:
    Use full path name for #defines.
cpu/beta_cpu/ras.hh:
    Use full path names for #defines.  Remove mod operation.
cpu/beta_cpu/regfile.hh:
    Remove unused commented code, fix up current comments.
cpu/beta_cpu/tournament_pred.cc:
cpu/beta_cpu/tournament_pred.hh:
    Update programming style.

--HG--
extra : convert_revision : fb9d18a853f58a1108ff827e3c123d5b52a0608a

1 files changed, 15 insertions, 15 deletions

diff --git a/cpu/beta_cpu/tournament_pred.hh b/cpu/beta_cpu/tournament_pred.hh
index 1512abc78..563da6f23 100644
--- a/cpu/beta_cpu/tournament_pred.hh
+++ b/cpu/beta_cpu/tournament_pred.hh
@@ -37,7 +37,7 @@ class TournamentBP
      */
     void update(Addr &branch_addr, unsigned global_history, bool taken);
 
-    inline unsigned readGlobalHist() { return global_history; }
+    inline unsigned readGlobalHist() { return globalHistory; }
 
   private:
 
@@ -50,56 +50,56 @@ class TournamentBP
     inline void updateHistoriesNotTaken(unsigned local_history_idx);
 
     /** Local counters. */
-    SatCounter *local_ctrs;
+    SatCounter *localCtrs;
 
     /** Size of the local predictor. */
-    unsigned local_predictor_size;
+    unsigned localPredictorSize;
 
     /** Number of bits of the local predictor's counters. */
-    unsigned local_ctr_bits;
+    unsigned localCtrBits;
 
     /** Array of local history table entries. */
-    unsigned *local_history_table;
+    unsigned *localHistoryTable;
 
     /** Size of the local history table. */
-    unsigned local_history_table_size;
+    unsigned localHistoryTableSize;
 
     /** Number of bits for each entry of the local history table.
      *  @todo Doesn't this come from the size of the local predictor?
      */
-    unsigned local_history_bits;
+    unsigned localHistoryBits;
 
     /** Mask to get the proper local history. */
     unsigned localHistoryMask;
 
 
     /** Array of counters that make up the global predictor. */
-    SatCounter *global_ctrs;
+    SatCounter *globalCtrs;
 
     /** Size of the global predictor. */
-    unsigned global_predictor_size;
+    unsigned globalPredictorSize;
 
     /** Number of bits of the global predictor's counters. */
-    unsigned global_ctr_bits;
+    unsigned globalCtrBits;
 
     /** Global history register. */
-    unsigned global_history;
+    unsigned globalHistory;
 
     /** Number of bits for the global history. */
-    unsigned global_history_bits;
+    unsigned globalHistoryBits;
 
     /** Mask to get the proper global history. */
     unsigned globalHistoryMask;
 
 
     /** Array of counters that make up the choice predictor. */
-    SatCounter *choice_ctrs;
+    SatCounter *choiceCtrs;
 
     /** Size of the choice predictor (identical to the global predictor). */
-    unsigned choice_predictor_size;
+    unsigned choicePredictorSize;
 
     /** Number of bits of the choice predictor's counters. */
-    unsigned choice_ctr_bits;
+    unsigned choiceCtrBits;
 
     /** Number of bits to shift the instruction over to get rid of the word
      *  offset.