From 3fa311e5acd58ce720014dd964728c2fa414ca6a Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Thu, 17 Mar 2016 10:22:39 -0700 Subject: syscall_emul: add many Linux kernel flags --- src/arch/x86/linux/linux.cc | 144 +++++++++++++++++++++++++++++++------------- src/arch/x86/linux/linux.hh | 142 ++++++++++++++++++++++++++++++++----------- 2 files changed, 210 insertions(+), 76 deletions(-) (limited to 'src/arch/x86') diff --git a/src/arch/x86/linux/linux.cc b/src/arch/x86/linux/linux.cc index 1b6268d65..2eab555ce 100644 --- a/src/arch/x86/linux/linux.cc +++ b/src/arch/x86/linux/linux.cc @@ -44,34 +44,64 @@ // open(2) flags translation table SyscallFlagTransTable X86Linux64::openFlagTable[] = { #ifdef _MSC_VER - { TGT_O_RDONLY, _O_RDONLY }, - { TGT_O_WRONLY, _O_WRONLY }, - { TGT_O_RDWR, _O_RDWR }, - { TGT_O_APPEND, _O_APPEND }, - { TGT_O_CREAT, _O_CREAT }, - { TGT_O_TRUNC, _O_TRUNC }, - { TGT_O_EXCL, _O_EXCL }, + { X86Linux64::TGT_O_RDONLY, _O_RDONLY }, + { X86Linux64::TGT_O_WRONLY, _O_WRONLY }, + { X86Linux64::TGT_O_RDWR, _O_RDWR }, + { X86Linux64::TGT_O_CREAT, _O_CREAT }, + { X86Linux64::TGT_O_EXCL, _O_EXCL }, +#ifdef _O_NOCTTY + { X86Linux64::TGT_O_NOCTTY, _O_NOCTTY }, +#endif + { X86Linux64::TGT_O_TRUNC, _O_TRUNC }, + { X86Linux64::TGT_O_APPEND, _O_APPEND }, #ifdef _O_NONBLOCK - { TGT_O_NONBLOCK, _O_NONBLOCK }, + { X86Linux64::TGT_O_NONBLOCK, _O_NONBLOCK }, #endif -#ifdef _O_NOCTTY - { TGT_O_NOCTTY, _O_NOCTTY }, +#ifdef _O_DSYNC + { X86Linux64::TGT_O_DSYNC , _O_DSYNC }, +#endif + { X86Linux64::TGT_FASYNC, _O_ASYNC }, + { X86Linux64::TGT_O_DIRECT, _O_DIRECT }, + { X86Linux64::TGT_O_LARGEFILE, _O_LARGEFILE }, + { X86Linux64::TGT_O_DIRECTORY, _O_DIRECTORY }, + { X86Linux64::TGT_O_NOFOLLOW, _O_NOFOLLOW }, + { X86Linux64::TGT_O_NOATIME, _O_NOATIME }, +#ifdef _O_CLOEXEC + { X86Linux64::TGT_O_CLOEXEC, _O_CLOEXEC }, #endif #ifdef _O_SYNC - { TGT_O_SYNC, _O_SYNC }, + { X86Linux64::TGT_O_SYNC, _O_SYNC }, +#endif +#ifdef _O_PATH + { X86Linux64::TGT_O_PATH , _O_PATH }, #endif #else /* !_MSC_VER */ - { TGT_O_RDONLY, O_RDONLY }, - { TGT_O_WRONLY, O_WRONLY }, - { TGT_O_RDWR, O_RDWR }, - { TGT_O_APPEND, O_APPEND }, - { TGT_O_CREAT, O_CREAT }, - { TGT_O_TRUNC, O_TRUNC }, - { TGT_O_EXCL, O_EXCL }, - { TGT_O_NONBLOCK, O_NONBLOCK }, - { TGT_O_NOCTTY, O_NOCTTY }, + { X86Linux64::TGT_O_RDONLY, O_RDONLY }, + { X86Linux64::TGT_O_WRONLY, O_WRONLY }, + { X86Linux64::TGT_O_RDWR, O_RDWR }, + { X86Linux64::TGT_O_CREAT, O_CREAT }, + { X86Linux64::TGT_O_EXCL, O_EXCL }, + { X86Linux64::TGT_O_NOCTTY, O_NOCTTY }, + { X86Linux64::TGT_O_TRUNC, O_TRUNC }, + { X86Linux64::TGT_O_APPEND, O_APPEND }, + { X86Linux64::TGT_O_NONBLOCK, O_NONBLOCK }, +#ifdef O_DSYNC + { X86Linux64::TGT_O_DSYNC, O_DSYNC }, +#endif + { X86Linux64::TGT_FASYNC, O_ASYNC }, + { X86Linux64::TGT_O_DIRECT, O_DIRECT }, + { X86Linux64::TGT_O_LARGEFILE, O_LARGEFILE }, + { X86Linux64::TGT_O_DIRECTORY, O_DIRECTORY }, + { X86Linux64::TGT_O_NOFOLLOW, O_NOFOLLOW }, + { X86Linux64::TGT_O_NOATIME, O_NOATIME }, +#ifdef O_CLOEXEC + { X86Linux64::TGT_O_CLOEXEC, O_CLOEXEC }, +#endif #ifdef O_SYNC - { TGT_O_SYNC, O_SYNC }, + { X86Linux64::TGT_O_SYNC, O_SYNC }, +#endif +#ifdef O_PATH + { X86Linux64::TGT_O_PATH, O_PATH }, #endif #endif /* _MSC_VER */ }; @@ -83,34 +113,64 @@ const int X86Linux64::NUM_OPEN_FLAGS = // open(2) flags translation table SyscallFlagTransTable X86Linux32::openFlagTable[] = { #ifdef _MSC_VER - { TGT_O_RDONLY, _O_RDONLY }, - { TGT_O_WRONLY, _O_WRONLY }, - { TGT_O_RDWR, _O_RDWR }, - { TGT_O_APPEND, _O_APPEND }, - { TGT_O_CREAT, _O_CREAT }, - { TGT_O_TRUNC, _O_TRUNC }, - { TGT_O_EXCL, _O_EXCL }, + { X86Linux32::TGT_O_RDONLY, _O_RDONLY }, + { X86Linux32::TGT_O_WRONLY, _O_WRONLY }, + { X86Linux32::TGT_O_RDWR, _O_RDWR }, + { X86Linux32::TGT_O_CREAT, _O_CREAT }, + { X86Linux32::TGT_O_EXCL, _O_EXCL }, +#ifdef _O_NOCTTY + { X86Linux32::TGT_O_NOCTTY, _O_NOCTTY }, +#endif + { X86Linux32::TGT_O_TRUNC, _O_TRUNC }, + { X86Linux32::TGT_O_APPEND, _O_APPEND }, #ifdef _O_NONBLOCK - { TGT_O_NONBLOCK, _O_NONBLOCK }, + { X86Linux32::TGT_O_NONBLOCK, _O_NONBLOCK }, #endif -#ifdef _O_NOCTTY - { TGT_O_NOCTTY, _O_NOCTTY }, +#ifdef O_DSYNC + { X86Linux32::TGT_O_DSYNC, _O_DSYNC }, +#endif + { X86Linux32::TGT_FASYNC, _O_ASYNC }, + { X86Linux32::TGT_O_DIRECT, _O_DIRECT }, + { X86Linux32::TGT_O_LARGEFILE, _O_LARGEFILE }, + { X86Linux32::TGT_O_DIRECTORY, _O_DIRECTORY }, + { X86Linux32::TGT_O_NOFOLLOW, _O_NOFOLLOW }, + { X86Linux32::TGT_O_NOATIME, _O_NOATIME }, +#ifdef _O_CLOEXEC + { X86Linux32::TGT_O_CLOEXEC, _O_CLOEXEC }, #endif #ifdef _O_SYNC - { TGT_O_SYNC, _O_SYNC }, + { X86Linux32::TGT_O_SYNC, _O_SYNC }, +#endif +#ifdef _O_PATH + { X86Linux32::TGT_O_PATH, _O_PATH }, #endif #else /* !_MSC_VER */ - { TGT_O_RDONLY, O_RDONLY }, - { TGT_O_WRONLY, O_WRONLY }, - { TGT_O_RDWR, O_RDWR }, - { TGT_O_APPEND, O_APPEND }, - { TGT_O_CREAT, O_CREAT }, - { TGT_O_TRUNC, O_TRUNC }, - { TGT_O_EXCL, O_EXCL }, - { TGT_O_NONBLOCK, O_NONBLOCK }, - { TGT_O_NOCTTY, O_NOCTTY }, + { X86Linux32::TGT_O_RDONLY, O_RDONLY }, + { X86Linux32::TGT_O_WRONLY, O_WRONLY }, + { X86Linux32::TGT_O_RDWR, O_RDWR }, + { X86Linux32::TGT_O_CREAT, O_CREAT }, + { X86Linux32::TGT_O_EXCL, O_EXCL }, + { X86Linux32::TGT_O_NOCTTY, O_NOCTTY }, + { X86Linux32::TGT_O_TRUNC, O_TRUNC }, + { X86Linux32::TGT_O_APPEND, O_APPEND }, + { X86Linux32::TGT_O_NONBLOCK, O_NONBLOCK }, +#ifdef O_DSYNC + { X86Linux32::TGT_O_DSYNC, O_DSYNC }, +#endif + { X86Linux32::TGT_FASYNC, O_ASYNC }, + { X86Linux32::TGT_O_DIRECT, O_DIRECT }, + { X86Linux32::TGT_O_LARGEFILE, O_LARGEFILE }, + { X86Linux32::TGT_O_DIRECTORY, O_DIRECTORY }, + { X86Linux32::TGT_O_NOFOLLOW, O_NOFOLLOW }, + { X86Linux32::TGT_O_NOATIME, O_NOATIME }, +#ifdef O_CLOEXEC + { X86Linux32::TGT_O_CLOEXEC, O_CLOEXEC }, +#endif #ifdef O_SYNC - { TGT_O_SYNC, O_SYNC }, + { X86Linux32::TGT_O_SYNC, O_SYNC }, +#endif +#ifdef O_PATH + { X86Linux32::TGT_O_PATH, O_PATH }, #endif #endif /* _MSC_VER */ }; diff --git a/src/arch/x86/linux/linux.hh b/src/arch/x86/linux/linux.hh index 2fd61471e..854ab00a0 100644 --- a/src/arch/x86/linux/linux.hh +++ b/src/arch/x86/linux/linux.hh @@ -67,25 +67,62 @@ class X86Linux64 : public Linux int64_t unused0[3]; } tgt_stat64; + static const int TGT_SIGHUP = 0x000001; + static const int TGT_SIGINT = 0x000002; + static const int TGT_SIGQUIT = 0x000003; + static const int TGT_SIGILL = 0x000004; + static const int TGT_SIGTRAP = 0x000005; + static const int TGT_SIGABRT = 0x000006; + static const int TGT_SIGIOT = 0x000006; + static const int TGT_SIGBUS = 0x000007; + static const int TGT_SIGFPE = 0x000008; + static const int TGT_SIGKILL = 0x000009; + static const int TGT_SIGUSR1 = 0x00000a; + static const int TGT_SIGSEGV = 0x00000b; + static const int TGT_SIGUSR2 = 0x00000c; + static const int TGT_SIGPIPE = 0x00000d; + static const int TGT_SIGALRM = 0x00000e; + static const int TGT_SIGTERM = 0x00000f; + static const int TGT_SIGSTKFLT = 0x000010; + static const int TGT_SIGCHLD = 0x000011; + static const int TGT_SIGCONT = 0x000012; + static const int TGT_SIGSTOP = 0x000013; + static const int TGT_SIGTSTP = 0x000014; + static const int TGT_SIGTTIN = 0x000015; + static const int TGT_SIGTTOU = 0x000016; + static const int TGT_SIGURG = 0x000017; + static const int TGT_SIGXCPU = 0x000018; + static const int TGT_SIGXFSZ = 0x000019; + static const int TGT_SIGVTALRM = 0x00001a; + static const int TGT_SIGPROF = 0x00001b; + static const int TGT_SIGWINCH = 0x00001c; + static const int TGT_SIGIO = 0x00001d; + static const int TGT_SIGPOLL = 0x00001d; + static const int TGT_SIGPWR = 0x00001e; + static const int TGT_SIGSYS = 0x00001f; + static const int TGT_SIGUNUSED = 0x00001f; + static SyscallFlagTransTable openFlagTable[]; - static const int TGT_O_RDONLY = 00000000; //!< O_RDONLY - static const int TGT_O_WRONLY = 00000001; //!< O_WRONLY - static const int TGT_O_RDWR = 00000002; //!< O_RDWR - static const int TGT_O_NONBLOCK = 00004000; //!< O_NONBLOCK - static const int TGT_O_APPEND = 00002000; //!< O_APPEND - static const int TGT_O_CREAT = 00000100; //!< O_CREAT - static const int TGT_O_TRUNC = 00001000; //!< O_TRUNC - static const int TGT_O_EXCL = 00000200; //!< O_EXCL - static const int TGT_O_NOCTTY = 00000400; //!< O_NOCTTY - static const int TGT_O_SYNC = 00010000; //!< O_SYNC - static const int TGT_O_ASYNC = 00020000; - static const int TGT_O_DIRECT = 00040000; //!< O_DIRECTIO - static const int TGT_O_LARGEFILE = 00100000; - static const int TGT_O_DIRECTORY = 00200000; - static const int TGT_O_NOFOLLOW = 00400000; - static const int TGT_O_NOATIME = 01000000; - static const int TGT_O_CLOEXEC = 02000000; + static const int TGT_O_RDONLY = 000000000; //!< O_RDONLY + static const int TGT_O_WRONLY = 000000001; //!< O_WRONLY + static const int TGT_O_RDWR = 000000002; //!< O_RDWR + static const int TGT_O_CREAT = 000000100; //!< O_CREAT + static const int TGT_O_EXCL = 000000200; //!< O_EXCL + static const int TGT_O_NOCTTY = 000000400; //!< O_NOCTTY + static const int TGT_O_TRUNC = 000001000; //!< O_TRUNC + static const int TGT_O_APPEND = 000002000; //!< O_APPEND + static const int TGT_O_NONBLOCK = 000004000; //!< O_NONBLOCK + static const int TGT_O_DSYNC = 000010000; + static const int TGT_FASYNC = 000020000; + static const int TGT_O_DIRECT = 000040000; //!< O_DIRECTIO + static const int TGT_O_LARGEFILE = 000100000; + static const int TGT_O_DIRECTORY = 000200000; + static const int TGT_O_NOFOLLOW = 000400000; + static const int TGT_O_NOATIME = 001000000; + static const int TGT_O_CLOEXEC = 002000000; + static const int TGT_O_SYNC = 004010000; //!< O_SYNC + static const int TGT_O_PATH = 010000000; static const int NUM_OPEN_FLAGS; @@ -140,25 +177,62 @@ class X86Linux32 : public Linux uint64_t st_ino; } __attribute__((__packed__)) tgt_stat64; + static const int TGT_SIGHUP = 0x000001; + static const int TGT_SIGINT = 0x000002; + static const int TGT_SIGQUIT = 0x000003; + static const int TGT_SIGILL = 0x000004; + static const int TGT_SIGTRAP = 0x000005; + static const int TGT_SIGABRT = 0x000006; + static const int TGT_SIGIOT = 0x000006; + static const int TGT_SIGBUS = 0x000007; + static const int TGT_SIGFPE = 0x000008; + static const int TGT_SIGKILL = 0x000009; + static const int TGT_SIGUSR1 = 0x00000a; + static const int TGT_SIGSEGV = 0x00000b; + static const int TGT_SIGUSR2 = 0x00000c; + static const int TGT_SIGPIPE = 0x00000d; + static const int TGT_SIGALRM = 0x00000e; + static const int TGT_SIGTERM = 0x00000f; + static const int TGT_SIGSTKFLT = 0x000010; + static const int TGT_SIGCHLD = 0x000011; + static const int TGT_SIGCONT = 0x000012; + static const int TGT_SIGSTOP = 0x000013; + static const int TGT_SIGTSTP = 0x000014; + static const int TGT_SIGTTIN = 0x000015; + static const int TGT_SIGTTOU = 0x000016; + static const int TGT_SIGURG = 0x000017; + static const int TGT_SIGXCPU = 0x000018; + static const int TGT_SIGXFSZ = 0x000019; + static const int TGT_SIGVTALRM = 0x00001a; + static const int TGT_SIGPROF = 0x00001b; + static const int TGT_SIGWINCH = 0x00001c; + static const int TGT_SIGIO = 0x00001d; + static const int TGT_SIGPOLL = 0x00001d; + static const int TGT_SIGPWR = 0x00001e; + static const int TGT_SIGSYS = 0x00001f; + static const int TGT_SIGUNUSED = 0x00001f; + static SyscallFlagTransTable openFlagTable[]; - static const int TGT_O_RDONLY = 00000000; //!< O_RDONLY - static const int TGT_O_WRONLY = 00000001; //!< O_WRONLY - static const int TGT_O_RDWR = 00000002; //!< O_RDWR - static const int TGT_O_NONBLOCK = 00004000; //!< O_NONBLOCK - static const int TGT_O_APPEND = 00002000; //!< O_APPEND - static const int TGT_O_CREAT = 00000100; //!< O_CREAT - static const int TGT_O_TRUNC = 00001000; //!< O_TRUNC - static const int TGT_O_EXCL = 00000200; //!< O_EXCL - static const int TGT_O_NOCTTY = 00000400; //!< O_NOCTTY - static const int TGT_O_SYNC = 00010000; //!< O_SYNC - static const int TGT_O_ASYNC = 00020000; - static const int TGT_O_DIRECT = 00040000; //!< O_DIRECTIO - static const int TGT_O_LARGEFILE = 00100000; - static const int TGT_O_DIRECTORY = 00200000; - static const int TGT_O_NOFOLLOW = 00400000; - static const int TGT_O_NOATIME = 01000000; - static const int TGT_O_CLOEXEC = 02000000; + static const int TGT_O_RDONLY = 000000000; //!< O_RDONLY + static const int TGT_O_WRONLY = 000000001; //!< O_WRONLY + static const int TGT_O_RDWR = 000000002; //!< O_RDWR + static const int TGT_O_CREAT = 000000100; //!< O_CREAT + static const int TGT_O_EXCL = 000000200; //!< O_EXCL + static const int TGT_O_NOCTTY = 000000400; //!< O_NOCTTY + static const int TGT_O_TRUNC = 000001000; //!< O_TRUNC + static const int TGT_O_APPEND = 000002000; //!< O_APPEND + static const int TGT_O_NONBLOCK = 000004000; //!< O_NONBLOCK + static const int TGT_O_DSYNC = 000010000; //!< O_DSYNC + static const int TGT_FASYNC = 000020000; + static const int TGT_O_DIRECT = 000040000; //!< O_DIRECTIO + static const int TGT_O_LARGEFILE = 000100000; + static const int TGT_O_DIRECTORY = 000200000; + static const int TGT_O_NOFOLLOW = 000400000; + static const int TGT_O_NOATIME = 001000000; + static const int TGT_O_CLOEXEC = 002000000; + static const int TGT_O_SYNC = 004010000; //!< O_SYNC + static const int TGT_O_PATH = 010000000; static const int NUM_OPEN_FLAGS; -- cgit v1.2.3