derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge zizzer:/bk/m5

Browse Source 
into  zeep.eecs.umich.edu:/z/saidi/work/m5.head

--HG--
extra : convert_revision : 8f463682e32a457cd9171c63dcec5209cb850b56
This commit is contained in:
Ali Saidi
2006-03-03 14:25:26 -05:00
parent 7546fabe68 0bf25c5953
commit 9ad9178587
15 changed files with 447 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev/alpha_console.cc
View File

@@ -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;

6
dev/alpha_console.hh
View File

@@ -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);