Merge zizzer:/bk/m5
into udhcp-macvpn-776.public.engin.umich.edu:/Users/ali/work/m5.head --HG-- extra : convert_revision : e9ffaa1d4b7eee1f5bd0c492e162aac1e0806099
This commit is contained in:
Ali Saidi
commit
a86a3fa525
7 changed files with 97 additions and 68 deletions
|
|
@ -71,6 +71,15 @@ class Linux {
|
|||
typedef uint32_t gid_t;
|
||||
//@}
|
||||
|
||||
#if BSD_HOST
|
||||
typedef struct stat hst_stat;
|
||||
typedef struct stat hst_stat64;
|
||||
#else
|
||||
typedef struct stat hst_stat ;
|
||||
typedef struct stat64 hst_stat64;
|
||||
#endif
|
||||
|
||||
|
||||
//@{
|
||||
/// open(2) flag values.
|
||||
static const int TGT_O_RDONLY = 00000000; //!< O_RDONLY
|
||||
|
|
@ -139,7 +148,7 @@ class Linux {
|
|||
uint64_t st_mtime_nsec;
|
||||
uint64_t tgt_st_ctime;
|
||||
uint64_t st_ctime_nsec;
|
||||
int64_t __unused[3];
|
||||
int64_t ___unused[3];
|
||||
};
|
||||
|
||||
/// Length of strings in struct utsname (plus 1 for null char).
|
||||
|
|
@ -170,18 +179,18 @@ class Linux {
|
|||
|
||||
/// Resource enumeration for getrlimit().
|
||||
enum rlimit_resources {
|
||||
RLIMIT_CPU = 0,
|
||||
RLIMIT_FSIZE = 1,
|
||||
RLIMIT_DATA = 2,
|
||||
RLIMIT_STACK = 3,
|
||||
RLIMIT_CORE = 4,
|
||||
RLIMIT_RSS = 5,
|
||||
RLIMIT_NOFILE = 6,
|
||||
RLIMIT_AS = 7,
|
||||
RLIMIT_VMEM = 7,
|
||||
RLIMIT_NPROC = 8,
|
||||
RLIMIT_MEMLOCK = 9,
|
||||
RLIMIT_LOCKS = 10
|
||||
TGT_RLIMIT_CPU = 0,
|
||||
TGT_RLIMIT_FSIZE = 1,
|
||||
TGT_RLIMIT_DATA = 2,
|
||||
TGT_RLIMIT_STACK = 3,
|
||||
TGT_RLIMIT_CORE = 4,
|
||||
TGT_RLIMIT_RSS = 5,
|
||||
TGT_RLIMIT_NOFILE = 6,
|
||||
TGT_RLIMIT_AS = 7,
|
||||
TGT_RLIMIT_VMEM = 7,
|
||||
TGT_RLIMIT_NPROC = 8,
|
||||
TGT_RLIMIT_MEMLOCK = 9,
|
||||
TGT_RLIMIT_LOCKS = 10
|
||||
};
|
||||
|
||||
/// Limit struct for getrlimit/setrlimit.
|
||||
|
|
@ -208,9 +217,9 @@ class Linux {
|
|||
|
||||
//@{
|
||||
/// For getrusage().
|
||||
static const int RUSAGE_SELF = 0;
|
||||
static const int RUSAGE_CHILDREN = -1;
|
||||
static const int RUSAGE_BOTH = -2;
|
||||
static const int TGT_RUSAGE_SELF = 0;
|
||||
static const int TGT_RUSAGE_CHILDREN = -1;
|
||||
static const int TGT_RUSAGE_BOTH = -2;
|
||||
//@}
|
||||
|
||||
/// For getrusage().
|
||||
|
|
@ -236,8 +245,9 @@ class Linux {
|
|||
/// Helper function to convert a host stat buffer to a target stat
|
||||
/// buffer. Also copies the target buffer out to the simulated
|
||||
/// memory space. Used by stat(), fstat(), and lstat().
|
||||
#if !BSD_HOST
|
||||
static void
|
||||
copyOutStatBuf(FunctionalMemory *mem, Addr addr, struct stat *host)
|
||||
copyOutStatBuf(FunctionalMemory *mem, Addr addr, hst_stat *host)
|
||||
{
|
||||
TypedBufferArg<Linux::tgt_stat> tgt(addr);
|
||||
|
||||
|
|
@ -257,10 +267,36 @@ class Linux {
|
|||
|
||||
tgt.copyOut(mem);
|
||||
}
|
||||
#else
|
||||
// Third version for bsd systems which no longer have any support for
|
||||
// the old stat() call and stat() is actually a stat64()
|
||||
static void
|
||||
copyOutStatBuf(FunctionalMemory *mem, Addr addr, hst_stat64 *host)
|
||||
{
|
||||
TypedBufferArg<Linux::tgt_stat> tgt(addr);
|
||||
|
||||
tgt->st_dev = host->st_dev;
|
||||
tgt->st_ino = host->st_ino;
|
||||
tgt->st_mode = host->st_mode;
|
||||
tgt->st_nlink = host->st_nlink;
|
||||
tgt->st_uid = host->st_uid;
|
||||
tgt->st_gid = host->st_gid;
|
||||
tgt->st_rdev = host->st_rdev;
|
||||
tgt->st_size = host->st_size;
|
||||
tgt->st_atimeX = host->st_atime;
|
||||
tgt->st_mtimeX = host->st_mtime;
|
||||
tgt->st_ctimeX = host->st_ctime;
|
||||
tgt->st_blksize = host->st_blksize;
|
||||
tgt->st_blocks = host->st_blocks;
|
||||
|
||||
tgt.copyOut(mem);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// Same for stat64
|
||||
static void
|
||||
copyOutStat64Buf(FunctionalMemory *mem, Addr addr, struct stat64 *host)
|
||||
copyOutStat64Buf(FunctionalMemory *mem, Addr addr, hst_stat64 *host)
|
||||
{
|
||||
TypedBufferArg<Linux::tgt_stat64> tgt(addr);
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#if defined(__OpenBSD__)
|
||||
#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
#else
|
||||
|
|
@ -260,15 +260,15 @@ class Tru64 {
|
|||
|
||||
/// Resource enumeration for getrlimit().
|
||||
enum rlimit_resources {
|
||||
RLIMIT_CPU = 0,
|
||||
RLIMIT_FSIZE = 1,
|
||||
RLIMIT_DATA = 2,
|
||||
RLIMIT_STACK = 3,
|
||||
RLIMIT_CORE = 4,
|
||||
RLIMIT_RSS = 5,
|
||||
RLIMIT_NOFILE = 6,
|
||||
RLIMIT_AS = 7,
|
||||
RLIMIT_VMEM = 7
|
||||
TGT_RLIMIT_CPU = 0,
|
||||
TGT_RLIMIT_FSIZE = 1,
|
||||
TGT_RLIMIT_DATA = 2,
|
||||
TGT_RLIMIT_STACK = 3,
|
||||
TGT_RLIMIT_CORE = 4,
|
||||
TGT_RLIMIT_RSS = 5,
|
||||
TGT_RLIMIT_NOFILE = 6,
|
||||
TGT_RLIMIT_AS = 7,
|
||||
TGT_RLIMIT_VMEM = 7
|
||||
};
|
||||
|
||||
/// Limit struct for getrlimit/setrlimit.
|
||||
|
|
@ -320,9 +320,9 @@ class Tru64 {
|
|||
|
||||
//@{
|
||||
/// For getrusage().
|
||||
static const int RUSAGE_THREAD = 1;
|
||||
static const int RUSAGE_SELF = 0;
|
||||
static const int RUSAGE_CHILDREN = -1;
|
||||
static const int TGT_RUSAGE_THREAD = 1;
|
||||
static const int TGT_RUSAGE_SELF = 0;
|
||||
static const int TGT_RUSAGE_CHILDREN = -1;
|
||||
//@}
|
||||
|
||||
/// For getrusage().
|
||||
|
|
@ -568,7 +568,7 @@ class Tru64 {
|
|||
{
|
||||
TypedBufferArg<T> tgt(addr);
|
||||
|
||||
#if defined(__OpenBSD__)
|
||||
#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
|
||||
tgt->f_type = 0;
|
||||
#else
|
||||
tgt->f_type = host->f_type;
|
||||
|
|
|
|||
|
|
@ -145,22 +145,6 @@ floorLog2(long long x)
|
|||
return floorLog2((unsigned long long)x);
|
||||
}
|
||||
|
||||
#if defined(__APPLE__)
|
||||
inline int
|
||||
floorLog2(size_t x)
|
||||
{
|
||||
assert(x > 0);
|
||||
assert(sizeof(size_t) == 4 || sizeof(size_t) == 8);
|
||||
|
||||
// It's my hope that this is optimized away?
|
||||
if (sizeof(size_t) == 4)
|
||||
return floorLog2((uint32_t)x);
|
||||
else if (sizeof(size_t) == 8)
|
||||
return floorLog2((uint64_t)x);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
template <class T>
|
||||
inline int
|
||||
ceilLog2(T n)
|
||||
|
|
|
|||
|
|
@ -93,9 +93,6 @@ ListenSocket::listen(int port, bool reuse)
|
|||
return true;
|
||||
}
|
||||
|
||||
#if defined(__APPLE__)
|
||||
typedef int socklen_t;
|
||||
#endif
|
||||
|
||||
// Open a connection. Accept will block, so if you don't want it to,
|
||||
// make sure a connection is ready before you call accept.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
// inst sequence type, used to order instructions in the ready list,
|
||||
// if this rolls over the ready list order temporarily will get messed
|
||||
// up, but execution will continue and complete correctly
|
||||
typedef unsigned long long InstSeqNum;
|
||||
typedef uint64_t InstSeqNum;
|
||||
|
||||
// inst tag type, used to tag an operation instance in the IQ
|
||||
typedef unsigned int InstTag;
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
// but probably is more flexible to actually add in a delay parameter than
|
||||
// just running it backwards.
|
||||
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
#include "sim/root.hh"
|
||||
|
|
@ -42,7 +43,7 @@
|
|||
|
||||
// Either compile error or max int due to sign extension.
|
||||
// Hack to avoid compile warnings.
|
||||
const InstSeqNum MaxInstSeqNum = 0 - 1;
|
||||
const InstSeqNum MaxInstSeqNum = std::numeric_limits<InstSeqNum>::max();
|
||||
|
||||
template <class Impl>
|
||||
InstructionQueue<Impl>::InstructionQueue(Params ¶ms)
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@
|
|||
#ifndef __SIM_SYSCALL_EMUL_HH__
|
||||
#define __SIM_SYSCALL_EMUL_HH__
|
||||
|
||||
#define BSD_HOST (defined(__APPLE__) || defined(__OpenBSD__) || \
|
||||
defined(__FreeBSD__))
|
||||
|
||||
///
|
||||
/// @file syscall_emul.hh
|
||||
///
|
||||
|
|
@ -441,8 +444,13 @@ fstat64Func(SyscallDesc *desc, int callnum, Process *process,
|
|||
return -EBADF;
|
||||
}
|
||||
|
||||
#ifdef BSD_HOST
|
||||
struct stat hostBuf;
|
||||
int result = fstat(process->sim_fd(fd), &hostBuf);
|
||||
#else
|
||||
struct stat64 hostBuf;
|
||||
int result = fstat64(process->sim_fd(fd), &hostBuf);
|
||||
#endif
|
||||
|
||||
if (result < 0)
|
||||
return errno;
|
||||
|
|
@ -486,8 +494,13 @@ lstat64Func(SyscallDesc *desc, int callnum, Process *process,
|
|||
if (xc->mem->readString(path, xc->getSyscallArg(0)) != No_Fault)
|
||||
return -EFAULT;
|
||||
|
||||
#ifdef BSD_HOST
|
||||
struct stat hostBuf;
|
||||
int result = lstat(path.c_str(), &hostBuf);
|
||||
#else
|
||||
struct stat64 hostBuf;
|
||||
int result = lstat64(path.c_str(), &hostBuf);
|
||||
#endif
|
||||
|
||||
if (result < 0)
|
||||
return -errno;
|
||||
|
|
@ -517,7 +530,6 @@ fstatFunc(SyscallDesc *desc, int callnum, Process *process,
|
|||
return -errno;
|
||||
|
||||
OS::copyOutStatBuf(xc->mem, xc->getSyscallArg(1), &hostBuf);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -659,7 +671,7 @@ getrlimitFunc(SyscallDesc *desc, int callnum, Process *process,
|
|||
TypedBufferArg<typename OS::rlimit> rlp(xc->getSyscallArg(1));
|
||||
|
||||
switch (resource) {
|
||||
case OS::RLIMIT_STACK:
|
||||
case OS::TGT_RLIMIT_STACK:
|
||||
// max stack size in bytes: make up a number (2MB for now)
|
||||
rlp->rlim_cur = rlp->rlim_max = 8 * 1024 * 1024;
|
||||
break;
|
||||
|
|
@ -719,7 +731,6 @@ utimesFunc(SyscallDesc *desc, int callnum, Process *process,
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// Target getrusage() function.
|
||||
template <class OS>
|
||||
SyscallReturn
|
||||
|
|
@ -729,7 +740,7 @@ getrusageFunc(SyscallDesc *desc, int callnum, Process *process,
|
|||
int who = xc->getSyscallArg(0); // THREAD, SELF, or CHILDREN
|
||||
TypedBufferArg<typename OS::rusage> rup(xc->getSyscallArg(1));
|
||||
|
||||
if (who != OS::RUSAGE_SELF) {
|
||||
if (who != OS::TGT_RUSAGE_SELF) {
|
||||
// don't really handle THREAD or CHILDREN, but just warn and
|
||||
// plow ahead
|
||||
warn("getrusage() only supports RUSAGE_SELF. Parameter %d ignored.",
|
||||
|
|
|
|||
Loading…
Reference in a new issue