Deleted Added
sdiff udiff text old ( 14105:969b4e972b07 ) new ( 14111:14c05f862590 )
full compact
1
2/*
3 * Copyright (c) 2010-2014, 2017-2018 ARM Limited
4 * Copyright (c) 2013 Advanced Micro Devices, Inc.
5 * All rights reserved
6 *
7 * The license below extends only to copyright in the software and shall
8 * not be construed as granting a license to any other intellectual

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

963 if (inst->fault == NoFault) {
964 // Complete access to copy data to proper place.
965 inst->completeAcc(pkt);
966 } else {
967 // If the instruction has an outstanding fault, we cannot complete
968 // the access as this discards the current fault.
969
970 // If we have an outstanding fault, the fault should only be of
971 // type ReExec.
972 assert(dynamic_cast<ReExec*>(inst->fault.get()) != nullptr);
973
974 DPRINTF(LSQUnit, "Not completing instruction [sn:%lli] access "
975 "due to pending fault.\n", inst->seqNum);
976 }
977 }
978
979 // Need to insert instruction into queue to commit
980 iewStage->instToCommit(inst);

--- 155 unchanged lines hidden ---