atomic.cc (4115:cc1d6df13c7d) atomic.cc (4182:5b2c0d266107)
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;

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

495 numCycles++;
496
497 if (!curStaticInst || !curStaticInst->isDelayedCommit())
498 checkForInterrupts();
499
500 Fault fault = setupFetchRequest(ifetch_req);
501
502 if (fault == NoFault) {
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;

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

495 numCycles++;
496
497 if (!curStaticInst || !curStaticInst->isDelayedCommit())
498 checkForInterrupts();
499
500 Fault fault = setupFetchRequest(ifetch_req);
501
502 if (fault == NoFault) {
503 ifetch_pkt->reinitFromRequest();
503 Tick icache_latency = 0;
504 bool icache_access = false;
505 dcache_access = false; // assume no dcache access
504
506
505 Tick icache_latency = icachePort.sendAtomic(ifetch_pkt);
506 // ifetch_req is initialized to read the instruction directly
507 // into the CPU object's inst field.
507 //Fetch more instruction memory if necessary
508 if(predecoder.needMoreBytes())
509 {
510 icache_access = true;
511 ifetch_pkt->reinitFromRequest();
508
512
509 dcache_access = false; // assume no dcache access
513 icache_latency = icachePort.sendAtomic(ifetch_pkt);
514 // ifetch_req is initialized to read the instruction directly
515 // into the CPU object's inst field.
516 }
517
510 preExecute();
511
518 preExecute();
519
512 fault = curStaticInst->execute(this, traceData);
513 postExecute();
520 if(curStaticInst)
521 {
522 fault = curStaticInst->execute(this, traceData);
523 postExecute();
524 }
514
515 // @todo remove me after debugging with legion done
516 if (curStaticInst && (!curStaticInst->isMicroOp() ||
517 curStaticInst->isFirstMicroOp()))
518 instCnt++;
519
520 if (simulate_stalls) {
525
526 // @todo remove me after debugging with legion done
527 if (curStaticInst && (!curStaticInst->isMicroOp() ||
528 curStaticInst->isFirstMicroOp()))
529 instCnt++;
530
531 if (simulate_stalls) {
521 Tick icache_stall = icache_latency - cycles(1);
532 Tick icache_stall =
533 icache_access ? icache_latency - cycles(1) : 0;
522 Tick dcache_stall =
523 dcache_access ? dcache_latency - cycles(1) : 0;
524 Tick stall_cycles = (icache_stall + dcache_stall) / cycles(1);
525 if (cycles(stall_cycles) < (icache_stall + dcache_stall))
526 latency += cycles(stall_cycles+1);
527 else
528 latency += cycles(stall_cycles);
529 }
530
531 }
534 Tick dcache_stall =
535 dcache_access ? dcache_latency - cycles(1) : 0;
536 Tick stall_cycles = (icache_stall + dcache_stall) / cycles(1);
537 if (cycles(stall_cycles) < (icache_stall + dcache_stall))
538 latency += cycles(stall_cycles+1);
539 else
540 latency += cycles(stall_cycles);
541 }
542
543 }
532
533 advancePC(fault);
544 if(predecoder.needMoreBytes())
545 advancePC(fault);
534 }
535
536 if (_status != Idle)
537 tickEvent.schedule(curTick + latency);
538}
539
540
541////////////////////////////////////////////////////////////////////////

--- 109 unchanged lines hidden --- 		546 }
547
548 if (_status != Idle)
549 tickEvent.schedule(curTick + latency);
550}
551
552
553////////////////////////////////////////////////////////////////////////

--- 109 unchanged lines hidden ---