diff --git a/src/cpu/pred/sat_counter.hh b/src/base/sat_counter.hh similarity index 97% rename from src/cpu/pred/sat_counter.hh rename to src/base/sat_counter.hh index 513419a059..342a3382f0 100644 --- a/src/cpu/pred/sat_counter.hh +++ b/src/base/sat_counter.hh @@ -41,8 +41,8 @@ * Daniel Carvalho */ -#ifndef __CPU_PRED_SAT_COUNTER_HH__ -#define __CPU_PRED_SAT_COUNTER_HH__ +#ifndef __BASE_SAT_COUNTER_HH__ +#define __BASE_SAT_COUNTER_HH__ #include @@ -127,4 +127,4 @@ class SatCounter uint8_t counter; }; -#endif // __CPU_PRED_SAT_COUNTER_HH__ +#endif // __BASE_SAT_COUNTER_HH__ diff --git a/src/cpu/pred/2bit_local.hh b/src/cpu/pred/2bit_local.hh index ef52974b75..636620a34f 100644 --- a/src/cpu/pred/2bit_local.hh +++ b/src/cpu/pred/2bit_local.hh @@ -46,9 +46,9 @@ #include +#include "base/sat_counter.hh" #include "base/types.hh" #include "cpu/pred/bpred_unit.hh" -#include "cpu/pred/sat_counter.hh" #include "params/LocalBP.hh" /** diff --git a/src/cpu/pred/bi_mode.hh b/src/cpu/pred/bi_mode.hh index f28fdc9262..40909554b7 100644 --- a/src/cpu/pred/bi_mode.hh +++ b/src/cpu/pred/bi_mode.hh @@ -35,8 +35,8 @@ #ifndef __CPU_PRED_BI_MODE_PRED_HH__ #define __CPU_PRED_BI_MODE_PRED_HH__ +#include "base/sat_counter.hh" #include "cpu/pred/bpred_unit.hh" -#include "cpu/pred/sat_counter.hh" #include "params/BiModeBP.hh" /** diff --git a/src/cpu/pred/tournament.hh b/src/cpu/pred/tournament.hh index 7b16e72242..76de16d7e8 100644 --- a/src/cpu/pred/tournament.hh +++ b/src/cpu/pred/tournament.hh @@ -47,9 +47,9 @@ #include +#include "base/sat_counter.hh" #include "base/types.hh" #include "cpu/pred/bpred_unit.hh" -#include "cpu/pred/sat_counter.hh" #include "params/TournamentBP.hh" /**