diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-16 18:31:20 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-16 18:31:20 -0500 |
| commit | 901aeb24ebff9254da2bef09f94c65a955b1d479 (patch) | |
| tree | 2268831bd10f7805a33c5015e22a6e362712ed1f /sim/syscall_emul.hh | |
| parent | 14c461c93c9b83fffb0d629d347a28d4f7b79198 (diff) | |
| parent | f2dd82097263a726888af2a097547f3c6d2d6a03 (diff) | |
| download | gem5-901aeb24ebff9254da2bef09f94c65a955b1d479.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : f7c6ead8e9b2d0b5682d7bb40f5a85d4fe402896
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)) { |