diff options
| author | Gabe Black <gabeblack@google.com> | 2017-12-22 16:14:03 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-01-11 06:29:58 +0000 |
| commit | 54a9d471faab2b4ab3ef26932957b2e0d496e84e (patch) | |
| tree | 2fc64af43a35ca47cb2bc06461ff76f8092e1262 /src/arch/arm | |
| parent | c2f3f6dbff9b29730da17269397f918742559179 (diff) | |
| download | gem5-54a9d471faab2b4ab3ef26932957b2e0d496e84e.tar.xz | |
arch,mem: Move page table construction into the arch classes.
This gets rid of an awkward NoArchPageTable class, and also gives the
arch a place to inject ISA specific parameters (specifically page size)
without having to have TheISA:: in the generic version of these types.
Change-Id: I1412f303460d5c43dafdb9b3cd07af81c908a441
Reviewed-on: https://gem5-review.googlesource.com/6981
Reviewed-by: Alexandru Duțu <alexandru.dutu@amd.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/arch/arm')
| -rw-r--r-- | src/arch/arm/process.cc | 5 | ||||
| -rw-r--r-- | src/arch/arm/process.hh | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc index dcc9145d3..b64579a5d 100644 --- a/src/arch/arm/process.cc +++ b/src/arch/arm/process.cc @@ -51,6 +51,7 @@ #include "cpu/thread_context.hh" #include "debug/Stack.hh" #include "mem/page_table.hh" +#include "params/Process.hh" #include "sim/aux_vector.hh" #include "sim/byteswap.hh" #include "sim/process_impl.hh" @@ -62,8 +63,10 @@ using namespace ArmISA; ArmProcess::ArmProcess(ProcessParams *params, ObjectFile *objFile, ObjectFile::Arch _arch) - : Process(params, objFile), arch(_arch) + : Process(params, new FuncPageTable(params->name, params->pid), objFile), + arch(_arch) { + fatal_if(!params->useArchPT, "Arch page tables not implemented."); } ArmProcess32::ArmProcess32(ProcessParams *params, ObjectFile *objFile, diff --git a/src/arch/arm/process.hh b/src/arch/arm/process.hh index f8e6542ff..f4f0874c0 100644 --- a/src/arch/arm/process.hh +++ b/src/arch/arm/process.hh @@ -95,8 +95,5 @@ class ArmProcess64 : public ArmProcess void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value); }; -/* No architectural page table defined for this ISA */ -typedef NoArchPageTable ArchPageTable; - #endif // __ARM_PROCESS_HH__ |