17f870f6d8
The changes largely are fixing up the memory accesses to use ports/Requests/Packets, supporting the splitting off of instantiation of template classes, and handling some of the reorganization that happened.
OzoneCPU is untested for now but at least compiles. Fixes will be coming shortly.
SConstruct:
Remove OzoneSimpleCPU from list of CPUs.
src/cpu/SConscript:
Leave out OzoneSimpleCPU.
src/cpu/ozone/bpred_unit.cc:
Fixes to get OzoneCPU to compile.
src/cpu/ozone/checker_builder.cc:
src/cpu/ozone/cpu.cc:
src/cpu/ozone/cpu.hh:
src/cpu/ozone/cpu_builder.cc:
src/cpu/ozone/cpu_impl.hh:
src/cpu/ozone/dyn_inst.hh:
src/cpu/ozone/dyn_inst_impl.hh:
src/cpu/ozone/front_end.cc:
src/cpu/ozone/front_end.hh:
src/cpu/ozone/front_end_impl.hh:
src/cpu/ozone/lw_back_end.hh:
src/cpu/ozone/lw_back_end_impl.hh:
src/cpu/ozone/lw_lsq.hh:
src/cpu/ozone/lw_lsq_impl.hh:
src/cpu/ozone/ozone_impl.hh:
src/cpu/ozone/rename_table.cc:
src/cpu/ozone/simple_params.hh:
src/cpu/ozone/thread_state.hh:
Fixes to get OzoneCPU back to compiling.
--HG--
extra : convert_revision : 90ffb397263bcf9fea3987317272c64f2b20f7e6
135 lines
4.0 KiB
C++
135 lines
4.0 KiB
C++
/*
|
|
* Copyright (c) 2006 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: Kevin Lim
|
|
*/
|
|
|
|
#ifndef __CPU_OZONE_THREAD_STATE_HH__
|
|
#define __CPU_OZONE_THREAD_STATE_HH__
|
|
|
|
#include "arch/faults.hh"
|
|
#include "arch/isa_traits.hh"
|
|
#include "cpu/thread_context.hh"
|
|
#include "cpu/thread_state.hh"
|
|
#include "sim/process.hh"
|
|
|
|
class Event;
|
|
//class Process;
|
|
|
|
#if FULL_SYSTEM
|
|
class EndQuiesceEvent;
|
|
class FunctionProfile;
|
|
class ProfileNode;
|
|
#else
|
|
class Process;
|
|
class FunctionalMemory;
|
|
#endif
|
|
|
|
// Maybe this ozone thread state should only really have committed state?
|
|
// I need to think about why I'm using this and what it's useful for. Clearly
|
|
// has benefits for SMT; basically serves same use as SimpleThread.
|
|
// Makes the ExecContext proxy easier. Gives organization/central access point
|
|
// to state of a thread that can be accessed normally (i.e. not in-flight
|
|
// stuff within a OoO processor). Does this need an TC proxy within it?
|
|
template <class Impl>
|
|
struct OzoneThreadState : public ThreadState {
|
|
typedef typename ThreadContext::Status Status;
|
|
typedef typename Impl::CPUType CPUType;
|
|
typedef TheISA::MiscReg MiscReg;
|
|
|
|
#if FULL_SYSTEM
|
|
OzoneThreadState(CPUType *_cpu, int _thread_num)
|
|
: ThreadState(-1, _thread_num),
|
|
intrflag(0), inSyscall(0), trapPending(0)
|
|
{
|
|
miscRegFile.clear();
|
|
}
|
|
#else
|
|
OzoneThreadState(CPUType *_cpu, int _thread_num, Process *_process,
|
|
int _asid, MemObject *mem)
|
|
: ThreadState(-1, _thread_num, _process, _asid, mem),
|
|
cpu(_cpu), inSyscall(0), trapPending(0)
|
|
{
|
|
miscRegFile.clear();
|
|
}
|
|
#endif
|
|
|
|
RenameTable<Impl> renameTable;
|
|
|
|
Addr PC;
|
|
|
|
Addr nextPC;
|
|
|
|
TheISA::MiscRegFile miscRegFile;
|
|
|
|
int intrflag;
|
|
|
|
typename Impl::CPUType *cpu;
|
|
|
|
bool inSyscall;
|
|
|
|
bool trapPending;
|
|
|
|
ThreadContext *tc;
|
|
|
|
ThreadContext *getTC() { return tc; }
|
|
|
|
MiscReg readMiscReg(int misc_reg)
|
|
{
|
|
return miscRegFile.readReg(misc_reg);
|
|
}
|
|
|
|
MiscReg readMiscRegWithEffect(int misc_reg, Fault &fault)
|
|
{
|
|
return miscRegFile.readRegWithEffect(misc_reg, fault, tc);
|
|
}
|
|
|
|
Fault setMiscReg(int misc_reg, const MiscReg &val)
|
|
{
|
|
return miscRegFile.setReg(misc_reg, val);
|
|
}
|
|
|
|
Fault setMiscRegWithEffect(int misc_reg, const MiscReg &val)
|
|
{
|
|
return miscRegFile.setRegWithEffect(misc_reg, val, tc);
|
|
}
|
|
|
|
uint64_t readPC()
|
|
{ return PC; }
|
|
|
|
void setPC(uint64_t val)
|
|
{ PC = val; }
|
|
|
|
uint64_t readNextPC()
|
|
{ return nextPC; }
|
|
|
|
void setNextPC(uint64_t val)
|
|
{ nextPC = val; }
|
|
};
|
|
|
|
#endif // __CPU_OZONE_THREAD_STATE_HH__
|