463aa6d49d
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
231 lines
6.2 KiB
C++
231 lines
6.2 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 __SYSTEM_HH__
|
|
#define __SYSTEM_HH__
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/statistics.hh"
|
|
#include "base/loader/symtab.hh"
|
|
#include "cpu/pc_event.hh"
|
|
#include "kern/system_events.hh"
|
|
#include "sim/sim_object.hh"
|
|
|
|
class BaseCPU;
|
|
class ExecContext;
|
|
class GDBListener;
|
|
class MemoryController;
|
|
class ObjectFile;
|
|
class PhysicalMemory;
|
|
class Platform;
|
|
class RemoteGDB;
|
|
namespace Kernel { class Binning; }
|
|
|
|
class System : public SimObject
|
|
{
|
|
protected:
|
|
typedef TheISA::Addr Addr;
|
|
public:
|
|
MemoryController *memctrl;
|
|
PhysicalMemory *physmem;
|
|
Platform *platform;
|
|
PCEventQueue pcEventQueue;
|
|
uint64_t init_param;
|
|
|
|
std::vector<ExecContext *> execContexts;
|
|
int numcpus;
|
|
|
|
int getNumCPUs()
|
|
{
|
|
if (numcpus != execContexts.size())
|
|
panic("cpu array not fully populated!");
|
|
|
|
return numcpus;
|
|
}
|
|
|
|
/** kernel symbol table */
|
|
SymbolTable *kernelSymtab;
|
|
|
|
/** console symbol table */
|
|
SymbolTable *consoleSymtab;
|
|
|
|
/** pal symbol table */
|
|
SymbolTable *palSymtab;
|
|
|
|
/** Object pointer for the kernel code */
|
|
ObjectFile *kernel;
|
|
|
|
/** Object pointer for the console code */
|
|
ObjectFile *console;
|
|
|
|
/** Object pointer for the PAL code */
|
|
ObjectFile *pal;
|
|
|
|
/** Begining of kernel code */
|
|
Addr kernelStart;
|
|
|
|
/** End of kernel code */
|
|
Addr kernelEnd;
|
|
|
|
/** Entry point in the kernel to start at */
|
|
Addr kernelEntry;
|
|
|
|
Kernel::Binning *kernelBinning;
|
|
|
|
#ifndef NDEBUG
|
|
/** Event to halt the simulator if the console calls panic() */
|
|
BreakPCEvent *consolePanicEvent;
|
|
#endif
|
|
|
|
protected:
|
|
|
|
/**
|
|
* Fix up an address used to match PCs for hooking simulator
|
|
* events on to target function executions. See comment in
|
|
* system.cc for details.
|
|
*/
|
|
Addr fixFuncEventAddr(Addr addr);
|
|
|
|
/**
|
|
* Add a function-based event to the given function, to be looked
|
|
* up in the specified symbol table.
|
|
*/
|
|
template <class T>
|
|
T *System::addFuncEvent(SymbolTable *symtab, const char *lbl)
|
|
{
|
|
Addr addr = 0; // initialize only to avoid compiler warning
|
|
|
|
if (symtab->findAddress(lbl, addr)) {
|
|
T *ev = new T(&pcEventQueue, lbl, fixFuncEventAddr(addr));
|
|
return ev;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/** Add a function-based event to kernel code. */
|
|
template <class T>
|
|
T *System::addKernelFuncEvent(const char *lbl)
|
|
{
|
|
return addFuncEvent<T>(kernelSymtab, lbl);
|
|
}
|
|
|
|
/** Add a function-based event to PALcode. */
|
|
template <class T>
|
|
T *System::addPalFuncEvent(const char *lbl)
|
|
{
|
|
return addFuncEvent<T>(palSymtab, lbl);
|
|
}
|
|
|
|
/** Add a function-based event to the console code. */
|
|
template <class T>
|
|
T *System::addConsoleFuncEvent(const char *lbl)
|
|
{
|
|
return addFuncEvent<T>(consoleSymtab, lbl);
|
|
}
|
|
|
|
public:
|
|
std::vector<RemoteGDB *> remoteGDB;
|
|
std::vector<GDBListener *> gdbListen;
|
|
bool breakpoint();
|
|
|
|
public:
|
|
struct Params
|
|
{
|
|
std::string name;
|
|
Tick boot_cpu_frequency;
|
|
MemoryController *memctrl;
|
|
PhysicalMemory *physmem;
|
|
uint64_t init_param;
|
|
bool bin;
|
|
std::vector<std::string> binned_fns;
|
|
bool bin_int;
|
|
|
|
std::string kernel_path;
|
|
std::string console_path;
|
|
std::string palcode;
|
|
std::string boot_osflags;
|
|
|
|
std::string readfile;
|
|
uint64_t system_type;
|
|
uint64_t system_rev;
|
|
};
|
|
Params *params;
|
|
|
|
System(Params *p);
|
|
~System();
|
|
|
|
void startup();
|
|
|
|
public:
|
|
/**
|
|
* Set the m5AlphaAccess pointer in the console
|
|
*/
|
|
void setAlphaAccess(Addr access);
|
|
|
|
/**
|
|
* Returns the addess the kernel starts at.
|
|
* @return address the kernel starts at
|
|
*/
|
|
Addr getKernelStart() const { return kernelStart; }
|
|
|
|
/**
|
|
* Returns the addess the kernel ends at.
|
|
* @return address the kernel ends at
|
|
*/
|
|
Addr getKernelEnd() const { return kernelEnd; }
|
|
|
|
/**
|
|
* Returns the addess the entry point to the kernel code.
|
|
* @return entry point of the kernel code
|
|
*/
|
|
Addr getKernelEntry() const { return kernelEntry; }
|
|
|
|
int registerExecContext(ExecContext *xc, int xcIndex);
|
|
void replaceExecContext(ExecContext *xc, int xcIndex);
|
|
|
|
void regStats();
|
|
void serialize(std::ostream &os);
|
|
void unserialize(Checkpoint *cp, const std::string §ion);
|
|
|
|
public:
|
|
////////////////////////////////////////////
|
|
//
|
|
// STATIC GLOBAL SYSTEM LIST
|
|
//
|
|
////////////////////////////////////////////
|
|
|
|
static std::vector<System *> systemList;
|
|
static int numSystemsRunning;
|
|
|
|
static void printSystems();
|
|
};
|
|
|
|
#endif // __SYSTEM_HH__
|