68,69c68,69
< bool valid() const {assert(populated); return !bits(entry,62,62); }
< Addr va() const {assert(populated); return bits(entry,41,0); }
---
> bool valid() const { assert(populated); return !bits(entry,62,62); }
> Addr va() const { assert(populated); return bits(entry,41,0); }
89,90c89
< PageTableEntry()
< : entry(0), type(invalid), populated(false)
---
> PageTableEntry() : entry(0), type(invalid), populated(false)
99c98,99
< void populate(uint64_t e, EntryType t = sun4u)
---
> void
> populate(uint64_t e, EntryType t = sun4u)
110,115c110,115
< entry4u |= mbits(entry,63,63); //valid
< entry4u |= bits(entry,1,0) << 61; //size[1:0]
< entry4u |= bits(entry,62,62) << 60; //nfo
< entry4u |= bits(entry,12,12) << 59; //ie
< entry4u |= bits(entry,2,2) << 48; //size[2]
< entry4u |= mbits(entry,39,13); //paddr
---
> entry4u |= mbits(entry,63,63); // valid
> entry4u |= bits(entry,1,0) << 61; // size[1:0]
> entry4u |= bits(entry,62,62) << 60; // nfo
> entry4u |= bits(entry,12,12) << 59; // ie
> entry4u |= bits(entry,2,2) << 48; // size[2]
> entry4u |= mbits(entry,39,13); // paddr
117,121c117,121
< entry4u |= bits(entry,10,10) << 5; //cp
< entry4u |= bits(entry,9,9) << 4; //cv
< entry4u |= bits(entry,11,11) << 3; //e
< entry4u |= bits(entry,8,8) << 2; //p
< entry4u |= bits(entry,6,6) << 1; //w
---
> entry4u |= bits(entry,10,10) << 5; // cp
> entry4u |= bits(entry,9,9) << 4; // cv
> entry4u |= bits(entry,11,11) << 3; // e
> entry4u |= bits(entry,8,8) << 2; // p
> entry4u |= bits(entry,6,6) << 1; // w
133a134
>
264c265,266
< Addr pageStart()
---
> Addr
> pageStart()