timing.cc (7520:67c670459d01) timing.cc (7521:3c48b2b3cb83)
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;

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

886}
887
888void
889TimingSimpleCPU::completeDataAccess(PacketPtr pkt)
890{
891 // received a response from the dcache: complete the load or store
892 // instruction
893 assert(!pkt->isError());
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;

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

886}
887
888void
889TimingSimpleCPU::completeDataAccess(PacketPtr pkt)
890{
891 // received a response from the dcache: complete the load or store
892 // instruction
893 assert(!pkt->isError());
894 assert(_status == DcacheWaitResponse || _status == DTBWaitResponse ||
895 pkt->req->getFlags().isSet(Request::NO_ACCESS));
894
895 numCycles += tickToCycles(curTick - previousTick);
896 previousTick = curTick;
897
898 if (pkt->senderState) {
899 SplitFragmentSenderState * send_state =
900 dynamic_cast<SplitFragmentSenderState *>(pkt->senderState);
901 assert(send_state);

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

915 return;
916 } else {
917 delete main_send_state;
918 big_pkt->senderState = NULL;
919 pkt = big_pkt;
920 }
921 }
922
896
897 numCycles += tickToCycles(curTick - previousTick);
898 previousTick = curTick;
899
900 if (pkt->senderState) {
901 SplitFragmentSenderState * send_state =
902 dynamic_cast<SplitFragmentSenderState *>(pkt->senderState);
903 assert(send_state);

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

917 return;
918 } else {
919 delete main_send_state;
920 big_pkt->senderState = NULL;
921 pkt = big_pkt;
922 }
923 }
924
923 assert(_status == DcacheWaitResponse || _status == DTBWaitResponse);
924 _status = Running;
925
926 Fault fault = curStaticInst->completeAcc(pkt, this, traceData);
927
928 // keep an instruction count
929 if (fault == NoFault)
930 countInst();
931 else if (traceData) {

--- 165 unchanged lines hidden --- 		925 _status = Running;
926
927 Fault fault = curStaticInst->completeAcc(pkt, this, traceData);
928
929 // keep an instruction count
930 if (fault == NoFault)
931 countInst();
932 else if (traceData) {

--- 165 unchanged lines hidden ---