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/x86/process.cc | |
| 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/x86/process.cc')
| -rw-r--r-- | src/arch/x86/process.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc index 1ad1315da..f11cc3438 100644 --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -60,6 +60,7 @@ #include "debug/Stack.hh" #include "mem/multi_level_page_table.hh" #include "mem/page_table.hh" +#include "params/Process.hh" #include "sim/aux_vector.hh" #include "sim/process_impl.hh" #include "sim/syscall_desc.hh" @@ -95,10 +96,16 @@ static const int ArgumentReg32[] = { static const int NumArgumentRegs32 M5_VAR_USED = sizeof(ArgumentReg) / sizeof(const int); -X86Process::X86Process(ProcessParams * params, ObjectFile *objFile, +X86Process::X86Process(ProcessParams *params, ObjectFile *objFile, SyscallDesc *_syscallDescs, int _numSyscallDescs) - : Process(params, objFile), syscallDescs(_syscallDescs), - numSyscallDescs(_numSyscallDescs) + : Process(params, params->useArchPT ? + static_cast<PageTableBase *>( + new ArchPageTable(params->name, params->pid, + params->system)) : + static_cast<PageTableBase *>( + new FuncPageTable(params->name, params->pid)), + objFile), + syscallDescs(_syscallDescs), numSyscallDescs(_numSyscallDescs) { } |