fetch_impl.hh (5494:85c8d296c1cb) fetch_impl.hh (5529:9ae69b9cd7fd)
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;

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

46#include "sim/core.hh"
47
48#if FULL_SYSTEM
49#include "arch/tlb.hh"
50#include "arch/vtophys.hh"
51#include "sim/system.hh"
52#endif // FULL_SYSTEM
53
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;

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

46#include "sim/core.hh"
47
48#if FULL_SYSTEM
49#include "arch/tlb.hh"
50#include "arch/vtophys.hh"
51#include "sim/system.hh"
52#endif // FULL_SYSTEM
53
54#include "params/DerivO3CPU.hh"
55
54template<class Impl>
55void
56DefaultFetch<Impl>::IcachePort::setPeer(Port *port)
57{
58 Port::setPeer(port);
59
60 fetch->setIcache();
61}

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

106template<class Impl>
107void
108DefaultFetch<Impl>::IcachePort::recvRetry()
109{
110 fetch->recvRetry();
111}
112
113template<class Impl>
56template<class Impl>
57void
58DefaultFetch<Impl>::IcachePort::setPeer(Port *port)
59{
60 Port::setPeer(port);
61
62 fetch->setIcache();
63}

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

108template<class Impl>
109void
110DefaultFetch<Impl>::IcachePort::recvRetry()
111{
112 fetch->recvRetry();
113}
114
115template<class Impl>
114DefaultFetch::DefaultFetch(O3CPU *_cpu, Params *params)
116DefaultFetch<Impl>::DefaultFetch(O3CPU *_cpu, DerivO3CPUParams *params)
115 : cpu(_cpu),
116 branchPred(params),
117 predecoder(NULL),
118 decodeToFetchDelay(params->decodeToFetchDelay),
119 renameToFetchDelay(params->renameToFetchDelay),
120 iewToFetchDelay(params->iewToFetchDelay),
121 commitToFetchDelay(params->commitToFetchDelay),
122 fetchWidth(params->fetchWidth),
123 cacheBlocked(false),
124 retryPkt(NULL),
125 retryTid(-1),
117 : cpu(_cpu),
118 branchPred(params),
119 predecoder(NULL),
120 decodeToFetchDelay(params->decodeToFetchDelay),
121 renameToFetchDelay(params->renameToFetchDelay),
122 iewToFetchDelay(params->iewToFetchDelay),
123 commitToFetchDelay(params->commitToFetchDelay),
124 fetchWidth(params->fetchWidth),
125 cacheBlocked(false),
126 retryPkt(NULL),
127 retryTid(-1),
126 numThreads(params->numberOfThreads),
128 numThreads(params->numThreads),
127 numFetchingThreads(params->smtNumFetchingThreads),
128 interruptPending(false),
129 drainPending(false),
130 switchedOut(false)
131{
132 if (numThreads > Impl::MaxThreads)
133 fatal("numThreads is not a valid value\n");
134

--- 1306 unchanged lines hidden --- 		129 numFetchingThreads(params->smtNumFetchingThreads),
130 interruptPending(false),
131 drainPending(false),
132 switchedOut(false)
133{
134 if (numThreads > Impl::MaxThreads)
135 fatal("numThreads is not a valid value\n");
136

--- 1306 unchanged lines hidden ---