From 4f22f746f86a9e9e70b4b032c3377de04580166c Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Tue, 7 Jul 2020 13:56:04 +0800 Subject: [PATCH] syscall: Remove g_funclookup and g_funcnparms since nobody use them Signed-off-by: Xiang Xiao --- include/sys/syscall.h | 17 +----- syscall/Makefile | 2 +- syscall/syscall_funclookup.c | 108 ----------------------------------- syscall/syscall_nparms.c | 67 ---------------------- 4 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 syscall/syscall_funclookup.c delete mode 100644 syscall/syscall_nparms.c diff --git a/include/sys/syscall.h b/include/sys/syscall.h index 0bd0e17886..0dc0fc90f1 100644 --- a/include/sys/syscall.h +++ b/include/sys/syscall.h @@ -83,16 +83,7 @@ extern "C" #define EXTERN extern #endif -#ifdef __KERNEL__ - -/* Function lookup tables. This table is indexed by the system call numbers - * defined above. Given the system call number, this table provides the - * address of the corresponding system function. - * - * This table is only available during the kernel phase of a kernel build. - */ - -EXTERN const uintptr_t g_funclookup[SYS_nsyscalls]; +#ifdef CONFIG_LIB_SYSCALL /* Given the system call number, the corresponding entry in this table * provides the address of the stub function. @@ -104,12 +95,6 @@ EXTERN const uintptr_t g_stublookup[SYS_nsyscalls]; #endif -/* Given the system call number, the corresponding entry in this table - * provides the number of parameters needed by the function. - */ - -EXTERN const uint8_t g_funcnparms[SYS_nsyscalls]; - /**************************************************************************** * Public Function Prototypes ****************************************************************************/ diff --git a/syscall/Makefile b/syscall/Makefile index 475349a922..a99761c679 100644 --- a/syscall/Makefile +++ b/syscall/Makefile @@ -41,7 +41,7 @@ include stubs/Make.defs MKSYSCALL = "$(TOPDIR)$(DELIM)tools$(DELIM)mksyscall$(HOSTEXEEXT)" CSVFILE = "$(TOPDIR)$(DELIM)syscall$(DELIM)syscall.csv" -STUB_SRCS += syscall_funclookup.c syscall_stublookup.c syscall_nparms.c +STUB_SRCS += syscall_stublookup.c AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/syscall/syscall_funclookup.c b/syscall/syscall_funclookup.c deleted file mode 100644 index 3d7f2c4840..0000000000 --- a/syscall/syscall_funclookup.c +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** - * syscall/syscall_funclookup.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#include - -/* The content of this file is only meaningful during the kernel phase of - * a kernel build. - */ - -#if defined(CONFIG_LIB_SYSCALL) && defined(__KERNEL__) - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/* Function lookup tables. This table is indexed by the system call numbers - * defined above. Given the system call number, this table provides the - * address of the corresponding system function. - * - * This table is only available during the kernel phase of a kernel build. - */ - -const uintptr_t g_funclookup[SYS_nsyscalls] = -{ -# define SYSCALL_LOOKUP1(f,n) (uintptr_t)f -# define SYSCALL_LOOKUP(f,n) , (uintptr_t)f -# include -# undef SYSCALL_LOOKUP1 -# undef SYSCALL_LOOKUP -}; - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -#endif /* CONFIG_LIB_SYSCALL && __KERNEL__ */ diff --git a/syscall/syscall_nparms.c b/syscall/syscall_nparms.c deleted file mode 100644 index 241f8ade9b..0000000000 --- a/syscall/syscall_nparms.c +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - * syscall/syscall_nparms.c - * - * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#include - -#ifdef CONFIG_LIB_SYSCALL - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/* Stub lookup tables. This table is indexed by the system call numbers - * defined above. Given the system call number, the corresponding entry in - * this table provides the number of parameters needed by the function. - */ - -const uint8_t g_funcnparms[SYS_nsyscalls] = -{ -# define SYSCALL_LOOKUP1(f,n) n -# define SYSCALL_LOOKUP(f,n) , n -# include -# undef SYSCALL_LOOKUP1 -# undef SYSCALL_LOOKUP -}; - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -#endif /* CONFIG_LIB_SYSCALL */