SE: Fix SE mode OS X compilation.

This commit is contained in:
Ali Saidi 2009-11-14 11:49:01 -06:00
parent 48bc573f5f
commit 4e9ce1805e
3 changed files with 12 additions and 4 deletions

View file

@ -138,7 +138,7 @@ class Linux : public OperatingSystem
};
/// Clock ticks per second, for times().
static const int _SC_CLK_TCK = 100;
static const int M5_SC_CLK_TCK = 100;
/// For times().
struct tms {

View file

@ -461,12 +461,16 @@ truncate64Func(SyscallDesc *desc, int num,
if (!tc->getMemPort()->tryReadString(path, process->getSyscallArg(tc, index)))
return -EFAULT;
loff_t length = process->getSyscallArg(tc, index, 64);
int64_t length = process->getSyscallArg(tc, index, 64);
// Adjust path for current working directory
path = process->fullPath(path);
#if NO_STAT64
int result = truncate(path.c_str(), length);
#else
int result = truncate64(path.c_str(), length);
#endif
return (result == -1) ? -errno : result;
}
@ -480,9 +484,13 @@ ftruncate64Func(SyscallDesc *desc, int num,
if (fd < 0)
return -EBADF;
loff_t length = process->getSyscallArg(tc, index, 64);
int64_t length = process->getSyscallArg(tc, index, 64);
#if NO_STAT64
int result = ftruncate(fd, length);
#else
int result = ftruncate64(fd, length);
#endif
return (result == -1) ? -errno : result;
}

View file

@ -1187,7 +1187,7 @@ timesFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
TypedBufferArg<typename OS::tms> bufp(process->getSyscallArg(tc, index));
// Fill in the time structure (in clocks)
int64_t clocks = curTick * OS::_SC_CLK_TCK / Clock::Int::s;
int64_t clocks = curTick * OS::M5_SC_CLK_TCK / Clock::Int::s;
bufp->tms_utime = clocks;
bufp->tms_stime = 0;
bufp->tms_cutime = 0;