changeset 3d47d83a48eb in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=3d47d83a48eb
description:
syscall_emul: factor out flag tables into common file
The openFlagTable and mmapFlagTables for emulated Linux
platforms are basically identical, but are specified
repetitively for every platform. Use a common file
that gets included for each platform so that we only
have one copy, making them more consistent and simplifying
changes (like adding #ifdefs).
In the process, made some minor fixes that slipped through
due to previous inconsistencies, and added more #ifdefs
to try to fix building on alternative hosts.
diffstat:
src/arch/alpha/linux/linux.cc | 94 +------------------
src/arch/arm/linux/linux.cc | 206 +----------------------------------------
src/arch/mips/linux/linux.cc | 93 +------------------
src/arch/mips/linux/linux.hh | 1 +
src/arch/power/linux/linux.cc | 99 +-------------------
src/arch/sparc/linux/linux.cc | 94 +------------------
src/arch/sparc/linux/linux.hh | 3 +-
src/arch/x86/linux/linux.cc | 198 +--------------------------------------
src/kern/linux/flag_tables.hh | 156 +++++++++++++++++++++++++++++++
9 files changed, 179 insertions(+), 765 deletions(-)
diffs (truncated from 1017 to 300 lines):
diff -r 1f92ce16e171 -r 3d47d83a48eb src/arch/alpha/linux/linux.cc
--- a/src/arch/alpha/linux/linux.cc Wed Mar 30 16:21:27 2016 +0100
+++ b/src/arch/alpha/linux/linux.cc Fri Apr 01 16:38:15 2016 -0700
@@ -33,95 +33,5 @@
#include <fcntl.h>
#include <sys/mman.h>
-// open(2) flags translation table
-SyscallFlagTransTable AlphaLinux::openFlagTable[] = {
-#ifdef _MSC_VER
- { AlphaLinux::TGT_O_RDONLY, _O_RDONLY },
- { AlphaLinux::TGT_O_WRONLY, _O_WRONLY },
- { AlphaLinux::TGT_O_RDWR, _O_RDWR },
- { AlphaLinux::TGT_O_CREAT, _O_CREAT },
- { AlphaLinux::TGT_O_EXCL, _O_EXCL },
-#ifdef _O_NOCTTY
- { AlphaLinux::TGT_O_NOCTTY, _O_NOCTTY },
-#endif
- { AlphaLinux::TGT_O_TRUNC, _O_TRUNC },
- { AlphaLinux::TGT_O_APPEND, _O_APPEND },
-#ifdef _O_NONBLOCK
- { AlphaLinux::TGT_O_NONBLOCK, _O_NONBLOCK },
-#endif
-#ifdef _O_DSYNC
- { AlphaLinux::TGT_O_DSYNC, _O_DSYNC },
-#endif
- { AlphaLinux::TGT_FASYNC, _O_ASYNC },
- { AlphaLinux::TGT_O_DIRECT, _O_DIRECT },
- { AlphaLinux::TGT_O_LARGEFILE, _O_LARGEFILE },
- { AlphaLinux::TGT_O_DIRECTORY, _O_DIRECTORY },
- { AlphaLinux::TGT_O_NOFOLLOW, _O_NOFOLLOW },
- { AlphaLinux::TGT_O_NOATIME, _O_NOATIME },
-#ifdef _O_CLOEXEC
- { AlphaLinux::TGT_O_CLOEXEC, _O_CLOEXEC },
-#endif
-#ifdef _O_SYNC
- { AlphaLinux::TGT_O_SYNC, _O_SYNC },
-#endif
-#ifdef _O_PATH
- { AlphaLinux::TGT_O_PATH, _O_PATH },
-#endif
-#else /* !_MSC_VER */
- { AlphaLinux::TGT_O_RDONLY, O_RDONLY },
- { AlphaLinux::TGT_O_WRONLY, O_WRONLY },
- { AlphaLinux::TGT_O_RDWR, O_RDWR },
- { AlphaLinux::TGT_O_CREAT, O_CREAT },
- { AlphaLinux::TGT_O_EXCL, O_EXCL },
- { AlphaLinux::TGT_O_NOCTTY, O_NOCTTY },
- { AlphaLinux::TGT_O_TRUNC, O_TRUNC },
- { AlphaLinux::TGT_O_APPEND, O_APPEND },
- { AlphaLinux::TGT_O_NONBLOCK, O_NONBLOCK },
-#ifdef O_DSYNC
- { AlphaLinux::TGT_O_DSYNC, O_DSYNC },
-#endif
- { AlphaLinux::TGT_FASYNC, O_ASYNC },
- { AlphaLinux::TGT_O_DIRECT, O_DIRECT },
- { AlphaLinux::TGT_O_LARGEFILE, O_LARGEFILE },
- { AlphaLinux::TGT_O_DIRECTORY, O_DIRECTORY },
- { AlphaLinux::TGT_O_NOFOLLOW, O_NOFOLLOW },
- { AlphaLinux::TGT_O_NOATIME, O_NOATIME },
-#ifdef O_CLOEXEC
- { AlphaLinux::TGT_O_CLOEXEC, O_CLOEXEC },
-#endif
-#ifdef O_SYNC
- { AlphaLinux::TGT_O_SYNC, O_SYNC },
-#endif
-#ifdef O_PATH
- { AlphaLinux::TGT_O_PATH, O_PATH },
-#endif
-#endif /* _MSC_VER */
-};
-
-const int AlphaLinux::NUM_OPEN_FLAGS =
- (sizeof(AlphaLinux::openFlagTable)/sizeof(AlphaLinux::openFlagTable[0]));
-
-// mmap(2) flags translation table
-SyscallFlagTransTable AlphaLinux::mmapFlagTable[] = {
- { AlphaLinux::TGT_MAP_SHARED, MAP_SHARED },
- { AlphaLinux::TGT_MAP_PRIVATE, MAP_PRIVATE },
- { AlphaLinux::TGT_MAP_ANON, MAP_ANON },
- { AlphaLinux::TGT_MAP_DENYWRITE, MAP_DENYWRITE },
- { AlphaLinux::TGT_MAP_EXECUTABLE, MAP_EXECUTABLE },
- { AlphaLinux::TGT_MAP_FILE, MAP_FILE },
- { AlphaLinux::TGT_MAP_GROWSDOWN, MAP_GROWSDOWN },
- { AlphaLinux::TGT_MAP_HUGETLB, MAP_HUGETLB },
- { AlphaLinux::TGT_MAP_LOCKED, MAP_LOCKED },
- { AlphaLinux::TGT_MAP_NONBLOCK, MAP_NONBLOCK },
- { AlphaLinux::TGT_MAP_NORESERVE, MAP_NORESERVE },
- { AlphaLinux::TGT_MAP_POPULATE, MAP_POPULATE },
-#ifdef MAP_STACK
- { AlphaLinux::TGT_MAP_STACK, MAP_STACK },
-#endif
- { AlphaLinux::TGT_MAP_ANONYMOUS, MAP_ANONYMOUS },
- { AlphaLinux::TGT_MAP_FIXED, MAP_FIXED },
-};
-
-const unsigned AlphaLinux::NUM_MMAP_FLAGS =
- sizeof(AlphaLinux::mmapFlagTable) /
- sizeof(AlphaLinux::mmapFlagTable[0]);
+#define TARGET AlphaLinux
+#include "kern/linux/flag_tables.hh"
diff -r 1f92ce16e171 -r 3d47d83a48eb src/arch/arm/linux/linux.cc
--- a/src/arch/arm/linux/linux.cc Wed Mar 30 16:21:27 2016 +0100
+++ b/src/arch/arm/linux/linux.cc Fri Apr 01 16:38:15 2016 -0700
@@ -46,205 +46,9 @@
#include <fcntl.h>
#include <sys/mman.h>
-// open(2) flags translation table
-SyscallFlagTransTable ArmLinux32::openFlagTable[] = {
-#ifdef _MSC_VER
- { ArmLinux32::TGT_O_RDONLY, _O_RDONLY },
- { ArmLinux32::TGT_O_WRONLY, _O_WRONLY },
- { ArmLinux32::TGT_O_RDWR, _O_RDWR },
- { ArmLinux32::TGT_O_CREAT, _O_CREAT },
- { ArmLinux32::TGT_O_EXCL, _O_EXCL },
-#ifdef _O_NOCTTY
- { ArmLinux32::TGT_O_NOCTTY, _O_NOCTTY },
-#endif
- { ArmLinux32::TGT_O_TRUNC, _O_TRUNC },
- { ArmLinux32::TGT_O_APPEND, _O_APPEND },
-#ifdef _O_NONBLOCK
- { ArmLinux32::TGT_O_NONBLOCK, _O_NONBLOCK },
-#endif
-#ifdef _O_DSYNC
- { ArmLinux32::TGT_O_DSYNC, _O_DSYNC },
-#endif
- { ArmLinux32::TGT_FASYNC, _O_ASYNC },
- { ArmLinux32::TGT_O_DIRECT, _O_DIRECT },
- { ArmLinux32::TGT_O_LARGEFILE, _O_LARGEFILE },
- { ArmLinux32::TGT_O_DIRECTORY, _O_DIRECTORY },
- { ArmLinux32::TGT_O_NOFOLLOW, _O_NOFOLLOW },
- { ArmLinux32::TGT_O_NOATIME, _O_NOATIME },
-#ifdef _O_CLOEXEC
- { ArmLinux32::TGT_O_CLOEXEC, _O_CLOEXEC },
-#endif
-#ifdef _O_SYNC
- { ArmLinux32::TGT_O_SYNC, _O_SYNC },
-#endif
-#ifdef _O_PATH
- { ArmLinux32::TGT_O_PATH, _O_PATH },
-#endif
-#else /* !_MSC_VER */
- { ArmLinux32::TGT_O_RDONLY, O_RDONLY },
- { ArmLinux32::TGT_O_WRONLY, O_WRONLY },
- { ArmLinux32::TGT_O_RDWR, O_RDWR },
- { ArmLinux32::TGT_O_CREAT, O_CREAT },
- { ArmLinux32::TGT_O_EXCL, O_EXCL },
- { ArmLinux32::TGT_O_NOCTTY, O_NOCTTY },
- { ArmLinux32::TGT_O_TRUNC, O_TRUNC },
- { ArmLinux32::TGT_O_APPEND, O_APPEND },
- { ArmLinux32::TGT_O_NONBLOCK, O_NONBLOCK },
-#ifdef O_DSYNC
- { ArmLinux32::TGT_O_DSYNC, O_DSYNC },
-#endif
- { ArmLinux32::TGT_FASYNC, O_ASYNC },
-#ifdef O_DIRECT
- { ArmLinux32::TGT_O_DIRECT, O_DIRECT },
-#endif
-#ifdef O_LARGEFILE
- { ArmLinux32::TGT_O_LARGEFILE, O_LARGEFILE },
-#endif
-#ifdef O_DIRECTORY
- { ArmLinux32::TGT_O_DIRECTORY, O_DIRECTORY },
-#endif
-#ifdef O_NOFOLLOW
- { ArmLinux32::TGT_O_NOFOLLOW, O_NOFOLLOW },
-#endif
- { ArmLinux32::TGT_O_NOATIME, O_NOATIME },
-#ifdef O_CLOEXEC
- { ArmLinux32::TGT_O_CLOEXEC, O_CLOEXEC },
-#endif
-#ifdef O_SYNC
- { ArmLinux32::TGT_O_SYNC, O_SYNC },
-#endif
-#ifdef O_PATH
- { ArmLinux32::TGT_O_PATH, O_PATH },
-#endif
-#endif /* _MSC_VER */
-};
+#define TARGET ArmLinux32
+#include "kern/linux/flag_tables.hh"
-const int ArmLinux32::NUM_OPEN_FLAGS = sizeof(ArmLinux32::openFlagTable) /
- sizeof(ArmLinux32::openFlagTable[0]);
-
-// mmap(2) flags translation table
-SyscallFlagTransTable ArmLinux32::mmapFlagTable[] = {
- { ArmLinux32::TGT_MAP_SHARED, MAP_SHARED },
- { ArmLinux32::TGT_MAP_PRIVATE, MAP_PRIVATE },
- { ArmLinux32::TGT_MAP_ANON, MAP_ANON },
- { ArmLinux32::TGT_MAP_DENYWRITE, MAP_DENYWRITE },
- { ArmLinux32::TGT_MAP_EXECUTABLE, MAP_EXECUTABLE },
- { ArmLinux32::TGT_MAP_FILE, MAP_FILE },
- { ArmLinux32::TGT_MAP_GROWSDOWN, MAP_GROWSDOWN },
- { ArmLinux32::TGT_MAP_HUGETLB, MAP_HUGETLB },
- { ArmLinux32::TGT_MAP_LOCKED, MAP_LOCKED },
- { ArmLinux32::TGT_MAP_NONBLOCK, MAP_NONBLOCK },
- { ArmLinux32::TGT_MAP_NORESERVE, MAP_NORESERVE },
- { ArmLinux32::TGT_MAP_POPULATE, MAP_POPULATE },
-#ifdef MAP_STACK
- { ArmLinux32::TGT_MAP_STACK, MAP_STACK },
-#endif
- { ArmLinux32::TGT_MAP_ANONYMOUS, MAP_ANONYMOUS },
- { ArmLinux32::TGT_MAP_FIXED, MAP_FIXED },
-};
-
-const unsigned ArmLinux32::NUM_MMAP_FLAGS =
- sizeof(ArmLinux32::mmapFlagTable) /
- sizeof(ArmLinux32::mmapFlagTable[0]);
-
-// open(2) flags translation table
-SyscallFlagTransTable ArmLinux64::openFlagTable[] = {
-#ifdef _MSC_VER
- { ArmLinux64::TGT_O_RDONLY, _O_RDONLY },
- { ArmLinux64::TGT_O_WRONLY, _O_WRONLY },
- { ArmLinux64::TGT_O_RDWR, _O_RDWR },
- { ArmLinux64::TGT_O_CREAT, _O_CREAT },
- { ArmLinux64::TGT_O_EXCL, _O_EXCL },
-#ifdef _O_NOCTTY
- { ArmLinux64::TGT_O_NOCTTY, _O_NOCTTY },
-#endif
- { ArmLinux64::TGT_O_TRUNC, _O_TRUNC },
- { ArmLinux64::TGT_O_APPEND, _O_APPEND },
-#ifdef _O_NONBLOCK
- { ArmLinux64::TGT_O_NONBLOCK, _O_NONBLOCK },
-#endif
-#ifdef _O_DSYNC
- { ArmLinux64::TGT_O_DSYNC, _O_DSYNC },
-#endif
- { ArmLinux64::TGT_FASYNC, _O_ASYNC },
- { ArmLinux64::TGT_O_DIRECT, _O_DIRECT },
- { ArmLinux64::TGT_O_LARGEFILE, _O_LARGEFILE },
- { ArmLinux64::TGT_O_DIRECTORY, _O_DIRECTORY },
- { ArmLinux64::TGT_O_NOFOLLOW, _O_NOFOLLOW },
- { ArmLinux64::TGT_O_NOATIME, _O_NOATIME },
-#ifdef _O_CLOEXEC
- { ArmLinux64::TGT_O_CLOEXEC, _O_CLOEXEC },
-#endif
-#ifdef _O_SYNC
- { ArmLinux64::TGT_O_SYNC, _O_SYNC },
-#endif
-#ifdef _O_PATH
- { ArmLinux64::TGT_O_PATH, _O_PATH },
-#endif
-#else /* !_MSC_VER */
- { ArmLinux64::TGT_O_RDONLY, O_RDONLY },
- { ArmLinux64::TGT_O_WRONLY, O_WRONLY },
- { ArmLinux64::TGT_O_RDWR, O_RDWR },
- { ArmLinux64::TGT_O_CREAT, O_CREAT },
- { ArmLinux64::TGT_O_EXCL, O_EXCL },
- { ArmLinux64::TGT_O_NOCTTY, O_NOCTTY },
- { ArmLinux64::TGT_O_TRUNC, O_TRUNC },
- { ArmLinux64::TGT_O_APPEND, O_APPEND },
- { ArmLinux64::TGT_O_NONBLOCK, O_NONBLOCK },
- { ArmLinux64::TGT_O_DSYNC, O_DSYNC },
-#ifdef FASYNC
- { ArmLinux64::TGT_FASYNC, O_ASYNC },
-#endif
-#ifdef O_DIRECT
- { ArmLinux64::TGT_O_DIRECT, O_DIRECT },
-#endif
-#ifdef O_LARGEFILE
- { ArmLinux64::TGT_O_LARGEFILE, O_LARGEFILE },
-#endif
-#ifdef O_DIRECTORY
- { ArmLinux64::TGT_O_DIRECTORY, O_DIRECTORY },
-#endif
-#ifdef O_NOFOLLOW
- { ArmLinux64::TGT_O_NOFOLLOW, O_NOFOLLOW },
-#endif
- { ArmLinux64::TGT_O_NOATIME, O_NOATIME },
-#ifdef O_CLOEXEC
- { ArmLinux64::TGT_O_CLOEXEC, O_CLOEXEC },
-#endif
-#ifdef O_SYNC
- { ArmLinux64::TGT_O_SYNC, O_SYNC },
-#endif
-#ifdef O_PATH
- { ArmLinux64::TGT_O_PATH, O_PATH },
-#endif
-#endif /* _MSC_VER */
-};
-
-const int ArmLinux64::NUM_OPEN_FLAGS = sizeof(ArmLinux64::openFlagTable) /
- sizeof(ArmLinux64::openFlagTable[0]);
-
-// mmap(2) flags translation table
-SyscallFlagTransTable ArmLinux64::mmapFlagTable[] = {
- { ArmLinux64::TGT_MAP_SHARED, MAP_SHARED },
- { ArmLinux64::TGT_MAP_PRIVATE, MAP_PRIVATE },
- { ArmLinux64::TGT_MAP_ANON, MAP_ANON },
- { ArmLinux64::TGT_MAP_DENYWRITE, MAP_DENYWRITE },
- { ArmLinux64::TGT_MAP_EXECUTABLE, MAP_EXECUTABLE },
- { ArmLinux64::TGT_MAP_FILE, MAP_FILE },
- { ArmLinux64::TGT_MAP_GROWSDOWN, MAP_GROWSDOWN },
- { ArmLinux64::TGT_MAP_HUGETLB, MAP_HUGETLB },
- { ArmLinux64::TGT_MAP_LOCKED, MAP_LOCKED },
- { ArmLinux64::TGT_MAP_NONBLOCK, MAP_NONBLOCK },
- { ArmLinux64::TGT_MAP_NORESERVE, MAP_NORESERVE },
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
