You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/07/19 20:07:41 UTC
[incubator-nuttx] branch master updated: syscall: Remove
g_funclookup and g_funcnparms
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 4f22f74 syscall: Remove g_funclookup and g_funcnparms
4f22f74 is described below
commit 4f22f746f86a9e9e70b4b032c3377de04580166c
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jul 7 13:56:04 2020 +0800
syscall: Remove g_funclookup and g_funcnparms
since nobody use them
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
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(-)
diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index 0bd0e17..0dc0fc9 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 475349a..a99761c 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 3d7f2c4..0000000
--- 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 <nuttx/config.h>
-#include <syscall.h>
-
-/* The content of this file is only meaningful during the kernel phase of
- * a kernel build.
- */
-
-#if defined(CONFIG_LIB_SYSCALL) && defined(__KERNEL__)
-
-#include <nuttx/arch.h>
-#include <nuttx/module.h>
-#include <nuttx/sched.h>
-#include <nuttx/semaphore.h>
-#include <nuttx/spawn.h>
-#include <nuttx/tls.h>
-#include <nuttx/syslog/syslog.h>
-#include <nuttx/binfmt/binfmt.h>
-#include <nuttx/drivers/drivers.h>
-#include <nuttx/fs/fs.h>
-
-#include <sys/boardctl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/prctl.h>
-#include <sys/random.h>
-#include <sys/select.h>
-#include <sys/sendfile.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/time.h>
-#include <sys/utsname.h>
-#include <sys/wait.h>
-
-#include <aio.h>
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <mqueue.h>
-#include <net/if.h>
-#include <poll.h>
-#include <pthread.h>
-#include <sched.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <spawn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <time.h>
-#include <unistd.h>
-
-/****************************************************************************
- * 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 <sys/syscall_lookup.h>
-# 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 241f8ad..0000000
--- 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 <gn...@nuttx.org>
- *
- * 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 <nuttx/config.h>
-#include <syscall.h>
-
-#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 <sys/syscall_lookup.h>
-# undef SYSCALL_LOOKUP1
-# undef SYSCALL_LOOKUP
-};
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-#endif /* CONFIG_LIB_SYSCALL */