merge with m5 head

--HG--
extra : convert_revision : c90339248d1ee74df1c6b90a77ec9ea41f646311

diff --cc cpu/base_cpu.cc
Simple merge

diff --cc dev/alpha_console.cc
index ad9d0a239b187609408e728a4444a0fc94eae707,04046557a8cf9e852f52af2d045cc73d6d96f782..f592b239d77325eb299100aa6d6c513b766b9b89
--- 1/dev/alpha_console.cc
--- 2/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@@ -50,11 -52,11 +53,12 @@@
  
  using namespace std;
  
- AlphaConsole::AlphaConsole(const string &name, SimConsole *cons,
-                            SimpleDisk *d, System *system,
-                            BaseCPU *cpu, TsunamiIO *clock, int num_cpus,
-                            Addr a, MemoryController *mmu)
-     : FunctionalMemory(name), disk(d), console(cons), addr(a)
+ AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d,
 -                           System *system, BaseCPU *cpu, TlaserClock *clock,
++                           System *system, BaseCPU *cpu, TsunamiIO *clock,
+                            int num_cpus, MemoryController *mmu, Addr a,
+                            HierParams *hier, Bus *bus)
+     : PioDevice(name), disk(d), console(cons), addr(a)
++>>>>>>>
  {
      mmu->add_child(this, Range<Addr>(addr, addr + size));
  
@@@ -252,7 -266,9 +268,9 @@@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaCo
      Param<Addr> addr;
      SimObjectParam<System *> system;
      SimObjectParam<BaseCPU *> cpu;
 -    SimObjectParam<TlaserClock *> clock;
 +    SimObjectParam<TsunamiIO *> clock;
+     SimObjectParam<Bus*> io_bus;
+     SimObjectParam<HierParams *> hier;
  
  END_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
  

diff --cc dev/alpha_console.hh
index d0fa552afd0719d880ed5d0323d57a848e1e9232,b617b64e77e93710c6fdd912b9e0ca9c7430d86f..be8538e5052e694845339951b6e8b15429ea033c
--- 1/dev/alpha_console.hh
--- 2/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@@ -35,9 -35,8 +35,9 @@@
  
  #include "base/range.hh"
  #include "dev/alpha_access.h"
- #include "mem/functional_mem/functional_memory.hh"
+ #include "dev/io_device.hh"
  #include "sim/host.hh"
 +#include "dev/tsunami_io.hh"
  
  class BaseCPU;
  class SimConsole;
@@@ -89,10 -88,10 +89,10 @@@ class AlphaConsole : public PioDevic
  
    public:
      /** Standard Constructor */
-     AlphaConsole(const std::string &name, SimConsole *cons,
-                  SimpleDisk *d, System *system, BaseCPU *cpu,
-                  TsunamiIO *clock, int num_cpus,
-                  Addr a, MemoryController *mmu);
+     AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
 -                 System *system, BaseCPU *cpu, TlaserClock *clock,
++                 System *system, BaseCPU *cpu, TsunamiIO *clock,
+                  int num_cpus, MemoryController *mmu, Addr addr,
+                  HierParams *hier, Bus *bus);
  
      /**
       * memory mapped reads and writes

diff --cc sim/system.hh
Simple merge