62,64c62,63
< //4k. This value is not constant on x86.
< const int LogVMPageSize = 12;
< const int VMPageSize = (1 << LogVMPageSize);
---
> const Addr PageShift = 12;
> const Addr PageBytes = ULL(1) << PageShift;
66,70d64
< const int PageShift = 12;
< const int PageBytes = 1ULL << PageShift;
<
< const int BranchPredAddrShiftAmt = 0;
<