arch/alpha/alpha_linux_process.cc:
Added using directive for AlphaISA namespace
arch/alpha/alpha_memory.hh:
arch/alpha/isa/branch.isa:
cpu/pc_event.hh:
Added typedefs for Addr
arch/alpha/alpha_tru64_process.cc:
arch/alpha/arguments.cc:
Added using directive for AlphaISA
arch/alpha/ev5.hh:
Added an include of arch/alpha/isa_traits.hh, and a using directive for the AlphaISA namespace.
arch/alpha/faults.hh:
Added a typedef for the Addr type, and changed the formatting of the faults slightly.
arch/alpha/isa/main.isa:
Untemplatized StaticInst, added a using for namespace AlphaISA to show up in decoder.cc and the exec.ccs, relocated makeNop to decoder.hh
arch/alpha/isa/mem.isa:
Untemplatized StaticInst and StaticInstPtr
arch/alpha/isa/pal.isa:
cpu/base_dyn_inst.cc:
Untemplatized StaticInstPtr
arch/alpha/isa_traits.hh:
Changed variables to be externs instead of static since they are part of a namespace and not a class.
arch/alpha/stacktrace.cc:
Untemplatized StaticInstPtr, and added a using directive for AlphaISA.
arch/alpha/stacktrace.hh:
Added some typedefs for Addr and MachInst, and untemplatized StaticInstPtr
arch/alpha/vtophys.cc:
Added a using directive for AlphaISA
arch/alpha/vtophys.hh:
Added the AlphaISA namespace specifier where needed
arch/isa_parser.py:
Changed the placement of the definition of the decodeInst function to be outside the namespaceInst namespace.
base/loader/object_file.hh:
cpu/o3/bpred_unit.hh:
Added a typedef for Addr
base/loader/symtab.hh:
Added a typedef for Addr, and added a TheISA to Addr in another typedef
base/remote_gdb.cc:
Added a using namespace TheISA, and untemplatized StaticInstPtr
base/remote_gdb.hh:
Added typedefs for Addr and MachInst
cpu/base.cc:
Added TheISA specifier to some variables exported from the isa.
cpu/base.hh:
Added a typedef for Addr, and TheISA to some variables from the ISA
cpu/base_dyn_inst.hh:
Untemplatized StaticInstPtr, and added TheISA specifier to some variables from the ISA.
cpu/exec_context.hh:
Added some typedefs for types from the isa, and added TheISA specifier to some variables from the isa
cpu/exetrace.hh:
Added typedefs for some types from the ISA, and untemplatized StaticInstPtr
cpu/memtest/memtest.cc:
cpu/o3/btb.cc:
dev/baddev.cc:
dev/ide_ctrl.cc:
dev/ide_disk.cc:
dev/isa_fake.cc:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/platform.cc:
dev/sinic.cc:
dev/uart8250.cc:
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
kern/system_events.cc:
kern/tru64/dump_mbuf.cc:
kern/tru64/tru64_events.cc:
sim/process.cc:
sim/pseudo_inst.cc:
sim/system.cc:
Added using namespace TheISA
cpu/memtest/memtest.hh:
cpu/trace/opt_cpu.hh:
cpu/trace/reader/itx_reader.hh:
dev/ide_disk.hh:
dev/pcidev.hh:
dev/platform.hh:
dev/tsunami.hh:
sim/system.hh:
sim/vptr.hh:
Added typedef for Addr
cpu/o3/2bit_local_pred.hh:
Changed the include to use arch/isa_traits.hh instead of arch/alpha/isa_traits.hh. Added typedef for Addr
cpu/o3/alpha_cpu.hh:
Added typedefs for Addr and IntReg
cpu/o3/alpha_cpu_impl.hh:
Added this-> to setNextPC to fix a problem since it didn't depend on template parameters any more. Removed "typename" where it was no longer needed.
cpu/o3/alpha_dyn_inst.hh:
Cleaned up some typedefs, and untemplatized StaticInst
cpu/o3/alpha_dyn_inst_impl.hh:
untemplatized StaticInstPtr
cpu/o3/alpha_impl.hh:
Fixed up a typedef of MachInst
cpu/o3/bpred_unit_impl.hh:
Added a using TheISA::MachInst to a function
cpu/o3/btb.hh:
Changed an include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr
cpu/o3/commit.hh:
Removed a typedef of Impl::ISA as ISA, since TheISA takes care of this now.
cpu/o3/cpu.cc:
Cleaned up namespace issues
cpu/o3/cpu.hh:
Cleaned up namespace usage
cpu/o3/decode.hh:
Removed typedef of ISA, and changed it to TheISA
cpu/o3/fetch.hh:
Fized up typedefs, and changed ISA to TheISA
cpu/o3/free_list.hh:
Changed include of arch/alpha/isa_traits.hh to arch/isa_traits.hh
cpu/o3/iew.hh:
Removed typedef of ISA
cpu/o3/iew_impl.hh:
Added TheISA namespace specifier to MachInst
cpu/o3/ras.hh:
Changed include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr.
cpu/o3/regfile.hh:
Changed ISA to TheISA, and added some typedefs for Addr, IntReg, FloatReg, and MiscRegFile
cpu/o3/rename.hh:
Changed ISA to TheISA, and added a typedef for RegIndex
cpu/o3/rename_map.hh:
Added an include for arch/isa_traits.hh, and a typedef for RegIndex
cpu/o3/rob.hh:
Added a typedef for RegIndex
cpu/o3/store_set.hh:
cpu/o3/tournament_pred.hh:
Changed an include of arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef of Addr
cpu/ozone/cpu.hh:
Changed ISA into TheISA, and untemplatized StaticInst
cpu/pc_event.cc:
Added namespace specifier TheISA to Addr types
cpu/profile.hh:
kern/kernel_stats.hh:
Added typedef for Addr, and untemplatized StaticInstPtr
cpu/simple/cpu.cc:
Changed using directive from LittleEndianGuest to AlphaISA, which will contain both namespaces. Added TheISA where needed, and untemplatized StaticInst
cpu/simple/cpu.hh:
Added a typedef for MachInst, and untemplatized StaticInst
cpu/static_inst.cc:
Untemplatized StaticInst
cpu/static_inst.hh:
Untemplatized StaticInst by using the TheISA namespace
dev/alpha_console.cc:
Added using namespace AlphaISA
dev/simple_disk.hh:
Added typedef for Addr and fixed up some formatting
dev/sinicreg.hh:
Added TheISA namespace specifier where needed
dev/tsunami.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Added using namespace TheISA. It might be better for it to be AlphaISA
dev/tsunami_cchip.cc:
Added typedef for TheISA. It might be better for it to be AlphaISA
kern/linux/aligned.hh:
sim/pseudo_inst.hh:
Added TheISA namespace specifier to Addr
kern/linux/linux_threadinfo.hh:
Added typedef for Addr, and TheISA namespace specifier to StackPointerReg
kern/tru64/mbuf.hh:
Added TheISA to Addr type in structs
sim/process.hh:
Added typedefs of Addr, RegFile, and MachInst
sim/syscall_emul.cc:
Added using namespace TheISA, and a cast of VMPageSize to the int type
sim/syscall_emul.hh:
Added typecast for Addr, and TheISA namespace specifier for where needed
--HG--
extra : convert_revision : 91d4f6ca33a73b21c1f1771d74bfdea3b80eff45
347 lines
9.6 KiB
C++
347 lines
9.6 KiB
C++
/*
|
|
* Copyright (c) 2002-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.
|
|
*/
|
|
|
|
#ifndef __CPU_SIMPLE_CPU_SIMPLE_CPU_HH__
|
|
#define __CPU_SIMPLE_CPU_SIMPLE_CPU_HH__
|
|
|
|
#include "base/statistics.hh"
|
|
#include "config/full_system.hh"
|
|
#include "cpu/base.hh"
|
|
#include "cpu/exec_context.hh"
|
|
#include "cpu/pc_event.hh"
|
|
#include "cpu/sampler/sampler.hh"
|
|
#include "cpu/static_inst.hh"
|
|
#include "sim/eventq.hh"
|
|
|
|
// forward declarations
|
|
#if FULL_SYSTEM
|
|
class Processor;
|
|
class AlphaITB;
|
|
class AlphaDTB;
|
|
class PhysicalMemory;
|
|
|
|
class RemoteGDB;
|
|
class GDBListener;
|
|
|
|
#else
|
|
|
|
class Process;
|
|
|
|
#endif // FULL_SYSTEM
|
|
|
|
class MemInterface;
|
|
class Checkpoint;
|
|
|
|
namespace Trace {
|
|
class InstRecord;
|
|
}
|
|
|
|
class SimpleCPU : public BaseCPU
|
|
{
|
|
protected:
|
|
typedef TheISA::MachInst MachInst;
|
|
public:
|
|
// main simulation loop (one cycle)
|
|
void tick();
|
|
|
|
private:
|
|
struct TickEvent : public Event
|
|
{
|
|
SimpleCPU *cpu;
|
|
int width;
|
|
|
|
TickEvent(SimpleCPU *c, int w);
|
|
void process();
|
|
const char *description();
|
|
};
|
|
|
|
TickEvent tickEvent;
|
|
|
|
/// Schedule tick event, regardless of its current state.
|
|
void scheduleTickEvent(int numCycles)
|
|
{
|
|
if (tickEvent.squashed())
|
|
tickEvent.reschedule(curTick + cycles(numCycles));
|
|
else if (!tickEvent.scheduled())
|
|
tickEvent.schedule(curTick + cycles(numCycles));
|
|
}
|
|
|
|
/// Unschedule tick event, regardless of its current state.
|
|
void unscheduleTickEvent()
|
|
{
|
|
if (tickEvent.scheduled())
|
|
tickEvent.squash();
|
|
}
|
|
|
|
private:
|
|
Trace::InstRecord *traceData;
|
|
|
|
public:
|
|
//
|
|
enum Status {
|
|
Running,
|
|
Idle,
|
|
IcacheMissStall,
|
|
IcacheMissComplete,
|
|
DcacheMissStall,
|
|
DcacheMissSwitch,
|
|
SwitchedOut
|
|
};
|
|
|
|
private:
|
|
Status _status;
|
|
|
|
public:
|
|
void post_interrupt(int int_num, int index);
|
|
|
|
void zero_fill_64(Addr addr) {
|
|
static int warned = 0;
|
|
if (!warned) {
|
|
warn ("WH64 is not implemented");
|
|
warned = 1;
|
|
}
|
|
};
|
|
|
|
public:
|
|
struct Params : public BaseCPU::Params
|
|
{
|
|
MemInterface *icache_interface;
|
|
MemInterface *dcache_interface;
|
|
int width;
|
|
#if FULL_SYSTEM
|
|
AlphaITB *itb;
|
|
AlphaDTB *dtb;
|
|
FunctionalMemory *mem;
|
|
#else
|
|
Process *process;
|
|
#endif
|
|
};
|
|
SimpleCPU(Params *params);
|
|
virtual ~SimpleCPU();
|
|
|
|
public:
|
|
// execution context
|
|
ExecContext *xc;
|
|
|
|
void switchOut(Sampler *s);
|
|
void takeOverFrom(BaseCPU *oldCPU);
|
|
|
|
#if FULL_SYSTEM
|
|
Addr dbg_vtophys(Addr addr);
|
|
|
|
bool interval_stats;
|
|
#endif
|
|
|
|
// L1 instruction cache
|
|
MemInterface *icacheInterface;
|
|
|
|
// L1 data cache
|
|
MemInterface *dcacheInterface;
|
|
|
|
// current instruction
|
|
MachInst inst;
|
|
|
|
// Refcounted pointer to the one memory request.
|
|
MemReqPtr memReq;
|
|
|
|
// Pointer to the sampler that is telling us to switchover.
|
|
// Used to signal the completion of the pipe drain and schedule
|
|
// the next switchover
|
|
Sampler *sampler;
|
|
|
|
StaticInstPtr curStaticInst;
|
|
|
|
class CacheCompletionEvent : public Event
|
|
{
|
|
private:
|
|
SimpleCPU *cpu;
|
|
|
|
public:
|
|
CacheCompletionEvent(SimpleCPU *_cpu);
|
|
|
|
virtual void process();
|
|
virtual const char *description();
|
|
};
|
|
|
|
CacheCompletionEvent cacheCompletionEvent;
|
|
|
|
Status status() const { return _status; }
|
|
|
|
virtual void activateContext(int thread_num, int delay);
|
|
virtual void suspendContext(int thread_num);
|
|
virtual void deallocateContext(int thread_num);
|
|
virtual void haltContext(int thread_num);
|
|
|
|
// statistics
|
|
virtual void regStats();
|
|
virtual void resetStats();
|
|
|
|
// number of simulated instructions
|
|
Counter numInst;
|
|
Counter startNumInst;
|
|
Stats::Scalar<> numInsts;
|
|
|
|
virtual Counter totalInstructions() const
|
|
{
|
|
return numInst - startNumInst;
|
|
}
|
|
|
|
// number of simulated memory references
|
|
Stats::Scalar<> numMemRefs;
|
|
|
|
// number of simulated loads
|
|
Counter numLoad;
|
|
Counter startNumLoad;
|
|
|
|
// number of idle cycles
|
|
Stats::Average<> notIdleFraction;
|
|
Stats::Formula idleFraction;
|
|
|
|
// number of cycles stalled for I-cache misses
|
|
Stats::Scalar<> icacheStallCycles;
|
|
Counter lastIcacheStall;
|
|
|
|
// number of cycles stalled for D-cache misses
|
|
Stats::Scalar<> dcacheStallCycles;
|
|
Counter lastDcacheStall;
|
|
|
|
void processCacheCompletion();
|
|
|
|
virtual void serialize(std::ostream &os);
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
|
|
template <class T>
|
|
Fault * read(Addr addr, T &data, unsigned flags);
|
|
|
|
template <class T>
|
|
Fault * write(T data, Addr addr, unsigned flags, uint64_t *res);
|
|
|
|
// These functions are only used in CPU models that split
|
|
// effective address computation from the actual memory access.
|
|
void setEA(Addr EA) { panic("SimpleCPU::setEA() not implemented\n"); }
|
|
Addr getEA() { panic("SimpleCPU::getEA() not implemented\n"); }
|
|
|
|
void prefetch(Addr addr, unsigned flags)
|
|
{
|
|
// need to do this...
|
|
}
|
|
|
|
void writeHint(Addr addr, int size, unsigned flags)
|
|
{
|
|
// need to do this...
|
|
}
|
|
|
|
Fault * copySrcTranslate(Addr src);
|
|
|
|
Fault * copy(Addr dest);
|
|
|
|
// The register accessor methods provide the index of the
|
|
// instruction's operand (e.g., 0 or 1), not the architectural
|
|
// register index, to simplify the implementation of register
|
|
// renaming. We find the architectural register index by indexing
|
|
// into the instruction's own operand index table. Note that a
|
|
// raw pointer to the StaticInst is provided instead of a
|
|
// ref-counted StaticInstPtr to redice overhead. This is fine as
|
|
// long as these methods don't copy the pointer into any long-term
|
|
// storage (which is pretty hard to imagine they would have reason
|
|
// to do).
|
|
|
|
uint64_t readIntReg(const StaticInst *si, int idx)
|
|
{
|
|
return xc->readIntReg(si->srcRegIdx(idx));
|
|
}
|
|
|
|
float readFloatRegSingle(const StaticInst *si, int idx)
|
|
{
|
|
int reg_idx = si->srcRegIdx(idx) - TheISA::FP_Base_DepTag;
|
|
return xc->readFloatRegSingle(reg_idx);
|
|
}
|
|
|
|
double readFloatRegDouble(const StaticInst *si, int idx)
|
|
{
|
|
int reg_idx = si->srcRegIdx(idx) - TheISA::FP_Base_DepTag;
|
|
return xc->readFloatRegDouble(reg_idx);
|
|
}
|
|
|
|
uint64_t readFloatRegInt(const StaticInst *si, int idx)
|
|
{
|
|
int reg_idx = si->srcRegIdx(idx) - TheISA::FP_Base_DepTag;
|
|
return xc->readFloatRegInt(reg_idx);
|
|
}
|
|
|
|
void setIntReg(const StaticInst *si, int idx, uint64_t val)
|
|
{
|
|
xc->setIntReg(si->destRegIdx(idx), val);
|
|
}
|
|
|
|
void setFloatRegSingle(const StaticInst *si, int idx, float val)
|
|
{
|
|
int reg_idx = si->destRegIdx(idx) - TheISA::FP_Base_DepTag;
|
|
xc->setFloatRegSingle(reg_idx, val);
|
|
}
|
|
|
|
void setFloatRegDouble(const StaticInst *si, int idx, double val)
|
|
{
|
|
int reg_idx = si->destRegIdx(idx) - TheISA::FP_Base_DepTag;
|
|
xc->setFloatRegDouble(reg_idx, val);
|
|
}
|
|
|
|
void setFloatRegInt(const StaticInst *si, int idx, uint64_t val)
|
|
{
|
|
int reg_idx = si->destRegIdx(idx) - TheISA::FP_Base_DepTag;
|
|
xc->setFloatRegInt(reg_idx, val);
|
|
}
|
|
|
|
uint64_t readPC() { return xc->readPC(); }
|
|
void setNextPC(uint64_t val) { xc->setNextPC(val); }
|
|
|
|
uint64_t readUniq() { return xc->readUniq(); }
|
|
void setUniq(uint64_t val) { xc->setUniq(val); }
|
|
|
|
uint64_t readFpcr() { return xc->readFpcr(); }
|
|
void setFpcr(uint64_t val) { xc->setFpcr(val); }
|
|
|
|
#if FULL_SYSTEM
|
|
uint64_t readIpr(int idx, Fault * &fault) { return xc->readIpr(idx, fault); }
|
|
Fault * setIpr(int idx, uint64_t val) { return xc->setIpr(idx, val); }
|
|
Fault * hwrei() { return xc->hwrei(); }
|
|
int readIntrFlag() { return xc->readIntrFlag(); }
|
|
void setIntrFlag(int val) { xc->setIntrFlag(val); }
|
|
bool inPalMode() { return xc->inPalMode(); }
|
|
void ev5_trap(Fault * fault) { xc->ev5_trap(fault); }
|
|
bool simPalCheck(int palFunc) { return xc->simPalCheck(palFunc); }
|
|
#else
|
|
void syscall() { xc->syscall(); }
|
|
#endif
|
|
|
|
bool misspeculating() { return xc->misspeculating(); }
|
|
ExecContext *xcBase() { return xc; }
|
|
};
|
|
|
|
#endif // __CPU_SIMPLE_CPU_SIMPLE_CPU_HH__
|