diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-03-15 23:38:55 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-03-15 23:38:55 -0500 |
| commit | 77a2f97c3590d7d51ffc5b447546c7c70894bdbd (patch) | |
| tree | 3463e457b10da0cea34cf20e914b2b51dc329d28 /sim/syscall_emul.hh | |
| parent | e2b558112b408847a1423e5dd12db59e81260c84 (diff) | |
| parent | 7359e2df01fde9ea34a0ba661750a455e26bcacd (diff) | |
| download | gem5-77a2f97c3590d7d51ffc5b447546c7c70894bdbd.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
--HG--
extra : convert_revision : 9bdde9b5bd3049744451eda1134f080b7c4b1b59
Diffstat (limited to 'sim/syscall_emul.hh')
| -rw-r--r-- | sim/syscall_emul.hh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh index 9554ab318..ae1196f03 100644 --- a/sim/syscall_emul.hh +++ b/sim/syscall_emul.hh @@ -45,13 +45,15 @@ #endif #include <sys/uio.h> -#include "base/intmath.hh" // for RoundUp -#include "mem/translating_port.hh" #include "arch/isa_traits.hh" // for Addr +#include "base/chunk_generator.hh" +#include "base/intmath.hh" // for RoundUp #include "base/misc.hh" #include "base/trace.hh" -#include "cpu/exec_context.hh" #include "cpu/base.hh" +#include "cpu/exec_context.hh" +#include "mem/translating_port.hh" +#include "mem/page_table.hh" #include "sim/process.hh" /// @@ -698,10 +700,15 @@ mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc) int flags = xc->getSyscallArg(3); // int fd = p->sim_fd(xc->getSyscallArg(4)); // int offset = xc->getSyscallArg(5); + Addr junk; if (start == 0) { // user didn't give an address... pick one from our "mmap region" start = p->mmap_end; + for (ChunkGenerator gen(start, roundUp(length, TheISA::VMPageSize), TheISA::VMPageSize); !gen.done(); gen.next()) { + if (!p->pTable->translate(gen.addr(), junk)) + p->pTable->allocate(roundDown(gen.addr(), TheISA::VMPageSize), TheISA::VMPageSize); + } p->mmap_end += roundUp(length, TheISA::VMPageSize); if (p->nxm_start != 0) { //If we have an nxm space, make sure we haven't colided |