From 703662624ca9f6f5454b4d1ac773475c0af1bec5 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Fri, 5 Jan 2018 17:48:40 -0800
Subject: [PATCH] x86, mem: Pass the multi level page table layout in as a
 parameter.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Don't get it from a global constant declared in an ISA header file.

Change-Id: Ie19440abdd76500a5e12e6791e6f755ad9e95af3
Reviewed-on: https://gem5-review.googlesource.com/7344
Maintainer: Gabe Black <gabeblack@google.com>
Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
Reviewed-by: Alexandru Duțu <alexandru.dutu@amd.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
---
 src/arch/x86/process.cc                | 3 ++-
 src/mem/multi_level_page_table.hh      | 3 ++-
 src/mem/multi_level_page_table_impl.hh | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 52255af7a..627750cbd 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -101,7 +101,8 @@ X86Process::X86Process(ProcessParams *params, ObjectFile *objFile,
     : Process(params, params->useArchPT ?
                       static_cast<EmulationPageTable *>(
                               new ArchPageTable(params->name, params->pid,
-                                                params->system, PageBytes)) :
+                                                params->system, PageBytes,
+                                                PageTableLayout)) :
                       new EmulationPageTable(params->name, params->pid,
                                              PageBytes),
               objFile),
diff --git a/src/mem/multi_level_page_table.hh b/src/mem/multi_level_page_table.hh
index 10e411eb1..f71dc0dbc 100644
--- a/src/mem/multi_level_page_table.hh
+++ b/src/mem/multi_level_page_table.hh
@@ -139,7 +139,8 @@ class MultiLevelPageTable : public EmulationPageTable
 
 public:
     MultiLevelPageTable(const std::string &__name, uint64_t _pid,
-                        System *_sys, Addr pageSize);
+                        System *_sys, Addr pageSize,
+                        const std::vector<uint8_t> &layout);
     ~MultiLevelPageTable();
 
     void initState(ThreadContext* tc) override;
diff --git a/src/mem/multi_level_page_table_impl.hh b/src/mem/multi_level_page_table_impl.hh
index 3222f5f11..2d7ddc4e4 100644
--- a/src/mem/multi_level_page_table_impl.hh
+++ b/src/mem/multi_level_page_table_impl.hh
@@ -45,11 +45,11 @@ using namespace std;
 using namespace TheISA;
 
 template <class ISAOps>
-MultiLevelPageTable<ISAOps>::MultiLevelPageTable(const std::string &__name,
-                                                 uint64_t _pid, System *_sys,
-                                                 Addr pageSize)
+MultiLevelPageTable<ISAOps>::MultiLevelPageTable(
+        const std::string &__name, uint64_t _pid, System *_sys,
+        Addr pageSize, const std::vector<uint8_t> &layout)
     : EmulationPageTable(__name, _pid, pageSize), system(_sys),
-    logLevelSize(PageTableLayout),
+    logLevelSize(layout),
     numLevels(logLevelSize.size())
 {
 }
-- 
2.30.2