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

Fixed a corner case and simplified the logic in Packet::intersect.

Browse source 
--HG--
extra : convert_revision : b57c31ca7c220e701d34e02bb07ce392370e4428
This commit is contained in:
Gabe Black 2006-10-10 17:49:31 -04:00
parent 549412b333
commit 404b2a951d
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mem/packet.cc
View file

@ -102,15 +102,11 @@ bool
Packet::intersect(Packet *p)
{
Addr s1 = getAddr();
Addr e1 = getAddr() + getSize();
Addr e1 = getAddr() + getSize() - 1;
Addr s2 = p->getAddr();
Addr e2 = p->getAddr() + p->getSize();
Addr e2 = p->getAddr() + p->getSize() - 1;
if (s1 >= s2 && s1 < e2)
return true;
if (e1 >= s2 && e1 < e2)
return true;
return false;
return !(s1 > e2 || e1 < s2);
}
bool