91d90
< stage1Te.N = stage2Te->N;
98c97
< stage1Te.vpn = s1Req->getVaddr() / (stage2Te->size+1);
---
> stage1Te.vpn = s1Req->getVaddr() >> stage2Te->N;
100a100
> stage1Te.N = stage2Te->N;
106,107c106,108
< stage1Te.pfn = (stage2Te->pfn * ((stage2Te->size+1) / (stage1Te.size+1))) +
< (stage2Te->vpn / (stage1Te.size+1));
---
> const Addr pa = (stage2Te->pfn << stage2Te->N);
> const Addr ipa = (stage1Te.pfn << stage1Te.N);
> stage1Te.pfn = (pa | (ipa & mask(stage2Te->N))) >> stage1Te.N;