Merge changes to make m5 g++ 3.4 compatible.

[gem5.git] / dev / platform.hh

diff --git a/dev/platform.hh b/dev/platform.hh
index 0c90e06bac6bf019f2260bce42c7b06271535926..47ca6209fb860f67ccb0650e9e6bee86bc859cfc 100644 (file)
--- a/dev/platform.hh
+++ b/dev/platform.hh
@@ -35,6 +35,7 @@
 #define __PLATFORM_HH_
 
 #include "sim/sim_object.hh"
+#include "targetarch/isa_traits.hh"
 
 class PciConfigAll;
 class IntrControl;
@@ -46,8 +47,6 @@ class Platform : public SimObject
   public:
     /** Pointer to the interrupt controller */
     IntrControl *intrctrl;
-    /** Pointer to the simulation console */
-    SimConsole *cons;
     /** Pointer to the PCI configuration space */
     PciConfigAll *pciconfig;
 
@@ -65,8 +64,9 @@ class Platform : public SimObject
     virtual void postConsoleInt() = 0;
     virtual void clearConsoleInt() = 0;
     virtual Tick intrFrequency() = 0;
-    virtual void postPciInt(int line) = 0;
-    virtual void clearPciInt(int line) = 0;
+    virtual void postPciInt(int line);
+    virtual void clearPciInt(int line);
+    virtual Addr pciToDma(Addr pciAddr) const;
 };
 
 #endif // __PLATFORM_HH_