timing.cc (7521:3c48b2b3cb83) timing.cc (7655:8bce423f2075)
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;

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

812 }
813 } else if (curStaticInst) {
814 // non-memory instruction: execute completely now
815 Fault fault = curStaticInst->execute(this, traceData);
816
817 // keep an instruction count
818 if (fault == NoFault)
819 countInst();
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;

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

812 }
813 } else if (curStaticInst) {
814 // non-memory instruction: execute completely now
815 Fault fault = curStaticInst->execute(this, traceData);
816
817 // keep an instruction count
818 if (fault == NoFault)
819 countInst();
820 else if (traceData) {
821 // If there was a fault, we shouldn't trace this instruction.
820 else if (traceData && !DTRACE(ExecFaulting)) {
822 delete traceData;
823 traceData = NULL;
824 }
825
826 postExecute();
827 // @todo remove me after debugging with legion done
828 if (curStaticInst && (!curStaticInst->isMicroop() ||
829 curStaticInst->isFirstMicroop()))

--- 268 unchanged lines hidden --- 		821 delete traceData;
822 traceData = NULL;
823 }
824
825 postExecute();
826 // @todo remove me after debugging with legion done
827 if (curStaticInst && (!curStaticInst->isMicroop() ||
828 curStaticInst->isFirstMicroop()))

--- 268 unchanged lines hidden ---