| cpu_impl.hh (8809:bb10807da889) | cpu_impl.hh (8832:247fee427324) |
|---|---|
| 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 --- 233 unchanged lines hidden (view full) --- 242 if (!curMacroStaticInst) { 243 // set up memory request for instruction fetch 244 memReq = new Request(unverifiedInst->threadNumber, fetch_PC, 245 sizeof(MachInst), 246 0, 247 fetch_PC, thread->contextId(), 248 unverifiedInst->threadNumber); 249 memReq->setVirt(0, fetch_PC, sizeof(MachInst), | 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 --- 233 unchanged lines hidden (view full) --- 242 if (!curMacroStaticInst) { 243 // set up memory request for instruction fetch 244 memReq = new Request(unverifiedInst->threadNumber, fetch_PC, 245 sizeof(MachInst), 246 0, 247 fetch_PC, thread->contextId(), 248 unverifiedInst->threadNumber); 249 memReq->setVirt(0, fetch_PC, sizeof(MachInst), |
| 250 Request::INST_FETCH, thread->instAddr()); | 250 Request::INST_FETCH, masterId, thread->instAddr()); |
| 251 252 253 fault = itb->translateFunctional(memReq, tc, BaseTLB::Execute); 254 255 if (fault != NoFault) { 256 if (unverifiedInst->getFault() == NoFault) { 257 // In this case the instruction was not a dummy 258 // instruction carrying an ITB fault. In the single --- 416 unchanged lines hidden --- | 251 252 253 fault = itb->translateFunctional(memReq, tc, BaseTLB::Execute); 254 255 if (fault != NoFault) { 256 if (unverifiedInst->getFault() == NoFault) { 257 // In this case the instruction was not a dummy 258 // instruction carrying an ITB fault. In the single --- 416 unchanged lines hidden --- |