60,66c60,67
< void uncondBranch(Addr pc, void * &bp_history);
< void squash(void *bp_history);
< bool lookup(Addr branch_addr, void * &bp_history);
< void btbUpdate(Addr branch_addr, void * &bp_history);
< void update(Addr branch_addr, bool taken, void *bp_history, bool squashed);
< void retireSquashed(void *bp_history);
< unsigned getGHR(void *bp_history) const;
---
> void uncondBranch(ThreadID tid, Addr pc, void * &bp_history);
> void squash(ThreadID tid, void *bp_history);
> bool lookup(ThreadID tid, Addr branch_addr, void * &bp_history);
> void btbUpdate(ThreadID tid, Addr branch_addr, void * &bp_history);
> void update(ThreadID tid, Addr branch_addr, bool taken, void *bp_history,
> bool squashed);
> void retireSquashed(ThreadID tid, void *bp_history);
> unsigned getGHR(ThreadID tid, void *bp_history) const;
69c70
< void updateGlobalHistReg(bool taken);
---
> void updateGlobalHistReg(ThreadID tid, bool taken);
98c99
< unsigned globalHistoryReg;
---
> std::vector<unsigned> globalHistoryReg;