41,42c41,42
< namespace SparcISA
< {
---
> namespace SparcISA {
>
57,58c57,65
< const TteTag &operator=(uint64_t e) { populated = true;
< entry = e; return *this; }
---
>
> const TteTag &
> operator=(uint64_t e)
> {
> populated = true;
> entry = e;
> return *this;
> }
>
79d85
<
81c87,89
< PageTableEntry() : entry(0), type(invalid), populated(false) {}
---
> PageTableEntry()
> : entry(0), type(invalid), populated(false)
> {}
85d92
<
116c123,124
< void clear()
---
> void
> clear()
123d130
<
125,126c132,138
< const PageTableEntry &operator=(uint64_t e) { populated = true;
< entry4u = e; return *this; }
---
> const PageTableEntry &
> operator=(uint64_t e)
> {
> populated = true;
> entry4u = e;
> return *this;
> }
128,129c140,147
< const PageTableEntry &operator=(const PageTableEntry &e)
< { populated = true; entry4u = e.entry4u; type = e.type; return *this; }
---
> const PageTableEntry &
> operator=(const PageTableEntry &e)
> {
> populated = true;
> entry4u = e.entry4u;
> type = e.type;
> return *this;
> }
131,148c149,178
< bool valid() const { return bits(entry4u,63,63) && populated; }
< uint8_t _size() const { assert(populated);
< return bits(entry4u, 62,61) |
< bits(entry4u, 48,48) << 2; }
< Addr size() const { assert(_size() < 6); return pageSizes[_size()]; }
< Addr sizeMask() const { assert(_size() < 6); return pageSizes[_size()]-1;}
< bool ie() const { return bits(entry4u, 59,59); }
< Addr pfn() const { assert(populated); return bits(entry4u,39,13); }
< Addr paddr() const { assert(populated); return mbits(entry4u, 39,13);}
< bool locked() const { assert(populated); return bits(entry4u,6,6); }
< bool cv() const { assert(populated); return bits(entry4u,4,4); }
< bool cp() const { assert(populated); return bits(entry4u,5,5); }
< bool priv() const { assert(populated); return bits(entry4u,2,2); }
< bool writable() const { assert(populated); return bits(entry4u,1,1); }
< bool nofault() const { assert(populated); return bits(entry4u,60,60); }
< bool sideffect() const { assert(populated); return bits(entry4u,3,3); }
< Addr paddrMask() const { assert(populated);
< return mbits(entry4u, 39,13) & ~sizeMask(); }
---
> bool valid() const { return bits(entry4u,63,63) && populated; }
>
> uint8_t
> _size() const
> {
> assert(populated);
> return bits(entry4u, 62,61) | bits(entry4u, 48,48) << 2;
> }
>
> Addr size() const { assert(_size() < 6); return pageSizes[_size()]; }
> Addr sizeMask() const { return size() - 1; }
> bool ie() const { return bits(entry4u, 59,59); }
> Addr pfn() const { assert(populated); return bits(entry4u,39,13); }
> Addr paddr() const { assert(populated); return mbits(entry4u, 39,13);}
> bool locked() const { assert(populated); return bits(entry4u,6,6); }
> bool cv() const { assert(populated); return bits(entry4u,4,4); }
> bool cp() const { assert(populated); return bits(entry4u,5,5); }
> bool priv() const { assert(populated); return bits(entry4u,2,2); }
> bool writable() const { assert(populated); return bits(entry4u,1,1); }
> bool nofault() const { assert(populated); return bits(entry4u,60,60); }
> bool sideffect() const { assert(populated); return bits(entry4u,3,3); }
> Addr paddrMask() const { assert(populated); return paddr() & ~sizeMask(); }
>
> Addr
> translate(Addr vaddr) const
> {
> assert(populated);
> Addr mask = sizeMask();
> return (paddr() & ~mask) | (vaddr & mask);
> }
151c181,182
< struct TlbRange {
---
> struct TlbRange
> {
158c189,190
< inline bool operator<(const TlbRange &r2) const
---
> inline bool
> operator<(const TlbRange &r2) const
181c213,215
< inline bool operator==(const TlbRange &r2) const
---
>
> inline bool
> operator==(const TlbRange &r2) const
192c226,230
< struct TlbEntry {
---
> struct TlbEntry
> {
> TlbEntry()
> {}
>
218,219c256
< TlbEntry()
< {}
---
>
232d268
<
234a271
> } // namespace SparcISA
236,237d272
< }; // namespace SparcISA
<