First cut at moving alpha specefic stuff out of /sim/system* into
arch/alpha/system*.
SConscript:
dev/alpha_console.cc:
dev/alpha_console.hh:
kern/freebsd/freebsd_system.cc:
kern/freebsd/freebsd_system.hh:
kern/kernel_stats.cc:
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
sim/pseudo_inst.cc:
sim/system.cc:
sim/system.hh:
First cut at moving alpha specefic stuff out of /sim/system*
--HG--
extra : convert_revision : eba58f537fc04e605af4fc216e184b074a44c8a0
This commit is contained in:
@@ -34,6 +34,7 @@
|
||||
#include <cstdio>
|
||||
#include <string>
|
||||
|
||||
#include "arch/alpha/system.hh"
|
||||
#include "base/inifile.hh"
|
||||
#include "base/str.hh"
|
||||
#include "base/trace.hh"
|
||||
@@ -50,13 +51,12 @@
|
||||
#include "mem/functional/physical.hh"
|
||||
#include "sim/builder.hh"
|
||||
#include "sim/sim_object.hh"
|
||||
#include "sim/system.hh"
|
||||
|
||||
using namespace std;
|
||||
using namespace AlphaISA;
|
||||
|
||||
AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d,
|
||||
System *s, BaseCPU *c, Platform *p,
|
||||
AlphaSystem *s, BaseCPU *c, Platform *p,
|
||||
MemoryController *mmu, Addr a,
|
||||
HierParams *hier, Bus *pio_bus)
|
||||
: PioDevice(name, p), disk(d), console(cons), system(s), cpu(c), addr(a)
|
||||
@@ -323,7 +323,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
|
||||
SimObjectParam<SimpleDisk *> disk;
|
||||
SimObjectParam<MemoryController *> mmu;
|
||||
Param<Addr> addr;
|
||||
SimObjectParam<System *> system;
|
||||
SimObjectParam<AlphaSystem *> system;
|
||||
SimObjectParam<BaseCPU *> cpu;
|
||||
SimObjectParam<Platform *> platform;
|
||||
SimObjectParam<Bus*> pio_bus;
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
class BaseCPU;
|
||||
class SimConsole;
|
||||
class System;
|
||||
class AlphaSystem;
|
||||
class SimpleDisk;
|
||||
|
||||
/**
|
||||
@@ -90,7 +90,7 @@ class AlphaConsole : public PioDevice
|
||||
SimConsole *console;
|
||||
|
||||
/** a pointer to the system we are running in */
|
||||
System *system;
|
||||
AlphaSystem *system;
|
||||
|
||||
/** a pointer to the CPU boot cpu */
|
||||
BaseCPU *cpu;
|
||||
@@ -101,7 +101,7 @@ class AlphaConsole : public PioDevice
|
||||
public:
|
||||
/** Standard Constructor */
|
||||
AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
|
||||
System *s, BaseCPU *c, Platform *platform,
|
||||
AlphaSystem *s, BaseCPU *c, Platform *platform,
|
||||
MemoryController *mmu, Addr addr,
|
||||
HierParams *hier, Bus *pio_bus);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user