summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-12-22 17:14:47 -0800
committerGabe Black <gabeblack@google.com>2018-01-11 06:30:15 +0000
commitad0056d2e811284870edcc5350db9fa3dbff6f2e (patch)
tree0020f2fb3b5dd7faba173b0c377fbb54b236d769 /src/mem
parent54a9d471faab2b4ab3ef26932957b2e0d496e84e (diff)
downloadgem5-ad0056d2e811284870edcc5350db9fa3dbff6f2e.tar.xz
arch,mem: Remove the default value for page size.
This breaks one more architecture dependence outside of the ISAs. Change-Id: I071f9ed73aef78e1cd1752247c183e30854b2d28 Reviewed-on: https://gem5-review.googlesource.com/6982 Maintainer: Gabe Black <gabeblack@google.com> Reviewed-by: Alexandru Duțu <alexandru.dutu@amd.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/multi_level_page_table.hh2
-rw-r--r--src/mem/multi_level_page_table_impl.hh5
-rw-r--r--src/mem/page_table.hh6
3 files changed, 6 insertions, 7 deletions
diff --git a/src/mem/multi_level_page_table.hh b/src/mem/multi_level_page_table.hh
index 402c37126..0e079b730 100644
--- a/src/mem/multi_level_page_table.hh
+++ b/src/mem/multi_level_page_table.hh
@@ -140,7 +140,7 @@ class MultiLevelPageTable : public PageTableBase
public:
MultiLevelPageTable(const std::string &__name, uint64_t _pid,
- System *_sys);
+ System *_sys, Addr pageSize);
~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 7cd32db16..4ff5f5c61 100644
--- a/src/mem/multi_level_page_table_impl.hh
+++ b/src/mem/multi_level_page_table_impl.hh
@@ -46,8 +46,9 @@ using namespace TheISA;
template <class ISAOps>
MultiLevelPageTable<ISAOps>::MultiLevelPageTable(const std::string &__name,
- uint64_t _pid, System *_sys)
- : PageTableBase(__name, _pid), system(_sys),
+ uint64_t _pid, System *_sys,
+ Addr pageSize)
+ : PageTableBase(__name, _pid, pageSize), system(_sys),
logLevelSize(PageTableLayout),
numLevels(logLevelSize.size())
{
diff --git a/src/mem/page_table.hh b/src/mem/page_table.hh
index 883b47cdc..f784b2166 100644
--- a/src/mem/page_table.hh
+++ b/src/mem/page_table.hh
@@ -73,8 +73,7 @@ class PageTableBase : public Serializable
public:
- PageTableBase(const std::string &__name, uint64_t _pid,
- Addr _pageSize = TheISA::PageBytes)
+ PageTableBase(const std::string &__name, uint64_t _pid, Addr _pageSize)
: pageSize(_pageSize), offsetMask(mask(floorLog2(_pageSize))),
pid(_pid), _name(__name)
{
@@ -211,8 +210,7 @@ class FuncPageTable : public PageTableBase
public:
- FuncPageTable(const std::string &__name, uint64_t _pid,
- Addr _pageSize = TheISA::PageBytes);
+ FuncPageTable(const std::string &__name, uint64_t _pid, Addr _pageSize);
~FuncPageTable();