svn commit: r331226 - in head/sys: amd64/linux amd64/linux32 i386/linux
Ed Maste
emaste at FreeBSD.org
Mon Mar 19 21:26:33 UTC 2018
Author: emaste
Date: Mon Mar 19 21:26:32 2018
New Revision: 331226
URL: https://svnweb.freebsd.org/changeset/base/331226
Log:
Rename linuxulator functions with linux_ prefix
It's preferable to have a consistent prefix. This also reduces
differences between the three linux*_sysvec.c files.
Sponsored by: Turing Robotic Industries Inc.
Modified:
head/sys/amd64/linux/linux_sysvec.c
head/sys/amd64/linux32/linux.h
head/sys/amd64/linux32/linux32_sysvec.c
head/sys/i386/linux/linux.h
head/sys/i386/linux/linux_sysvec.c
Modified: head/sys/amd64/linux/linux_sysvec.c
==============================================================================
--- head/sys/amd64/linux/linux_sysvec.c Mon Mar 19 21:13:25 2018 (r331225)
+++ head/sys/amd64/linux/linux_sysvec.c Mon Mar 19 21:26:32 2018 (r331226)
@@ -119,14 +119,14 @@ extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL
SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler);
static register_t * linux_copyout_strings(struct image_params *imgp);
-static int elf_linux_fixup(register_t **stack_base,
+static int linux_elf_fixup(register_t **stack_base,
struct image_params *iparams);
static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel);
static void linux_vdso_install(void *param);
static void linux_vdso_deinstall(void *param);
static void linux_set_syscall_retval(struct thread *td, int error);
static int linux_fetch_syscall_args(struct thread *td);
-static int exec_linux_imgact_try(struct image_params *iparams);
+static int linux_exec_imgact_try(struct image_params *iparams);
static void linux_exec_setregs(struct thread *td, struct image_params *imgp,
u_long stack);
static int linux_vsyscall(struct thread *td);
@@ -180,7 +180,7 @@ LINUX_VDSO_SYM_CHAR(linux_platform);
* MPSAFE
*/
static int
-translate_traps(int signal, int trap_code)
+linux_translate_traps(int signal, int trap_code)
{
if (signal != SIGBUS)
@@ -245,7 +245,7 @@ linux_set_syscall_retval(struct thread *td, int error)
}
static int
-elf_linux_fixup(register_t **stack_base, struct image_params *imgp)
+linux_fixup_elf(register_t **stack_base, struct image_params *imgp)
{
Elf_Auxargs *args;
Elf_Addr *base;
@@ -258,7 +258,7 @@ elf_linux_fixup(register_t **stack_base, struct image_
arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings;
KASSERT(curthread->td_proc == imgp->proc,
- ("unsafe elf_linux_fixup(), should be curproc"));
+ ("unsafe linux_fixup_elf(), should be curproc"));
base = (Elf64_Addr *)*stack_base;
args = (Elf64_Auxargs *)imgp->auxargs;
pos = base + (imgp->args->argc + imgp->args->envc + 2);
@@ -671,7 +671,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigse
* binary is doing the exec, so we do not create an EXEC module for it.
*/
static int
-exec_linux_imgact_try(struct image_params *imgp)
+linux_exec_imgact_try(struct image_params *imgp)
{
const char *head = (const char *)imgp->image_header;
char *rpath;
@@ -753,14 +753,14 @@ struct sysentvec elf_linux_sysvec = {
.sv_mask = 0,
.sv_errsize = ELAST + 1,
.sv_errtbl = bsd_to_linux_errno_generic,
- .sv_transtrap = translate_traps,
- .sv_fixup = elf_linux_fixup,
+ .sv_transtrap = linux_translate_traps,
+ .sv_fixup = linux_fixup_elf,
.sv_sendsig = linux_rt_sendsig,
.sv_sigcode = &_binary_linux_locore_o_start,
.sv_szsigcode = &linux_szsigcode,
.sv_name = "Linux ELF64",
.sv_coredump = elf64_coredump,
- .sv_imgact_try = exec_linux_imgact_try,
+ .sv_imgact_try = linux_exec_imgact_try,
.sv_minsigstksz = LINUX_MINSIGSTKSZ,
.sv_pagesize = PAGE_SIZE,
.sv_minuser = VM_MIN_ADDRESS,
Modified: head/sys/amd64/linux32/linux.h
==============================================================================
--- head/sys/amd64/linux32/linux.h Mon Mar 19 21:13:25 2018 (r331225)
+++ head/sys/amd64/linux32/linux.h Mon Mar 19 21:26:32 2018 (r331226)
@@ -116,7 +116,7 @@ typedef struct {
*/
#define LINUX_AT_COUNT 20 /* Count of used aux entry types.
* Keep this synchronized with
- * elf_linux_fixup() code.
+ * linux_fixup_elf() code.
*/
struct l___sysctl_args
{
Modified: head/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysvec.c Mon Mar 19 21:13:25 2018 (r331225)
+++ head/sys/amd64/linux32/linux32_sysvec.c Mon Mar 19 21:26:32 2018 (r331226)
@@ -120,12 +120,12 @@ extern struct sysent linux32_sysent[LINUX32_SYS_MAXSYS
SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler);
-static int elf_linux_fixup(register_t **stack_base,
+static int linux_fixup_elf(register_t **stack_base,
struct image_params *iparams);
static register_t *linux_copyout_strings(struct image_params *imgp);
static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask);
-static int exec_linux_imgact_try(struct image_params *iparams);
-static void exec_linux_setregs(struct thread *td,
+static int linux_exec_imgact_try(struct image_params *iparams);
+static void linux_exec_setregs(struct thread *td,
struct image_params *imgp, u_long stack);
static void linux32_fixlimit(struct rlimit *rl, int which);
static bool linux32_trans_osrel(const Elf_Note *note, int32_t *osrel);
@@ -190,7 +190,7 @@ LINUX_VDSO_SYM_CHAR(linux_platform);
* MPSAFE
*/
static int
-translate_traps(int signal, int trap_code)
+linux_translate_traps(int signal, int trap_code)
{
if (signal != SIGBUS)
return signal;
@@ -206,7 +206,7 @@ translate_traps(int signal, int trap_code)
}
static int
-elf_linux_fixup(register_t **stack_base, struct image_params *imgp)
+linux_fixup_elf(register_t **stack_base, struct image_params *imgp)
{
Elf32_Auxargs *args;
Elf32_Addr *base;
@@ -217,7 +217,7 @@ elf_linux_fixup(register_t **stack_base, struct image_
arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS;
KASSERT(curthread->td_proc == imgp->proc,
- ("unsafe elf_linux_fixup(), should be curproc"));
+ ("unsafe linux_fixup_elf(), should be curproc"));
base = (Elf32_Addr *)*stack_base;
args = (Elf32_Auxargs *)imgp->auxargs;
pos = base + (imgp->args->argc + imgp->args->envc + 2);
@@ -724,7 +724,7 @@ linux32_fetch_syscall_args(struct thread *td)
* binary is doing the exec, so we do not create an EXEC module for it.
*/
static int
-exec_linux_imgact_try(struct image_params *imgp)
+linux_exec_imgact_try(struct image_params *imgp)
{
const char *head = (const char *)imgp->image_header;
char *rpath;
@@ -758,7 +758,7 @@ exec_linux_imgact_try(struct image_params *imgp)
* XXX copied from ia32_signal.c.
*/
static void
-exec_linux_setregs(struct thread *td, struct image_params *imgp, u_long stack)
+linux_exec_setregs(struct thread *td, struct image_params *imgp, u_long stack)
{
struct trapframe *regs = td->td_frame;
struct pcb *pcb = td->td_pcb;
@@ -953,14 +953,14 @@ struct sysentvec elf_linux_sysvec = {
.sv_mask = 0,
.sv_errsize = ELAST + 1,
.sv_errtbl = bsd_to_linux_errno_generic,
- .sv_transtrap = translate_traps,
- .sv_fixup = elf_linux_fixup,
+ .sv_transtrap = linux_translate_traps,
+ .sv_fixup = linux_fixup_elf,
.sv_sendsig = linux_sendsig,
.sv_sigcode = &_binary_linux32_locore_o_start,
.sv_szsigcode = &linux_szsigcode,
.sv_name = "Linux ELF32",
.sv_coredump = elf32_coredump,
- .sv_imgact_try = exec_linux_imgact_try,
+ .sv_imgact_try = linux_exec_imgact_try,
.sv_minsigstksz = LINUX_MINSIGSTKSZ,
.sv_pagesize = PAGE_SIZE,
.sv_minuser = VM_MIN_ADDRESS,
@@ -969,7 +969,7 @@ struct sysentvec elf_linux_sysvec = {
.sv_psstrings = LINUX32_PS_STRINGS,
.sv_stackprot = VM_PROT_ALL,
.sv_copyout_strings = linux_copyout_strings,
- .sv_setregs = exec_linux_setregs,
+ .sv_setregs = linux_exec_setregs,
.sv_fixlimit = linux32_fixlimit,
.sv_maxssiz = &linux32_maxssiz,
.sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_IA32 | SV_SHP,
Modified: head/sys/i386/linux/linux.h
==============================================================================
--- head/sys/i386/linux/linux.h Mon Mar 19 21:13:25 2018 (r331225)
+++ head/sys/i386/linux/linux.h Mon Mar 19 21:26:32 2018 (r331226)
@@ -110,7 +110,7 @@ typedef struct {
*/
#define LINUX_AT_COUNT 20 /* Count of used aux entry types.
* Keep this synchronized with
- * elf_linux_fixup() code.
+ * linux_fixup_elf() code.
*/
struct l___sysctl_args
{
Modified: head/sys/i386/linux/linux_sysvec.c
==============================================================================
--- head/sys/i386/linux/linux_sysvec.c Mon Mar 19 21:13:25 2018 (r331225)
+++ head/sys/i386/linux/linux_sysvec.c Mon Mar 19 21:26:32 2018 (r331226)
@@ -109,11 +109,11 @@ SET_DECLARE(linux_ioctl_handler_set, struct linux_ioct
static int linux_fixup(register_t **stack_base,
struct image_params *iparams);
-static int elf_linux_fixup(register_t **stack_base,
+static int linux_fixup_elf(register_t **stack_base,
struct image_params *iparams);
static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask);
-static int exec_linux_imgact_try(struct image_params *iparams);
-static void exec_linux_setregs(struct thread *td,
+static int linux_exec_imgact_try(struct image_params *iparams);
+static void linux_exec_setregs(struct thread *td,
struct image_params *imgp, u_long stack);
static register_t *linux_copyout_strings(struct image_params *imgp);
static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel);
@@ -177,7 +177,7 @@ LINUX_VDSO_SYM_INTPTR(linux_vsyscall);
* MPSAFE
*/
static int
-translate_traps(int signal, int trap_code)
+linux_translate_traps(int signal, int trap_code)
{
if (signal != SIGBUS)
return (signal);
@@ -209,7 +209,7 @@ linux_fixup(register_t **stack_base, struct image_para
}
static int
-elf_linux_fixup(register_t **stack_base, struct image_params *imgp)
+linux_fixup_elf(register_t **stack_base, struct image_params *imgp)
{
struct proc *p;
Elf32_Auxargs *args;
@@ -219,7 +219,7 @@ elf_linux_fixup(register_t **stack_base, struct image_
int issetugid;
KASSERT(curthread->td_proc == imgp->proc,
- ("unsafe elf_linux_fixup(), should be curproc"));
+ ("unsafe linux_fixup_elf(), should be curproc"));
p = imgp->proc;
issetugid = imgp->proc->p_flag & P_SUGID ? 1 : 0;
@@ -821,7 +821,7 @@ linux_fetch_syscall_args(struct thread *td)
* binary is doing the exec, so we do not create an EXEC module for it.
*/
static int
-exec_linux_imgact_try(struct image_params *imgp)
+linux_exec_imgact_try(struct image_params *imgp)
{
const char *head = (const char *)imgp->image_header;
char *rpath;
@@ -856,7 +856,7 @@ exec_linux_imgact_try(struct image_params *imgp)
* override the exec_setregs default(s) here.
*/
static void
-exec_linux_setregs(struct thread *td, struct image_params *imgp, u_long stack)
+linux_exec_setregs(struct thread *td, struct image_params *imgp, u_long stack)
{
struct pcb *pcb = td->td_pcb;
@@ -894,14 +894,14 @@ struct sysentvec linux_sysvec = {
.sv_mask = 0,
.sv_errsize = ELAST + 1,
.sv_errtbl = bsd_to_linux_errno_generic,
- .sv_transtrap = translate_traps,
+ .sv_transtrap = linux_translate_traps,
.sv_fixup = linux_fixup,
.sv_sendsig = linux_sendsig,
.sv_sigcode = &_binary_linux_locore_o_start,
.sv_szsigcode = &linux_szsigcode,
.sv_name = "Linux a.out",
.sv_coredump = NULL,
- .sv_imgact_try = exec_linux_imgact_try,
+ .sv_imgact_try = linux_exec_imgact_try,
.sv_minsigstksz = LINUX_MINSIGSTKSZ,
.sv_pagesize = PAGE_SIZE,
.sv_minuser = VM_MIN_ADDRESS,
@@ -910,7 +910,7 @@ struct sysentvec linux_sysvec = {
.sv_psstrings = PS_STRINGS,
.sv_stackprot = VM_PROT_ALL,
.sv_copyout_strings = exec_copyout_strings,
- .sv_setregs = exec_linux_setregs,
+ .sv_setregs = linux_exec_setregs,
.sv_fixlimit = NULL,
.sv_maxssiz = NULL,
.sv_flags = SV_ABI_LINUX | SV_AOUT | SV_IA32 | SV_ILP32,
@@ -931,14 +931,14 @@ struct sysentvec elf_linux_sysvec = {
.sv_mask = 0,
.sv_errsize = ELAST + 1,
.sv_errtbl = bsd_to_linux_errno_generic,
- .sv_transtrap = translate_traps,
- .sv_fixup = elf_linux_fixup,
+ .sv_transtrap = linux_translate_traps,
+ .sv_fixup = linux_fixup_elf,
.sv_sendsig = linux_sendsig,
.sv_sigcode = &_binary_linux_locore_o_start,
.sv_szsigcode = &linux_szsigcode,
.sv_name = "Linux ELF",
.sv_coredump = elf32_coredump,
- .sv_imgact_try = exec_linux_imgact_try,
+ .sv_imgact_try = linux_exec_imgact_try,
.sv_minsigstksz = LINUX_MINSIGSTKSZ,
.sv_pagesize = PAGE_SIZE,
.sv_minuser = VM_MIN_ADDRESS,
@@ -947,7 +947,7 @@ struct sysentvec elf_linux_sysvec = {
.sv_psstrings = LINUX_PS_STRINGS,
.sv_stackprot = VM_PROT_ALL,
.sv_copyout_strings = linux_copyout_strings,
- .sv_setregs = exec_linux_setregs,
+ .sv_setregs = linux_exec_setregs,
.sv_fixlimit = NULL,
.sv_maxssiz = NULL,
.sv_flags = SV_ABI_LINUX | SV_IA32 | SV_ILP32 | SV_SHP,
More information about the svn-src-head
mailing list