Deleted Added
sdiff udiff text old ( 4357:f8b2da607906 ) new ( 4632:be5b8f67b8fb )
full compact
1/*
2 * Copyright (c) 2004-2006 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;

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

351 fromDecode->insts[i]->setSquashed();
352 wroteToTimeBuffer = true;
353 squashCount++;
354 }
355
356 }
357
358 // Clear the instruction list and skid buffer in case they have any
359 // insts in them.
360 insts[tid].clear();
361
362 // Clear the skid buffer in case it has any data in it.
363 skidBuffer[tid].clear();
364
365 doSquash(squash_seq_num, tid);
366}
367
368template <class Impl>
369void
370DefaultRename<Impl>::tick()
371{
372 wroteToTimeBuffer = false;

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

736}
737
738template <class Impl>
739void
740DefaultRename<Impl>::sortInsts()
741{
742 int insts_from_decode = fromDecode->size;
743#ifdef DEBUG
744 for (int i=0; i < numThreads; i++)
745 assert(insts[i].empty());
746#endif
747 for (int i = 0; i < insts_from_decode; ++i) {
748 DynInstPtr inst = fromDecode->insts[i];
749 insts[inst->threadNumber].push_back(inst);
750 }
751}
752
753template<class Impl>
754bool

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

1206
1207 readFreeEntries(tid);
1208 readStallSignals(tid);
1209
1210 if (fromCommit->commitInfo[tid].squash) {
1211 DPRINTF(Rename, "[tid:%u]: Squashing instructions due to squash from "
1212 "commit.\n", tid);
1213
1214 squash(fromCommit->commitInfo[tid].doneSeqNum, tid);
1215
1216 return true;
1217 }
1218
1219 if (fromCommit->commitInfo[tid].robSquashing) {
1220 DPRINTF(Rename, "[tid:%u]: ROB is still squashing.\n", tid);
1221
1222 renameStatus[tid] = Squashing;
1223

--- 132 unchanged lines hidden ---