2,13d1
< * Copyright (c) 2011 ARM Limited
< * All rights reserved
< *
< * The license below extends only to copyright in the software and shall
< * not be construed as granting a license to any other intellectual
< * property including but not limited to intellectual property relating
< * to a hardware implementation of the functionality of the software
< * licensed hereunder. You may use the software subject to the license
< * terms below provided that you ensure that this notice is replicated
< * unmodified and in its entirety in all distributions of the software,
< * modified or unmodified, in source code or in binary form.
< *
50a39
> #include "arch/interrupts.hh"
60,64c49
< #if FULL_SYSTEM
< #include "arch/interrupts.hh"
< #endif
<
< struct BaseCPUParams;
---
> class BaseCPUParams;
110,145d94
< /**
< * Define a base class for the CPU ports (instruction and data)
< * that is refined in the subclasses. This class handles the
< * common cases, i.e. the functional accesses and the status
< * changes and address range queries. The default behaviour for
< * both atomic and timing access is to panic and the corresponding
< * subclasses have to override these methods.
< */
< class CpuPort : public Port
< {
< public:
<
< /**
< * Create a CPU port with a name and a structural owner.
< *
< * @param _name port name including the owner
< * @param _name structural owner of this port
< */
< CpuPort(const std::string& _name, MemObject* _owner) :
< Port(_name, _owner)
< { }
<
< protected:
<
< virtual bool recvTiming(PacketPtr pkt);
<
< virtual Tick recvAtomic(PacketPtr pkt);
<
< virtual void recvRetry();
<
< void recvFunctional(PacketPtr pkt);
<
< void recvRangeChange();
<
< };
<
176d124
< #if FULL_SYSTEM
186a135
> #if FULL_SYSTEM
187a137
> #endif
192a143
> #if FULL_SYSTEM
193a145
> #endif
225d176
< #endif
244c195
< virtual void activateContext(ThreadID thread_num, int delay) {}
---
> virtual void activateContext(int thread_num, int delay) {}
247c198
< virtual void suspendContext(ThreadID thread_num) {}
---
> virtual void suspendContext(int thread_num) {}
250c201
< virtual void deallocateContext(ThreadID thread_num) {}
---
> virtual void deallocateContext(int thread_num) {}
253c204
< virtual void haltContext(ThreadID thread_num) {}
---
> virtual void haltContext(int thread_num) {}
282c233
< virtual void takeOverFrom(BaseCPU *);
---
> virtual void takeOverFrom(BaseCPU *, Port *ic, Port *dc);
308d258
< #if FULL_SYSTEM
322,323d271
< #endif
<
342,345c290
< private:
< static std::vector<BaseCPU *> cpuList; //!< Static global cpu list
<
< public:
---
> protected:
351a297,300
> private:
> static std::vector<BaseCPU *> cpuList; //!< Static global cpu list
>
> public: