sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix fault handling, dereferincing a null pointer is bad.

Browse source 
--HG--
extra : convert_revision : a4f658bfd39b7f1d219ad8929b8f45457f49299f
This commit is contained in:
Ali Saidi 2006-03-02 17:49:12 -05:00
parent 1624d9e545
commit 0fed64a6a4
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cpu/simple/cpu.cc
View file

@ -347,12 +347,12 @@ SimpleCPU::copySrcTranslate(Addr src)
// translate to physical address
Fault fault = xc->translateDataReadReq(memReq);
assert(!fault->isAlignmentFault());
if (fault == NoFault) {
xc->copySrcAddr = src;
xc->copySrcPhysAddr = memReq->paddr + offset;
} else {
assert(!fault->isAlignmentFault());
xc->copySrcAddr = 0;
xc->copySrcPhysAddr = 0;
}
@ -382,8 +382,6 @@ SimpleCPU::copy(Addr dest)
// translate to physical address
Fault fault = xc->translateDataWriteReq(memReq);
assert(!fault->isAlignmentFault());
if (fault == NoFault) {
Addr dest_addr = memReq->paddr + offset;
// Need to read straight from memory since we have more than 8 bytes.
@ -402,6 +400,9 @@ SimpleCPU::copy(Addr dest)
dcacheInterface->access(memReq);
}
}
else
assert(!fault->isAlignmentFault());
return fault;
}