atomic.cc (4539:6eeeea62b7c4) atomic.cc (4593:16b19397172c)
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;

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

516 Fault fault = setupFetchRequest(ifetch_req);
517
518 if (fault == NoFault) {
519 Tick icache_latency = 0;
520 bool icache_access = false;
521 dcache_access = false; // assume no dcache access
522
523 //Fetch more instruction memory if necessary
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;

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

516 Fault fault = setupFetchRequest(ifetch_req);
517
518 if (fault == NoFault) {
519 Tick icache_latency = 0;
520 bool icache_access = false;
521 dcache_access = false; // assume no dcache access
522
523 //Fetch more instruction memory if necessary
524 if(predecoder.needMoreBytes())
525 {
524 //if(predecoder.needMoreBytes())
525 //{
526 icache_access = true;
527 ifetch_pkt->reinitFromRequest();
528
529 icache_latency = icachePort.sendAtomic(ifetch_pkt);
530 // ifetch_req is initialized to read the instruction directly
531 // into the CPU object's inst field.
526 icache_access = true;
527 ifetch_pkt->reinitFromRequest();
528
529 icache_latency = icachePort.sendAtomic(ifetch_pkt);
530 // ifetch_req is initialized to read the instruction directly
531 // into the CPU object's inst field.
532 }
532 //}
533
534 preExecute();
535
536 if(curStaticInst)
537 {
538 fault = curStaticInst->execute(this, traceData);
539 postExecute();
540 }

--- 138 unchanged lines hidden ---
533
534 preExecute();
535
536 if(curStaticInst)
537 {
538 fault = curStaticInst->execute(this, traceData);
539 postExecute();
540 }

--- 138 unchanged lines hidden ---