Deleted Added
sdiff udiff text old ( 7944:1daf51f62013 ) new ( 8199:3d6c08c877a9 )
full compact
1/*
2 * Copyright (c) 2011 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

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

238 Fault fault;
239
240 /** Pointer to the data for the memory access. */
241 uint8_t *memData;
242
243 /** The effective virtual address (lds & stores only). */
244 Addr effAddr;
245
246 /** Is the effective virtual address valid. */
247 bool effAddrValid;
248
249 /** The effective physical address. */
250 Addr physEffAddr;
251
252 /** Effective virtual address for a copy source. */
253 Addr copySrcEffAddr;

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

887 splitRequest(req, sreqLow, sreqHigh);
888 }
889 initiateTranslation(req, sreqLow, sreqHigh, NULL, BaseTLB::Read);
890 }
891
892 if (translationCompleted) {
893 if (fault == NoFault) {
894 effAddr = req->getVaddr();
895 effAddrValid = true;
896 fault = cpu->read(req, sreqLow, sreqHigh, data, lqIdx);
897 } else {
898 // Commit will have to clean up whatever happened. Set this
899 // instruction as executed.
900 this->setExecuted();
901 }
902

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

957 if (TheISA::HasUnalignedMemAcc) {
958 splitRequest(req, sreqLow, sreqHigh);
959 }
960 initiateTranslation(req, sreqLow, sreqHigh, res, BaseTLB::Write);
961 }
962
963 if (fault == NoFault && translationCompleted) {
964 effAddr = req->getVaddr();
965 effAddrValid = true;
966 fault = cpu->write(req, sreqLow, sreqHigh, data, sqIdx);
967 }
968
969 return fault;
970}
971
972template<class Impl>

--- 98 unchanged lines hidden ---