From df36764e91bc96d731cbd403c3a4527248eb403c Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 1 Apr 2016 16:38:16 -0700 Subject: [PATCH] syscall_emul: remove mmapFlagTable After all this it turns out we don't even use it. --- src/arch/alpha/linux/linux.hh | 3 --- src/arch/arm/linux/linux.hh | 3 --- src/arch/mips/linux/linux.hh | 3 --- src/arch/power/linux/linux.hh | 3 --- src/arch/sparc/linux/linux.hh | 3 --- src/arch/x86/linux/linux.hh | 3 --- src/kern/linux/flag_tables.hh | 46 +---------------------------------- 7 files changed, 1 insertion(+), 63 deletions(-) diff --git a/src/arch/alpha/linux/linux.hh b/src/arch/alpha/linux/linux.hh index 409ad4dd1..cacb96bd3 100644 --- a/src/arch/alpha/linux/linux.hh +++ b/src/arch/alpha/linux/linux.hh @@ -103,9 +103,6 @@ class AlphaLinux : public Linux static const int TGT_O_PATH = 040000000; //!< O_PATH //@} - /// For mmap(). - static SyscallFlagTransTable mmapFlagTable[]; - static const unsigned TGT_MAP_SHARED = 0x000001; static const unsigned TGT_MAP_PRIVATE = 0x000002; static const unsigned TGT_MAP_ANON = 0x000010; diff --git a/src/arch/arm/linux/linux.hh b/src/arch/arm/linux/linux.hh index 5c814cde1..73f0fa699 100644 --- a/src/arch/arm/linux/linux.hh +++ b/src/arch/arm/linux/linux.hh @@ -124,9 +124,6 @@ class ArmLinux32 : public Linux static const int TGT_O_PATH = 010000000; //!< O_PATH //@} - /// For mmap(). - static SyscallFlagTransTable mmapFlagTable[]; - static const unsigned TGT_MAP_SHARED = 0x00001; static const unsigned TGT_MAP_PRIVATE = 0x00002; static const unsigned TGT_MAP_ANON = 0x00020; diff --git a/src/arch/mips/linux/linux.hh b/src/arch/mips/linux/linux.hh index e0b785c76..38e6abcd1 100644 --- a/src/arch/mips/linux/linux.hh +++ b/src/arch/mips/linux/linux.hh @@ -102,9 +102,6 @@ class MipsLinux : public Linux static const int TGT_O_PATH = 0x00200000; //!< O_PATH //@} - /// For mmap(). - static SyscallFlagTransTable mmapFlagTable[]; - static const unsigned TGT_MAP_SHARED = 0x00001; static const unsigned TGT_MAP_PRIVATE = 0x00002; static const unsigned TGT_MAP_ANON = 0x00800; diff --git a/src/arch/power/linux/linux.hh b/src/arch/power/linux/linux.hh index 55634800e..de149a1a6 100644 --- a/src/arch/power/linux/linux.hh +++ b/src/arch/power/linux/linux.hh @@ -163,9 +163,6 @@ class PowerLinux : public Linux static const int TGT_O_PATH = 010000000; //!< O_PATH //@} - /// For mmap(). - static SyscallFlagTransTable mmapFlagTable[]; - static const unsigned TGT_MAP_SHARED = 0x00001; static const unsigned TGT_MAP_PRIVATE = 0x00002; static const unsigned TGT_MAP_ANON = 0x00020; diff --git a/src/arch/sparc/linux/linux.hh b/src/arch/sparc/linux/linux.hh index d209dcef0..69d373b67 100644 --- a/src/arch/sparc/linux/linux.hh +++ b/src/arch/sparc/linux/linux.hh @@ -119,9 +119,6 @@ class SparcLinux : public Linux static const int NUM_OPEN_FLAGS; - /// For mmap(). - static SyscallFlagTransTable mmapFlagTable[]; - static const unsigned TGT_MAP_SHARED = 0x00001; static const unsigned TGT_MAP_PRIVATE = 0x00002; static const unsigned TGT_MAP_ANON = 0x00020; diff --git a/src/arch/x86/linux/linux.hh b/src/arch/x86/linux/linux.hh index 47eac12b8..fb8e611cb 100644 --- a/src/arch/x86/linux/linux.hh +++ b/src/arch/x86/linux/linux.hh @@ -126,9 +126,6 @@ class X86Linux64 : public Linux static const int NUM_OPEN_FLAGS; - /// For mmap(). - static SyscallFlagTransTable mmapFlagTable[]; - static const unsigned TGT_MAP_SHARED = 0x00001; static const unsigned TGT_MAP_PRIVATE = 0x00002; static const unsigned TGT_MAP_32BIT = 0x00040; diff --git a/src/kern/linux/flag_tables.hh b/src/kern/linux/flag_tables.hh index 30c8f54a5..9e5dfcee6 100644 --- a/src/kern/linux/flag_tables.hh +++ b/src/kern/linux/flag_tables.hh @@ -46,7 +46,7 @@ * @file flag_tables.hh * * This file contains definitions of flag translation tables for the - * open() and mmap() system calls. Since the tables are nearly identical + * open() system call. Since the tables are nearly identical * across target platforms (other than the values of the target flags), * we use a single copy of the tables but include it separately for * each target platform. The TARGET macro must be #defined before including @@ -110,47 +110,3 @@ SyscallFlagTransTable TARGET::openFlagTable[] = { const int TARGET::NUM_OPEN_FLAGS = sizeof(TARGET::openFlagTable) / sizeof(TARGET::openFlagTable[0]); - -// mmap(2) flags translation table -SyscallFlagTransTable TARGET::mmapFlagTable[] = { - { TARGET::TGT_MAP_SHARED, MAP_SHARED }, - { TARGET::TGT_MAP_PRIVATE, MAP_PRIVATE }, - { TARGET::TGT_MAP_FIXED, MAP_FIXED }, - { TARGET::TGT_MAP_ANONYMOUS, MAP_ANONYMOUS }, - { TARGET::TGT_MAP_ANON, MAP_ANON }, - { TARGET::TGT_MAP_FILE, MAP_FILE }, -#if defined(MAP_32BIT) && defined(TARGET_HAS_MAP_32BIT) - { TARGET::TGT_MAP_32BIT, MAP_32BIT }, -#endif -#ifdef MAP_DENYWRITE - { TARGET::TGT_MAP_DENYWRITE, MAP_DENYWRITE }, -#endif -#ifdef MAP_EXECUTABLE - { TARGET::TGT_MAP_EXECUTABLE, MAP_EXECUTABLE }, -#endif -#ifdef MAP_GROWSDOWN - { TARGET::TGT_MAP_GROWSDOWN, MAP_GROWSDOWN }, -#endif -#ifdef MAP_HUGETLB - { TARGET::TGT_MAP_HUGETLB, MAP_HUGETLB }, -#endif -#ifdef MAP_LOCKED - { TARGET::TGT_MAP_LOCKED, MAP_LOCKED }, -#endif -#ifdef MAP_NONBLOCK - { TARGET::TGT_MAP_NONBLOCK, MAP_NONBLOCK }, -#endif -#ifdef MAP_NORESERVE - { TARGET::TGT_MAP_NORESERVE, MAP_NORESERVE }, -#endif -#ifdef MAP_POPULATE - { TARGET::TGT_MAP_POPULATE, MAP_POPULATE }, -#endif -#ifdef MAP_STACK - { TARGET::TGT_MAP_STACK, MAP_STACK }, -#endif -}; - -const unsigned TARGET::NUM_MMAP_FLAGS = - sizeof(TARGET::mmapFlagTable) / sizeof(TARGET::mmapFlagTable[0]); -