packet.hh (12766:1c347e60c7fd) packet.hh (12823:ba630bc7a36d)
1/*
2 * Copyright (c) 2012-2018 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

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

1163 * another packet (i.e. an in-transit request or
1164 * response). Returns true if the current packet is a read, and
1165 * the other packet provides the data, which is then copied to the
1166 * current packet. If the current packet is a write, and the other
1167 * packet intersects this one, then we update the data
1168 * accordingly.
1169 */
1170 bool
1/*
2 * Copyright (c) 2012-2018 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

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

1163 * another packet (i.e. an in-transit request or
1164 * response). Returns true if the current packet is a read, and
1165 * the other packet provides the data, which is then copied to the
1166 * current packet. If the current packet is a write, and the other
1167 * packet intersects this one, then we update the data
1168 * accordingly.
1169 */
1170 bool
1171 checkFunctional(PacketPtr other)
1171 trySatisfyFunctional(PacketPtr other)
1172 {
1173 // all packets that are carrying a payload should have a valid
1174 // data pointer
1172 {
1173 // all packets that are carrying a payload should have a valid
1174 // data pointer
1175 return checkFunctional(other, other->getAddr(), other->isSecure(),
1176 other->getSize(),
1177 other->hasData() ?
1178 other->getPtr() : NULL);
1175 return trySatisfyFunctional(other, other->getAddr(), other->isSecure(),
1176 other->getSize(),
1177 other->hasData() ?
1178 other->getPtr<uint8_t>() : NULL);
1179 }
1180
1181 /**
1182 * Does the request need to check for cached copies of the same block
1183 * in the memory hierarchy above.
1184 **/
1185 bool
1186 mustCheckAbove() const

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

1201 /**
1202 * Check a functional request against a memory value represented
1203 * by a base/size pair and an associated data array. If the
1204 * current packet is a read, it may be satisfied by the memory
1205 * value. If the current packet is a write, it may update the
1206 * memory value.
1207 */
1208 bool
1179 }
1180
1181 /**
1182 * Does the request need to check for cached copies of the same block
1183 * in the memory hierarchy above.
1184 **/
1185 bool
1186 mustCheckAbove() const

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

1201 /**
1202 * Check a functional request against a memory value represented
1203 * by a base/size pair and an associated data array. If the
1204 * current packet is a read, it may be satisfied by the memory
1205 * value. If the current packet is a write, it may update the
1206 * memory value.
1207 */
1208 bool
1209 checkFunctional(Printable *obj, Addr base, bool is_secure, int size,
1210 uint8_t *_data);
1209 trySatisfyFunctional(Printable *obj, Addr base, bool is_secure, int size,
1210 uint8_t *_data);
1211
1212 /**
1213 * Push label for PrintReq (safe to call unconditionally).
1214 */
1215 void
1216 pushLabel(const std::string &lbl)
1217 {
1218 if (isPrint())

--- 26 unchanged lines hidden ---
1211
1212 /**
1213 * Push label for PrintReq (safe to call unconditionally).
1214 */
1215 void
1216 pushLabel(const std::string &lbl)
1217 {
1218 if (isPrint())

--- 26 unchanged lines hidden ---