From 97e424982ad99348bc27ab2ca79d0861cddfe4d1 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Wed, 15 Mar 2006 17:04:50 -0500 Subject: add translations for new sections that are mmapped or when the brk is changed Add a default machine width parameter Arch based live processes arch/alpha/linux/process.cc: arch/alpha/linux/process.hh: arch/alpha/process.cc: arch/alpha/process.hh: arch/alpha/tru64/process.cc: arch/alpha/tru64/process.hh: arch/mips/linux_process.cc: arch/mips/process.cc: arch/mips/process.hh: arch/sparc/linux/process.cc: arch/sparc/linux/process.hh: arch/sparc/process.cc: arch/sparc/process.hh: configs/test/test.py: python/m5/objects/Process.py: sim/process.cc: sim/process.hh: Architecture based live processes arch/mips/isa_traits.hh: arch/sparc/isa_traits.hh: Add a default machine width parameter mem/port.hh: gcc 4 really wants a virtual destructor sim/byteswap.hh: remove the comment around long and unsigned long even though uint32_t and int32_t are defined. Seems to work with gcc 4 and 3.4.3. sim/syscall_emul.cc: sim/syscall_emul.hh: add translations for new sections that are mmapped or when the brk is changed --HG-- extra : convert_revision : e2f9f228113c7127c87ef2358209a399c30ed5c6 --- sim/syscall_emul.hh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'sim/syscall_emul.hh') 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 -#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 -- cgit v1.2.3