MIPS: Fixes to get mips to compile.

--HG--
extra : convert_revision : 23561eda853a51046ae56c23a88466230c3e83f2

diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index dab63c82fabebd448d4af1fd4b83feccad2a6d24..71111b8435c40054179110515a8d5f57b99e0f18 100644 (file)
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -35,6 +35,17 @@
 #include "params/MipsITB.hh"
 
 namespace MipsISA {
+    void
+    TlbEntry::serialize(std::ostream &os)
+    {
+        SERIALIZE_SCALAR(pageStart);
+    }
+
+    void
+    TlbEntry::unserialize(Checkpoint *cp, const std::string &section)
+    {
+        UNSERIALIZE_SCALAR(pageStart);
+    }
 };
 
 MipsISA::ITB *

diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh
index 41685777629116eff4485ac0602c3b84ab843d76..6025de4c01f931e5f75cd7f1e7818a242c8ed8e9 100644 (file)
--- a/src/arch/mips/tlb.hh
+++ b/src/arch/mips/tlb.hh
@@ -35,17 +35,27 @@
 
 namespace MipsISA
 {
-    class ITB : public GenericITB
+    struct TlbEntry
+    {
+        Addr pageStart;
+        TlbEntry() {}
+        TlbEntry(Addr paddr) : pageStart(paddr) {}
+
+        void serialize(std::ostream &os);
+        void unserialize(Checkpoint *cp, const std::string &section);
+    };
+
+    class ITB : public GenericITB<>
     {
       public:
-        ITB(const std::string &name) : GenericITB(name)
+        ITB(const std::string &name) : GenericITB<>(name)
         {}
     };
 
-    class DTB : public GenericDTB
+    class DTB : public GenericDTB<>
     {
       public:
-        DTB(const std::string &name) : GenericDTB(name)
+        DTB(const std::string &name) : GenericDTB<>(name)
         {}
     };
 };

diff --git a/src/arch/mips/types.hh b/src/arch/mips/types.hh
index 6e14a9b552e33934d4e218ce522a355d6f80d964..9d2c6285db634f2e4ba00552c3398fb585531ded 100644 (file)
--- a/src/arch/mips/types.hh
+++ b/src/arch/mips/types.hh
@@ -31,7 +31,6 @@
 #ifndef __ARCH_MIPS_TYPES_HH__
 #define __ARCH_MIPS_TYPES_HH__
 
-#include "mem/types.hh"
 #include "sim/host.hh"
 
 namespace MipsISA
@@ -96,8 +95,6 @@ namespace MipsISA
         RND_NEAREST
     };
 
-    typedef ::PageTable<> PageTable;
-
 } // namespace MipsISA
 
 #endif