atomic.cc (4999:b46ae02966d5) atomic.cc (5001:31fda5c37c19)
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;

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

613
614
615 // ifetch_req is initialized to read the instruction directly
616 // into the CPU object's inst field.
617 //}
618
619 preExecute();
620
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;

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

613
614
615 // ifetch_req is initialized to read the instruction directly
616 // into the CPU object's inst field.
617 //}
618
619 preExecute();
620
621 if(curStaticInst)
622 {
621 if (curStaticInst) {
623 fault = curStaticInst->execute(this, traceData);
624
625 // keep an instruction count
626 if (fault == NoFault)
627 countInst();
622 fault = curStaticInst->execute(this, traceData);
623
624 // keep an instruction count
625 if (fault == NoFault)
626 countInst();
627 else if (traceData) {
628 // If there was a fault, we should trace this instruction.
629 delete traceData;
630 traceData = NULL;
631 }
628
629 postExecute();
630 }
631
632 // @todo remove me after debugging with legion done
633 if (curStaticInst && (!curStaticInst->isMicroop() ||
634 curStaticInst->isFirstMicroop()))
635 instCnt++;

--- 65 unchanged lines hidden --- 		632
633 postExecute();
634 }
635
636 // @todo remove me after debugging with legion done
637 if (curStaticInst && (!curStaticInst->isMicroop() ||
638 curStaticInst->isFirstMicroop()))
639 instCnt++;

--- 65 unchanged lines hidden ---