diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
| commit | 0e4a80df1a471671b6ef7003e29124b6835ade42 (patch) | |
| tree | 1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /sim/syscall_emul.hh | |
| parent | a48c24b61eedf580645ff0294b225d1e69a9444b (diff) | |
| parent | 463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff) | |
| download | gem5-0e4a80df1a471671b6ef7003e29124b6835ade42.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
Diffstat (limited to 'sim/syscall_emul.hh')
| -rw-r--r-- | sim/syscall_emul.hh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh index 739cd20e5..bc22c5c4c 100644 --- a/sim/syscall_emul.hh +++ b/sim/syscall_emul.hh @@ -90,6 +90,9 @@ class SyscallDesc { class BaseBufferArg { + protected: + typedef TheISA::Addr Addr; + public: BaseBufferArg(Addr _addr, int _size) : addr(_addr), size(_size) @@ -636,7 +639,7 @@ template <class OS> SyscallReturn mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc) { - Addr start = xc->getSyscallArg(0); + TheISA::Addr start = xc->getSyscallArg(0); uint64_t length = xc->getSyscallArg(1); // int prot = xc->getSyscallArg(2); int flags = xc->getSyscallArg(3); @@ -646,7 +649,7 @@ mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc) if (start == 0) { // user didn't give an address... pick one from our "mmap region" start = p->mmap_end; - p->mmap_end += roundUp(length, 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 assert(p->mmap_end < p->nxm_start); |