diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
| commit | 706323fa21de674d8064c95a3c0036f0342430ee (patch) | |
| tree | 40bcf3249c0d9d9b21a70f65f0e56ca9020017f7 /src/arch/sparc | |
| parent | cbaebb3b5ebe709689f481ad395034335bea2152 (diff) | |
| parent | 6f9d294e8685f49d91af48065736ac1d67e53718 (diff) | |
| download | gem5-706323fa21de674d8064c95a3c0036f0342430ee.tar.xz | |
Merged with recent changes.
Diffstat (limited to 'src/arch/sparc')
| -rw-r--r-- | src/arch/sparc/linux/linux.hh | 1 | ||||
| -rw-r--r-- | src/arch/sparc/process.cc | 3 | ||||
| -rw-r--r-- | src/arch/sparc/solaris/solaris.hh | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/sparc/linux/linux.hh b/src/arch/sparc/linux/linux.hh index 1f7567d43..8ac408812 100644 --- a/src/arch/sparc/linux/linux.hh +++ b/src/arch/sparc/linux/linux.hh @@ -77,6 +77,7 @@ class SparcLinux : public Linux static const int NUM_OPEN_FLAGS; static const unsigned TGT_MAP_ANONYMOUS = 0x20; + static const unsigned TGT_MAP_FIXED = 0x10; typedef struct { int64_t uptime; /* Seconds since boot */ diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc index 3eee3d137..5c594dcbc 100644 --- a/src/arch/sparc/process.cc +++ b/src/arch/sparc/process.cc @@ -316,8 +316,7 @@ SparcLiveProcess::argsInit(int pageSize) stack_size = stack_base - stack_min; // Allocate space for the stack - pTable->allocate(roundDown(stack_min, pageSize), - roundUp(stack_size, pageSize)); + allocateMem(roundDown(stack_min, pageSize), roundUp(stack_size, pageSize)); // map out initial stack contents IntType sentry_base = stack_base - sentry_size; diff --git a/src/arch/sparc/solaris/solaris.hh b/src/arch/sparc/solaris/solaris.hh index df2565027..8222addab 100644 --- a/src/arch/sparc/solaris/solaris.hh +++ b/src/arch/sparc/solaris/solaris.hh @@ -59,6 +59,7 @@ class SparcSolaris : public Solaris static const int NUM_OPEN_FLAGS; static const unsigned TGT_MAP_ANONYMOUS = 0x100; + static const unsigned TGT_MAP_FIXED = 0x10; }; #endif |