diff options
| author | Steve Reinhardt <steve.reinhardt@amd.com> | 2016-03-17 10:29:32 -0700 |
|---|---|---|
| committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2016-03-17 10:29:32 -0700 |
| commit | f6cd7a4bb7ee66b58f88fbdc6bdc4faa6a559952 (patch) | |
| tree | 7d579b1d984c0b3d7497780ff8ff1b96ab1f7aae /src/sim | |
| parent | 7eaa5952f994c07a801fbef81f8097a5e9a5828f (diff) | |
| download | gem5-f6cd7a4bb7ee66b58f88fbdc6bdc4faa6a559952.tar.xz | |
syscall_emul: move mmapGrowsDown() to LiveProcess
The mmapGrowsDown() method was a static method on the OperatingSystem
class (and derived classes), which worked OK for the templated syscall
emulation methods, but made it hard to access elsewhere. This patch
moves the method to be a virtual function on the LiveProcess method,
where it can be overridden for specific platforms (for now, Alpha).
This patch also changes the value of mmapGrowsDown() from being false
by default and true only on X86Linux32 to being true by default and
false only on Alpha, which seems closer to reality (though in reality
most people use ASLR and this doesn't really matter anymore).
In the process, also got rid of the unused mmap_start field on
LiveProcess and OperatingSystem mmapGrowsUp variable.
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/process.cc | 4 | ||||
| -rw-r--r-- | src/sim/process.hh | 6 | ||||
| -rw-r--r-- | src/sim/syscall_emul.hh | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/sim/process.cc b/src/sim/process.cc index 6c12b8100..81a7ec89e 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -182,7 +182,7 @@ Process::Process(ProcessParams * params) fde_stderr->set(sim_fd, params->errout, O_WRONLY | O_CREAT | O_TRUNC, 0664, false); - mmap_start = mmap_end = 0; + mmap_end = 0; nxm_start = nxm_end = 0; // other parameters will be initialized when the program is loaded } @@ -412,7 +412,6 @@ Process::serialize(CheckpointOut &cp) const SERIALIZE_SCALAR(stack_size); SERIALIZE_SCALAR(stack_min); SERIALIZE_SCALAR(next_thread_stack_base); - SERIALIZE_SCALAR(mmap_start); SERIALIZE_SCALAR(mmap_end); SERIALIZE_SCALAR(nxm_start); SERIALIZE_SCALAR(nxm_end); @@ -432,7 +431,6 @@ Process::unserialize(CheckpointIn &cp) UNSERIALIZE_SCALAR(stack_size); UNSERIALIZE_SCALAR(stack_min); UNSERIALIZE_SCALAR(next_thread_stack_base); - UNSERIALIZE_SCALAR(mmap_start); UNSERIALIZE_SCALAR(mmap_end); UNSERIALIZE_SCALAR(nxm_start); UNSERIALIZE_SCALAR(nxm_end); diff --git a/src/sim/process.hh b/src/sim/process.hh index df007c9f2..72f789ec7 100644 --- a/src/sim/process.hh +++ b/src/sim/process.hh @@ -107,9 +107,13 @@ class Process : public SimObject Addr next_thread_stack_base; // Base of region for mmaps (when user doesn't specify an address). - Addr mmap_start; Addr mmap_end; + // Does mmap region grow upward or downward from mmap_end? Most + // platforms grow downward, but a few (such as Alpha) grow upward + // instead, so they can override thie method to return false. + virtual bool mmapGrowsDown() const { return true; } + // Base of region for nxm data Addr nxm_start; Addr nxm_end; diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh index a859fbe43..71c0dd090 100644 --- a/src/sim/syscall_emul.hh +++ b/src/sim/syscall_emul.hh @@ -1297,8 +1297,8 @@ mmapImpl(SyscallDesc *desc, int num, LiveProcess *p, ThreadContext *tc, // Extend global mmap region if necessary. Note that we ignore the // start address unless MAP_FIXED is specified. if (!(tgt_flags & OS::TGT_MAP_FIXED)) { - start = (OS::mmapGrowsDown()) ? p->mmap_end - length : p->mmap_end; - p->mmap_end = (OS::mmapGrowsDown()) ? start : p->mmap_end + length; + start = p->mmapGrowsDown() ? p->mmap_end - length : p->mmap_end; + p->mmap_end = p->mmapGrowsDown() ? start : p->mmap_end + length; } DPRINTF_SYSCALL(Verbose, " mmap range is 0x%x - 0x%x\n", |