packet.cc (3349:fec4a86fa212) packet.cc (3352:8e940d22b2a8)
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;

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

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
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;

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

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));
154 assert(!(funcStart > timingEnd || timingStart > funcEnd));
155
156 if (DTRACE(FunctionalAccess)) {
157 DebugOut() << func;
158 DebugOut() << timing;
159 }
160
161 // this packet can't solve our problem, continue on
162 if (!timing->hasData())

--- 76 unchanged lines hidden --- 		155
156 if (DTRACE(FunctionalAccess)) {
157 DebugOut() << func;
158 DebugOut() << timing;
159 }
160
161 // this packet can't solve our problem, continue on
162 if (!timing->hasData())

--- 76 unchanged lines hidden ---