200a201
>
201a203,223
> * Set up a physical (e.g. device) request in a previously
> * allocated Request object.
> */
> void
> setPhys(Addr paddr, unsigned size, Flags flags, MasterID mid, Tick time)
> {
> assert(size >= 0);
> _paddr = paddr;
> _size = size;
> _time = time;
> _masterId = mid;
> _flags.clear(~STICKY_FLAGS);
> _flags.set(flags);
> privateFlags.clear(~STICKY_PRIVATE_FLAGS);
> privateFlags.set(VALID_PADDR|VALID_SIZE);
> depth = 0;
> accessDelta = 0;
> //translateDelta = 0;
> }
>
> /**
212c234
< int _size;
---
> unsigned _size;
257,259c279,283
< /** Minimal constructor. No fields are initialized.
< * (Note that _flags and privateFlags are cleared by Flags
< * default constructor.)
---
>
> /**
> * Minimal constructor. No fields are initialized. (Note that
> * _flags and privateFlags are cleared by Flags default
> * constructor.)
271c295
< * These fields are adequate to perform a request.
---
> * These fields are adequate to perform a request.
273c297
< Request(Addr paddr, int size, Flags flags, MasterID mid)
---
> Request(Addr paddr, unsigned size, Flags flags, MasterID mid)
279c303
< setPhys(paddr, size, flags, mid);
---
> setPhys(paddr, size, flags, mid, curTick());
282c306
< Request(Addr paddr, int size, Flags flags, MasterID mid, Tick time)
---
> Request(Addr paddr, unsigned size, Flags flags, MasterID mid, Tick time)
291c315,316
< Request(Addr paddr, int size, Flags flags, MasterID mid, Tick time, Addr pc)
---
> Request(Addr paddr, unsigned size, Flags flags, MasterID mid, Tick time,
> Addr pc)
302c327,328
< Request(int asid, Addr vaddr, int size, Flags flags, MasterID mid, Addr pc,
---
> Request(int asid, Addr vaddr, unsigned size, Flags flags, MasterID mid,
> Addr pc,
327,353d352
< * Set up a physical (e.g. device) request in a previously
< * allocated Request object.
< */
< void
< setPhys(Addr paddr, int size, Flags flags, MasterID mid, Tick time)
< {
< assert(size >= 0);
< _paddr = paddr;
< _size = size;
< _time = time;
< _masterId = mid;
< _flags.clear(~STICKY_FLAGS);
< _flags.set(flags);
< privateFlags.clear(~STICKY_PRIVATE_FLAGS);
< privateFlags.set(VALID_PADDR|VALID_SIZE);
< depth = 0;
< accessDelta = 0;
< //translateDelta = 0;
< }
<
< void
< setPhys(Addr paddr, int size, Flags flags, MasterID mid)
< {
< setPhys(paddr, size, flags, mid, curTick());
< }
<
< /**
358c357,358
< setVirt(int asid, Addr vaddr, int size, Flags flags, MasterID mid, Addr pc)
---
> setVirt(int asid, Addr vaddr, unsigned size, Flags flags, MasterID mid,
> Addr pc)
400,403c400,401
< req1 = new Request;
< *req1 = *this;
< req2 = new Request;
< *req2 = *this;
---
> req1 = new Request(*this);
> req2 = new Request(*this);