80c80
< bool lookup(Addr branch_addr, void * &bp_history);
---
> bool lookup(ThreadID tid, Addr branch_addr, void * &bp_history);
88c88
< void uncondBranch(Addr pc, void * &bp_history);
---
> void uncondBranch(ThreadID tid, Addr pc, void * &bp_history);
96c96
< void btbUpdate(Addr branch_addr, void * &bp_history);
---
> void btbUpdate(ThreadID tid, Addr branch_addr, void * &bp_history);
106c106,107
< void update(Addr branch_addr, bool taken, void *bp_history, bool squashed);
---
> void update(ThreadID tid, Addr branch_addr, bool taken, void *bp_history,
> bool squashed);
108c109
< void retireSquashed(void *bp_history);
---
> void retireSquashed(ThreadID tid, void *bp_history);
115c116
< void squash(void *bp_history);
---
> void squash(ThreadID tid, void *bp_history);
117c118
< unsigned getGHR(void *bp_history) const;
---
> unsigned getGHR(ThreadID tid, void *bp_history) const;
119,121d119
< /** Returns the global history. */
< inline unsigned readGlobalHist() { return globalHistory; }
<
137c135
< inline void updateGlobalHistTaken();
---
> inline void updateGlobalHistTaken(ThreadID tid);
140c138
< inline void updateGlobalHistNotTaken();
---
> inline void updateGlobalHistNotTaken(ThreadID tid);
214c212
< unsigned globalHistory;
---
> std::vector<unsigned> globalHistory;