From c2fcac7c0dd8dff182cb262bdf35d5c67117aa42 Mon Sep 17 00:00:00 2001 From: Kevin Lim Date: Thu, 19 May 2005 01:28:25 -0400 Subject: 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 --- cpu/beta_cpu/ras.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpu/beta_cpu/ras.hh') diff --git a/cpu/beta_cpu/ras.hh b/cpu/beta_cpu/ras.hh index 7666f825f..51dab15e4 100644 --- a/cpu/beta_cpu/ras.hh +++ b/cpu/beta_cpu/ras.hh @@ -1,5 +1,5 @@ -#ifndef __RAS_HH__ -#define __RAS_HH__ +#ifndef __CPU_BETA_CPU_RAS_HH__ +#define __CPU_BETA_CPU_RAS_HH__ // For Addr type. #include "arch/alpha/isa_traits.hh" @@ -23,7 +23,7 @@ class ReturnAddrStack private: inline void incrTos() - { tos = (tos + 1) % numEntries; } + { if (++tos == numEntries) tos = 0; } inline void decrTos() { tos = (tos == 0 ? numEntries - 1 : tos - 1); } @@ -37,4 +37,4 @@ class ReturnAddrStack unsigned tos; }; -#endif // __RAS_HH__ +#endif // __CPU_BETA_CPU_RAS_HH__ -- cgit v1.2.3