Deleted Added
sdiff udiff text old ( 3605:ed3c5b4e8bca ) new ( 3607:7b7dd28784c4 )
full compact
1/*
2 * Copyright (c) 2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 130 unchanged lines hidden (view full) ---

139 Addr e1 = getAddr() + getSize() - 1;
140 Addr s2 = p->getAddr();
141 Addr e2 = p->getAddr() + p->getSize() - 1;
142
143 return !(s1 > e2 || e1 < s2);
144}
145
146bool
147fixPacket(PacketPtr func, PacketPtr timing)
148{
149 Addr funcStart = func->getAddr();
150 Addr funcEnd = func->getAddr() + func->getSize() - 1;
151 Addr timingStart = timing->getAddr();
152 Addr timingEnd = timing->getAddr() + timing->getSize() - 1;
153
154 assert(!(funcStart > timingEnd || timingStart > funcEnd));

--- 85 unchanged lines hidden ---