141c141
< return ((pc_in) & ((ULL(1) << (logSizeBiMP)) - 1));
---
> return ((pc_in >> instShiftAmt) & ((ULL(1) << (logSizeBiMP)) - 1));
147c147,148
< return (((pc_in) & ((ULL(1) << (logSizeLoopPred - 2)) - 1)) << 2);
---
> return (((pc_in >> instShiftAmt) &
> ((ULL(1) << (logSizeLoopPred - 2)) - 1)) << 2);
174c175,176
< (pc) ^ ((pc) >> ((int) abs(tagTableSizes[bank] - bank) + 1)) ^
---
> (pc >> instShiftAmt) ^
> ((pc >> instShiftAmt) >> ((int) abs(tagTableSizes[bank] - bank) + 1)) ^
186,187c188,190
< int tag = (pc) ^ threadHistory[tid].computeTags[0][bank].comp
< ^ (threadHistory[tid].computeTags[1][bank].comp << 1);
---
> int tag = (pc >> instShiftAmt) ^
> threadHistory[tid].computeTags[0][bank].comp ^
> (threadHistory[tid].computeTags[1][bank].comp << 1);
242c245
< bi->loopTag = ((pc) >> (logSizeLoopPred - 2));
---
> bi->loopTag = ((pc) >> (instShiftAmt + logSizeLoopPred - 2));
633c636
< bool pathbit = ((branch_pc) & 1);
---
> bool pathbit = ((branch_pc >> instShiftAmt) & 1);