135c135
< Addr paddr;
---
> Addr _paddr;
142c142
< int size;
---
> int _size;
145c145
< Flags flags;
---
> Flags _flags;
158c158
< int asid;
---
> int _asid;
161c161
< Addr vaddr;
---
> Addr _vaddr;
166c166
< uint64_t extraData;
---
> uint64_t _extraData;
174c174
< Addr pc;
---
> Addr _pc;
177c177,180
< /** Minimal constructor. No fields are initialized. */
---
> /** Minimal constructor. No fields are initialized.
> * (Note that _flags and privateFlags are cleared by Flags
> * default constructor.)
> */
221c224
< setPhys(Addr _paddr, int _size, Flags _flags, Tick time)
---
> setPhys(Addr paddr, int size, Flags flags, Tick time)
223,225c226,228
< assert(_size >= 0);
< paddr = _paddr;
< size = _size;
---
> assert(size >= 0);
> _paddr = paddr;
> _size = size;
228,229c231,232
< flags.clear(~STICKY_FLAGS);
< flags.set(_flags);
---
> _flags.clear(~STICKY_FLAGS);
> _flags.set(flags);
235c238
< setPhys(Addr _paddr, int _size, Flags _flags)
---
> setPhys(Addr paddr, int size, Flags flags)
237c240
< setPhys(_paddr, _size, _flags, curTick);
---
> setPhys(paddr, size, flags, curTick);
245c248
< setVirt(int _asid, Addr _vaddr, int _size, Flags _flags, Addr _pc)
---
> setVirt(int asid, Addr vaddr, int size, Flags flags, Addr pc)
247,252c250,254
< assert(_size >= 0);
< asid = _asid;
< vaddr = _vaddr;
< size = _size;
< flags = _flags;
< pc = _pc;
---
> assert(size >= 0);
> _asid = asid;
> _vaddr = vaddr;
> _size = size;
> _pc = pc;
255,256c257,258
< flags.clear(~STICKY_FLAGS);
< flags.set(_flags);
---
> _flags.clear(~STICKY_FLAGS);
> _flags.set(flags);
268c270
< setPaddr(Addr _paddr)
---
> setPaddr(Addr paddr)
271c273
< paddr = _paddr;
---
> _paddr = paddr;
283c285
< assert(split_addr > vaddr && split_addr < vaddr + size);
---
> assert(split_addr > _vaddr && split_addr < _vaddr + _size);
288,290c290,292
< req1->size = split_addr - vaddr;
< req2->vaddr = split_addr;
< req2->size = size - req1->size;
---
> req1->_size = split_addr - _vaddr;
> req2->_vaddr = split_addr;
> req2->_size = _size - req1->_size;
306c308
< return paddr;
---
> return _paddr;
322c324
< return size;
---
> return _size;
345c347
< return flags;
---
> return _flags;
349c351
< setFlags(Flags _flags)
---
> setFlags(Flags flags)
352c354
< flags.set(_flags);
---
> _flags.set(flags);
360c362
< return vaddr;
---
> return _vaddr;
368c370
< return asid;
---
> return _asid;
376c378
< return flags & ASI_BITS;
---
> return _flags & ASI_BITS;
384c386
< return flags.isSet(MMAPED_IPR);
---
> return _flags.isSet(MMAPED_IPR);
391c393
< flags.set(MMAPED_IPR);
---
> _flags.set(MMAPED_IPR);
406c408
< return extraData;
---
> return _extraData;
411c413
< setExtraData(uint64_t _extraData)
---
> setExtraData(uint64_t extraData)
413c415
< extraData = _extraData;
---
> _extraData = extraData;
450c452
< return pc;
---
> return _pc;
454,460c456,462
< bool isUncacheable() const { return flags.isSet(UNCACHEABLE); }
< bool isInstFetch() const { return flags.isSet(INST_FETCH); }
< bool isPrefetch() const { return flags.isSet(PREFETCH); }
< bool isLLSC() const { return flags.isSet(LLSC); }
< bool isLocked() const { return flags.isSet(LOCKED); }
< bool isSwap() const { return flags.isSet(MEM_SWAP|MEM_SWAP_COND); }
< bool isCondSwap() const { return flags.isSet(MEM_SWAP_COND); }
---
> bool isUncacheable() const { return _flags.isSet(UNCACHEABLE); }
> bool isInstFetch() const { return _flags.isSet(INST_FETCH); }
> bool isPrefetch() const { return _flags.isSet(PREFETCH); }
> bool isLLSC() const { return _flags.isSet(LLSC); }
> bool isLocked() const { return _flags.isSet(LOCKED); }
> bool isSwap() const { return _flags.isSet(MEM_SWAP|MEM_SWAP_COND); }
> bool isCondSwap() const { return _flags.isSet(MEM_SWAP_COND); }
465c467
< if (flags.isSet(NO_ALIGN_FAULT))
---
> if (_flags.isSet(NO_ALIGN_FAULT))
468c470
< if ((vaddr & 0x1))
---
> if ((_vaddr & 0x1))
471c473
< if (flags.isSet(NO_HALF_WORD_ALIGN_FAULT))
---
> if (_flags.isSet(NO_HALF_WORD_ALIGN_FAULT))
474c476
< if ((vaddr & 0x2))
---
> if ((_vaddr & 0x2))