SE/FS: Build the base process class in FS.

1 files changed, 3 insertions, 15 deletions

diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index a2d566d0c..c260ba2d4 100644
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -52,15 +52,9 @@
 using namespace std;
 using namespace TheISA;
 
-PageTable::PageTable(
-#if !FULL_SYSTEM
-        Process *_process,
-#endif
-        Addr _pageSize)
-    : pageSize(_pageSize), offsetMask(mask(floorLog2(_pageSize)))
-#if !FULL_SYSTEM
-      , process(_process)
-#endif
+PageTable::PageTable(Process *_process, Addr _pageSize)
+    : pageSize(_pageSize), offsetMask(mask(floorLog2(_pageSize))),
+      process(_process)
 {
     assert(isPowerOf2(pageSize));
     pTableCache[0].vaddr = 0;
@@ -89,11 +83,9 @@ PageTable::allocate(Addr vaddr, int64_t size)
                     vaddr);
         }
 
-#if !FULL_SYSTEM
         pTable[vaddr] = TheISA::TlbEntry(process->M5_pid, vaddr,
                 process->system->new_page());
         updateCache(vaddr, pTable[vaddr]);
-#endif
     }
 }
 
@@ -204,9 +196,7 @@ PageTable::serialize(std::ostream &os)
     PTableItr iter = pTable.begin();
     PTableItr end = pTable.end();
     while (iter != end) {
-#if !FULL_SYSTEM
         os << "\n[" << csprintf("%s.Entry%d", process->name(), count) << "]\n";
-#endif
 
         paramOut(os, "vaddr", iter->first);
         iter->second.serialize(os);
@@ -226,7 +216,6 @@ PageTable::unserialize(Checkpoint *cp, const std::string &section)
     pTable.clear();
 
     while (i < count) {
-#if !FULL_SYSTEM
         TheISA::TlbEntry *entry;
         Addr vaddr;
 
@@ -235,7 +224,6 @@ PageTable::unserialize(Checkpoint *cp, const std::string &section)
         entry->unserialize(cp, csprintf("%s.Entry%d", process->name(), i));
         pTable[vaddr] = *entry;
         ++i;
-#endif
     }
 }