91cb532f9f
This fixes detailed-mpboot, which was broken as of my last change.
Also clean up some of the ExecContext status initialization.
cpu/base_cpu.hh:
CPU::execCtxStatusChg() now takes thread_num as an arg so the CPU knows
which execContext had the status change.
BaseCPU::registerExecContexts() no longer needs to be virtual.
cpu/exec_context.cc:
Initialize _status directly... don't use setStatus() as this will notify the CPU
of the change before it is ready.
CPU::execCtxStatusChg() now takes thread_num as an arg so the CPU knows
which execContext had the status change.
cpu/exec_context.hh:
Don't need initStatus() any more.
cpu/simple_cpu/simple_cpu.cc:
Move execCtxStatusChg() from header to .cc file.
No longer need specialized version of registerExecContexts to schedule TickEvent.
cpu/simple_cpu/simple_cpu.hh:
Move execCtxStatusChg() from header to .cc file.
CPU::execCtxStatusChg() now takes thread_num as arg (must be 0 for SimpleCPU).
No longer need specialized version of registerExecContexts to schedule TickEvent.
kern/tru64/tru64_system.cc:
Don't need initRegs; the PC etc. get initialized in the CPU constructor.
ExecContexts start out as Unallocated, so no need to set them to Unallocated here.
kern/tru64/tru64_system.hh:
Don't need initRegs; the PC etc. get initialized in the CPU constructor.
sim/prog.cc:
ExecContexts start out as Unallocated, so no need to set them to Unallocated here.
--HG--
extra : convert_revision : e960ebbeb845960344633798e251b6c8bf1c0378
124 lines
3.9 KiB
C++
124 lines
3.9 KiB
C++
/*
|
|
* Copyright (c) 2003 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.
|
|
*/
|
|
|
|
#include <string>
|
|
|
|
#include "cpu/base_cpu.hh"
|
|
#include "cpu/exec_context.hh"
|
|
|
|
#ifdef FULL_SYSTEM
|
|
#include "sim/system.hh"
|
|
#else
|
|
#include "sim/prog.hh"
|
|
#endif
|
|
|
|
using namespace std;
|
|
|
|
// constructor
|
|
#ifdef FULL_SYSTEM
|
|
ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, System *_sys,
|
|
AlphaItb *_itb, AlphaDtb *_dtb,
|
|
FunctionalMemory *_mem)
|
|
: _status(ExecContext::Unallocated),
|
|
kernelStats(this, _cpu), cpu(_cpu), thread_num(_thread_num),
|
|
cpu_id(-1), mem(_mem), itb(_itb), dtb(_dtb), system(_sys),
|
|
memCtrl(_sys->memCtrl), physmem(_sys->physmem),
|
|
func_exe_insn(0), storeCondFailures(0)
|
|
{
|
|
memset(®s, 0, sizeof(RegFile));
|
|
}
|
|
#else
|
|
ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num,
|
|
Process *_process, int _asid)
|
|
: _status(ExecContext::Unallocated),
|
|
cpu(_cpu), thread_num(_thread_num), cpu_id(-1),
|
|
process(_process), mem(process->getMemory()), asid(_asid),
|
|
func_exe_insn(0), storeCondFailures(0)
|
|
{
|
|
}
|
|
|
|
ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num,
|
|
FunctionalMemory *_mem, int _asid)
|
|
: cpu(_cpu), thread_num(_thread_num), process(0), mem(_mem), asid(_asid),
|
|
func_exe_insn(0), storeCondFailures(0)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
|
|
void
|
|
ExecContext::takeOverFrom(ExecContext *oldContext)
|
|
{
|
|
// some things should already be set up
|
|
assert(mem == oldContext->mem);
|
|
#ifdef FULL_SYSTEM
|
|
assert(system == oldContext->system);
|
|
#else
|
|
assert(process == oldContext->process);
|
|
#endif
|
|
|
|
// copy over functional state
|
|
_status = oldContext->_status;
|
|
#ifdef FULL_SYSTEM
|
|
kernelStats = oldContext->kernelStats;
|
|
#endif
|
|
regs = oldContext->regs;
|
|
cpu_id = oldContext->cpu_id;
|
|
func_exe_insn = oldContext->func_exe_insn;
|
|
|
|
storeCondFailures = 0;
|
|
|
|
oldContext->_status = ExecContext::Unallocated;
|
|
}
|
|
|
|
|
|
void
|
|
ExecContext::setStatus(Status new_status)
|
|
{
|
|
#ifdef FULL_SYSTEM
|
|
if (status() == new_status)
|
|
return;
|
|
|
|
// Don't change the status from active if there are pending interrupts
|
|
if (new_status == Suspended && cpu->check_interrupts()) {
|
|
assert(status() == Active);
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
_status = new_status;
|
|
cpu->execCtxStatusChg(thread_num);
|
|
}
|
|
|
|
void
|
|
ExecContext::regStats(const string &name)
|
|
{
|
|
#ifdef FULL_SYSTEM
|
|
kernelStats.regStats(name + ".kern");
|
|
#endif
|
|
}
|