timing.cc (4997:e7380529bd2d) timing.cc (4998:51a0f9f59cc5)
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;

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

535 if (fault == NoFault) {
536 // early fail on store conditional: complete now
537 assert(dcache_pkt != NULL);
538 fault = curStaticInst->completeAcc(dcache_pkt, this,
539 traceData);
540 delete dcache_pkt->req;
541 delete dcache_pkt;
542 dcache_pkt = NULL;
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;

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

535 if (fault == NoFault) {
536 // early fail on store conditional: complete now
537 assert(dcache_pkt != NULL);
538 fault = curStaticInst->completeAcc(dcache_pkt, this,
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();
543 }
547 }
548
544 postExecute();
545 advanceInst(fault);
546 }
547 } else {
548 // non-memory instruction: execute completely now
549 Fault fault = curStaticInst->execute(this, traceData);
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
550 postExecute();
551 advanceInst(fault);
552 }
553
554 delete pkt->req;
555 delete pkt;
556}
557

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

610 assert(_status == DcacheWaitResponse);
611 _status = Running;
612
613 numCycles += curTick - previousTick;
614 previousTick = curTick;
615
616 Fault fault = curStaticInst->completeAcc(pkt, this, traceData);
617
560 postExecute();
561 advanceInst(fault);
562 }
563
564 delete pkt->req;
565 delete pkt;
566}
567

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

620 assert(_status == DcacheWaitResponse);
621 _status = Running;
622
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
618 if (pkt->isRead() && pkt->isLocked()) {
619 TheISA::handleLockedRead(thread, pkt->req);
620 }
621
622 delete pkt->req;
623 delete pkt;
624
625 postExecute();

--- 120 unchanged lines hidden --- 		632 if (pkt->isRead() && pkt->isLocked()) {
633 TheISA::handleLockedRead(thread, pkt->req);
634 }
635
636 delete pkt->req;
637 delete pkt;
638
639 postExecute();

--- 120 unchanged lines hidden ---