make some changes to bonnie - now that the simulator uses more memory the old config...

[gem5.git] / dev / alpha_console.hh

diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 29ebec1bb34e48ac1dd9c025afee9d018a407f91..96b0a22c2a2e56a9e5197d5dd7943abc2dc68861 100644 (file)
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,14 +35,13 @@
 
 #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"
+#include "sim/sim_object.hh"
 
 class BaseCPU;
 class SimConsole;
 class System;
-class TlaserClock;
 class SimpleDisk;
 
 /*
@@ -70,7 +69,7 @@ class SimpleDisk;
  * primarily used doing boot before the kernel has loaded its device
  * drivers.
  */
-class AlphaConsole : public FunctionalMemory
+class AlphaConsole : public PioDevice
 {
   protected:
     union {
@@ -89,11 +88,10 @@ class AlphaConsole : public FunctionalMemory
 
   public:
     /** Standard Constructor */
-    AlphaConsole(const std::string &name, SimConsole *cons,
-                 SimpleDisk *d, int size,
-                 System *system, BaseCPU *cpu,
-                 TsunamiIO *clock, int num_cpus,
-                 Addr addr, Addr mask, MemoryController *mmu);
+    AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
+                 System *system, BaseCPU *cpu, Platform *platform,
+                 int num_cpus, MemoryController *mmu, Addr addr,
+                 HierParams *hier, Bus *bus);
 
     /**
      * memory mapped reads and writes
@@ -106,6 +104,9 @@ class AlphaConsole : public FunctionalMemory
      */
     virtual void serialize(std::ostream &os);
     virtual void unserialize(Checkpoint *cp, const std::string &section);
+
+  public:
+    Tick cacheAccess(MemReqPtr &req);
 };
 
 #endif // __ALPHA_CONSOLE_HH__