1/*
2 * Copyright (c) 2002-2005 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;

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

539 traceData);
540 delete dcache_pkt->req;
541 delete dcache_pkt;
542 dcache_pkt = NULL;
543
544 // keep an instruction count
545 if (fault == NoFault)
546 countInst();
547 }
548
549 postExecute();
550 advanceInst(fault);
551 }
552 } else {
553 // non-memory instruction: execute completely now
554 Fault fault = curStaticInst->execute(this, traceData);
555
556 // keep an instruction count
557 if (fault == NoFault)
558 countInst();
559
560 postExecute();
561 advanceInst(fault);
562 }
563
564 delete pkt->req;
565 delete pkt;
566}

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

623 numCycles += curTick - previousTick;
624 previousTick = curTick;
625
626 Fault fault = curStaticInst->completeAcc(pkt, this, traceData);
627
628 // keep an instruction count
629 if (fault == NoFault)
630 countInst();
631
632 if (pkt->isRead() && pkt->isLocked()) {
633 TheISA::handleLockedRead(thread, pkt->req);
634 }
635
636 delete pkt->req;
637 delete pkt;
638

--- 121 unchanged lines hidden ---