Moved the idle event out of system_events.hh. The skipFuncEvent can be made ISA independent by making it use the #define for branch delay slots (and NNPC)
--HG-- extra : convert_revision : b2631b1163397ecc99f2f315e2b88537e2002731
This commit is contained in:
parent
4bfb8547bb
commit
da24915181
|
@ -49,6 +49,7 @@
|
|||
#include "cpu/thread_context.hh"
|
||||
#include "cpu/base.hh"
|
||||
#include "dev/platform.hh"
|
||||
#include "kern/alpha/idle_event.hh"
|
||||
#include "kern/linux/printk.hh"
|
||||
#include "kern/linux/events.hh"
|
||||
#include "mem/physical.hh"
|
||||
|
|
|
@ -39,6 +39,7 @@ class BreakPCEvent;
|
|||
class IdleStartEvent;
|
||||
|
||||
#include "arch/alpha/system.hh"
|
||||
#include "kern/alpha/idle_event.hh"
|
||||
#include "kern/linux/events.hh"
|
||||
|
||||
using namespace AlphaISA;
|
||||
|
|
45
src/kern/alpha/idle_event.cc
Normal file
45
src/kern/alpha/idle_event.cc
Normal file
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
* Copyright (c) 2004-2005 The Regents of The University of Michigan
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met: redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer;
|
||||
* redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution;
|
||||
* neither the name of the copyright holders nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* Authors: Lisa Hsu
|
||||
* Nathan Binkert
|
||||
*/
|
||||
|
||||
#include "cpu/thread_context.hh"
|
||||
#include "kern/alpha/idle_event.hh"
|
||||
#include "kern/kernel_stats.hh"
|
||||
|
||||
using namespace TheISA;
|
||||
|
||||
void
|
||||
IdleStartEvent::process(ThreadContext *tc)
|
||||
{
|
||||
if (tc->getKernelStats())
|
||||
tc->getKernelStats()->setIdleProcess(
|
||||
tc->readMiscReg(AlphaISA::IPR_PALtemp23), tc);
|
||||
remove();
|
||||
}
|
47
src/kern/alpha/idle_event.hh
Normal file
47
src/kern/alpha/idle_event.hh
Normal file
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* Copyright (c) 2004-2005 The Regents of The University of Michigan
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met: redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer;
|
||||
* redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution;
|
||||
* neither the name of the copyright holders nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* Authors: Nathan Binkert
|
||||
* Lisa Hsu
|
||||
* Ali Saidi
|
||||
*/
|
||||
|
||||
#ifndef __KERN_ALPHA_IDLE_EVENT_HH__
|
||||
#define __KERN_ALPHA_IDLE_EVENT_HH__
|
||||
|
||||
#include "cpu/pc_event.hh"
|
||||
|
||||
class IdleStartEvent : public PCEvent
|
||||
{
|
||||
public:
|
||||
IdleStartEvent(PCEventQueue *q, const std::string &desc, Addr addr)
|
||||
: PCEvent(q, desc, addr)
|
||||
{}
|
||||
virtual void process(ThreadContext *tc);
|
||||
};
|
||||
|
||||
#endif // __KERN_ALPHA_IDLE_EVENT_HH__
|
|
@ -29,11 +29,9 @@
|
|||
* Nathan Binkert
|
||||
*/
|
||||
|
||||
#include "cpu/base.hh"
|
||||
#include "base/trace.hh"
|
||||
#include "cpu/thread_context.hh"
|
||||
#include "kern/kernel_stats.hh"
|
||||
#include "kern/system_events.hh"
|
||||
#include "sim/system.hh"
|
||||
|
||||
using namespace TheISA;
|
||||
|
||||
|
@ -47,19 +45,4 @@ SkipFuncEvent::process(ThreadContext *tc)
|
|||
|
||||
tc->setPC(newpc);
|
||||
tc->setNextPC(tc->readPC() + sizeof(TheISA::MachInst));
|
||||
/*
|
||||
BranchPred *bp = tc->getCpuPtr()->getBranchPred();
|
||||
if (bp != NULL) {
|
||||
bp->popRAS(tc->getThreadNum());
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
void
|
||||
IdleStartEvent::process(ThreadContext *tc)
|
||||
{
|
||||
if (tc->getKernelStats())
|
||||
tc->getKernelStats()->setIdleProcess(
|
||||
tc->readMiscReg(AlphaISA::IPR_PALtemp23), tc);
|
||||
remove();
|
||||
}
|
||||
|
|
|
@ -35,8 +35,6 @@
|
|||
|
||||
#include "cpu/pc_event.hh"
|
||||
|
||||
class System;
|
||||
|
||||
class SkipFuncEvent : public PCEvent
|
||||
{
|
||||
public:
|
||||
|
@ -46,13 +44,4 @@ class SkipFuncEvent : public PCEvent
|
|||
virtual void process(ThreadContext *tc);
|
||||
};
|
||||
|
||||
class IdleStartEvent : public PCEvent
|
||||
{
|
||||
public:
|
||||
IdleStartEvent(PCEventQueue *q, const std::string &desc, Addr addr)
|
||||
: PCEvent(q, desc, addr)
|
||||
{}
|
||||
virtual void process(ThreadContext *tc);
|
||||
};
|
||||
|
||||
#endif // __SYSTEM_EVENTS_HH__
|
||||
|
|
Loading…
Reference in a new issue