Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG-- extra : convert_revision : 0cceed934a4f44c27c8293780fc927ef2c00869d
This commit is contained in:
commit
16bb300586
7 changed files with 22 additions and 22 deletions
|
@ -83,7 +83,7 @@ AlphaTlb::lookup(Addr vpn, uint8_t asn) const
|
|||
|
||||
|
||||
void
|
||||
AlphaTlb::checkCacheability(MemReqPtr req)
|
||||
AlphaTlb::checkCacheability(MemReqPtr &req)
|
||||
{
|
||||
// in Alpha, cacheability is controlled by upper-level bits of the
|
||||
// physical address
|
||||
|
@ -260,7 +260,7 @@ AlphaItb::fault(Addr pc, ExecContext *xc) const
|
|||
|
||||
|
||||
Fault
|
||||
AlphaItb::translate(MemReqPtr req) const
|
||||
AlphaItb::translate(MemReqPtr &req) const
|
||||
{
|
||||
InternalProcReg *ipr = req->xc->regs.ipr;
|
||||
|
||||
|
@ -425,7 +425,7 @@ AlphaDtb::fault(Addr vaddr, uint64_t flags, ExecContext *xc) const
|
|||
}
|
||||
|
||||
Fault
|
||||
AlphaDtb::translate(MemReqPtr req, bool write) const
|
||||
AlphaDtb::translate(MemReqPtr &req, bool write) const
|
||||
{
|
||||
RegFile *regs = &req->xc->regs;
|
||||
Addr pc = regs->pc;
|
||||
|
|
|
@ -70,7 +70,7 @@ class AlphaTlb : public SimObject
|
|||
return (unimplBits == 0) || (unimplBits == VA_UNIMPL_MASK);
|
||||
}
|
||||
|
||||
static void checkCacheability(MemReqPtr req);
|
||||
static void checkCacheability(MemReqPtr &req);
|
||||
|
||||
// Checkpointing
|
||||
virtual void serialize(std::ostream &os);
|
||||
|
@ -92,7 +92,7 @@ class AlphaItb : public AlphaTlb
|
|||
AlphaItb(const std::string &name, int size);
|
||||
virtual void regStats();
|
||||
|
||||
Fault translate(MemReqPtr req) const;
|
||||
Fault translate(MemReqPtr &req) const;
|
||||
};
|
||||
|
||||
class AlphaDtb : public AlphaTlb
|
||||
|
@ -118,7 +118,7 @@ class AlphaDtb : public AlphaTlb
|
|||
AlphaDtb(const std::string &name, int size);
|
||||
virtual void regStats();
|
||||
|
||||
Fault translate(MemReqPtr req, bool write) const;
|
||||
Fault translate(MemReqPtr &req, bool write) const;
|
||||
};
|
||||
|
||||
#endif // __ALPHA_MEMORY_HH__
|
||||
|
|
|
@ -189,17 +189,17 @@ class ExecContext
|
|||
int getInstAsid() { return ITB_ASN_ASN(regs.ipr[TheISA::IPR_ITB_ASN]); }
|
||||
int getDataAsid() { return DTB_ASN_ASN(regs.ipr[TheISA::IPR_DTB_ASN]); }
|
||||
|
||||
Fault translateInstReq(MemReqPtr req)
|
||||
Fault translateInstReq(MemReqPtr &req)
|
||||
{
|
||||
return itb->translate(req);
|
||||
}
|
||||
|
||||
Fault translateDataReadReq(MemReqPtr req)
|
||||
Fault translateDataReadReq(MemReqPtr &req)
|
||||
{
|
||||
return dtb->translate(req, false);
|
||||
}
|
||||
|
||||
Fault translateDataWriteReq(MemReqPtr req)
|
||||
Fault translateDataWriteReq(MemReqPtr &req)
|
||||
{
|
||||
return dtb->translate(req, true);
|
||||
}
|
||||
|
@ -214,7 +214,7 @@ class ExecContext
|
|||
int getInstAsid() { return asid; }
|
||||
int getDataAsid() { return asid; }
|
||||
|
||||
Fault dummyTranslation(MemReqPtr req)
|
||||
Fault dummyTranslation(MemReqPtr &req)
|
||||
{
|
||||
#if 0
|
||||
assert((req->vaddr >> 48 & 0xffff) == 0);
|
||||
|
@ -225,15 +225,15 @@ class ExecContext
|
|||
req->paddr = req->paddr | (Addr)req->asid << sizeof(Addr) * 8 - 16;
|
||||
return No_Fault;
|
||||
}
|
||||
Fault translateInstReq(MemReqPtr req)
|
||||
Fault translateInstReq(MemReqPtr &req)
|
||||
{
|
||||
return dummyTranslation(req);
|
||||
}
|
||||
Fault translateDataReadReq(MemReqPtr req)
|
||||
Fault translateDataReadReq(MemReqPtr &req)
|
||||
{
|
||||
return dummyTranslation(req);
|
||||
}
|
||||
Fault translateDataWriteReq(MemReqPtr req)
|
||||
Fault translateDataWriteReq(MemReqPtr &req)
|
||||
{
|
||||
return dummyTranslation(req);
|
||||
}
|
||||
|
@ -241,7 +241,7 @@ class ExecContext
|
|||
#endif
|
||||
|
||||
template <class T>
|
||||
Fault read(MemReqPtr req, T& data)
|
||||
Fault read(MemReqPtr &req, T& data)
|
||||
{
|
||||
#if defined(TARGET_ALPHA) && defined(FULL_SYSTEM)
|
||||
if (req->flags & LOCKED) {
|
||||
|
@ -254,7 +254,7 @@ class ExecContext
|
|||
}
|
||||
|
||||
template <class T>
|
||||
Fault write(MemReqPtr req, T& data)
|
||||
Fault write(MemReqPtr &req, T& data)
|
||||
{
|
||||
#if defined(TARGET_ALPHA) && defined(FULL_SYSTEM)
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ printData(ostream &os, uint8_t *data, int nbytes)
|
|||
}
|
||||
|
||||
void
|
||||
MemTest::completeRequest(MemReqPtr req, uint8_t *data)
|
||||
MemTest::completeRequest(MemReqPtr &req, uint8_t *data)
|
||||
{
|
||||
switch (req->cmd) {
|
||||
case Read:
|
||||
|
|
|
@ -108,7 +108,7 @@ class MemTest : public BaseCPU
|
|||
Statistics::Scalar<> numCopies;
|
||||
|
||||
// called by MemCompleteEvent::process()
|
||||
void completeRequest(MemReqPtr req, uint8_t *data);
|
||||
void completeRequest(MemReqPtr &req, uint8_t *data);
|
||||
|
||||
friend class MemCompleteEvent;
|
||||
};
|
||||
|
@ -122,7 +122,7 @@ class MemCompleteEvent : public Event
|
|||
|
||||
public:
|
||||
|
||||
MemCompleteEvent(MemReqPtr _req, uint8_t *_data, MemTest *_tester)
|
||||
MemCompleteEvent(MemReqPtr &_req, uint8_t *_data, MemTest *_tester)
|
||||
: Event(&mainEventQueue),
|
||||
req(_req), data(_data), tester(_tester)
|
||||
{
|
||||
|
|
|
@ -73,7 +73,7 @@ AlphaConsole::AlphaConsole(const string &name, SimConsole *cons,
|
|||
}
|
||||
|
||||
Fault
|
||||
AlphaConsole::read(MemReqPtr req, uint8_t *data)
|
||||
AlphaConsole::read(MemReqPtr &req, uint8_t *data)
|
||||
{
|
||||
memset(data, 0, req->size);
|
||||
uint64_t val;
|
||||
|
@ -109,7 +109,7 @@ AlphaConsole::read(MemReqPtr req, uint8_t *data)
|
|||
}
|
||||
|
||||
Fault
|
||||
AlphaConsole::write(MemReqPtr req, const uint8_t *data)
|
||||
AlphaConsole::write(MemReqPtr &req, const uint8_t *data)
|
||||
{
|
||||
uint64_t val;
|
||||
|
||||
|
|
|
@ -94,8 +94,8 @@ class AlphaConsole : public MmapDevice
|
|||
/**
|
||||
* memory mapped reads and writes
|
||||
*/
|
||||
virtual Fault read(MemReqPtr req, uint8_t *data);
|
||||
virtual Fault write(MemReqPtr req, const uint8_t *data);
|
||||
virtual Fault read(MemReqPtr &req, uint8_t *data);
|
||||
virtual Fault write(MemReqPtr &req, const uint8_t *data);
|
||||
|
||||
/**
|
||||
* standard serialization routines for checkpointing
|
||||
|
|
Loading…
Reference in a new issue