Fixed a corner case and simplified the logic in Packet::intersect.
--HG-- extra : convert_revision : b57c31ca7c220e701d34e02bb07ce392370e4428
This commit is contained in:
parent
549412b333
commit
404b2a951d
1 changed files with 3 additions and 7 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue