diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-16 10:31:22 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-16 10:31:22 -0500 |
| commit | d97590e29dab0cd67729b581bcb31a212ae1de42 (patch) | |
| tree | 6bb4b9a079674166875f55bbc2c08de64d97c553 /sim/syscall_emul.hh | |
| parent | c8538d6a7e2b58ebcbe567023c9e1c5a0c3ee5a6 (diff) | |
| parent | df012f26fa9797896e3f571c81d336bec0a97b98 (diff) | |
| download | gem5-d97590e29dab0cd67729b581bcb31a212ae1de42.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : 848757d0f18cfb33620cfa4b084a9b102b2744c0
Diffstat (limited to 'sim/syscall_emul.hh')
| -rw-r--r-- | sim/syscall_emul.hh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh index 51a075a28..69c17c330 100644 --- a/sim/syscall_emul.hh +++ b/sim/syscall_emul.hh @@ -412,6 +412,10 @@ mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc) // user didn't give an address... pick one from our "mmap region" start = p->mmap_end; p->mmap_end += RoundUp<Addr>(length, VMPageSize); + if (p->nxm_start != 0) { + //If we have an nxm space, make sure we haven't colided + assert(p->mmap_end < p->nxm_start); + } } if (!(flags & OS::TGT_MAP_ANONYMOUS)) { |