[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 25/37] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl
From: |
Laurent Vivier |
Subject: |
[PULL v2 25/37] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl |
Date: |
Tue, 17 Mar 2020 16:51:04 +0100 |
Define do_arch_prctl() for i386 and x86_64, but return -TARGET_ENOSYS
for i386.
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Taylor Simpson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/i386/target_cpu.h | 4 ++--
linux-user/syscall.c | 19 +++++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/linux-user/i386/target_cpu.h b/linux-user/i386/target_cpu.h
index 0b44530854c8..2207d24c2eb0 100644
--- a/linux-user/i386/target_cpu.h
+++ b/linux-user/i386/target_cpu.h
@@ -33,6 +33,8 @@ static inline void cpu_clone_regs_parent(CPUX86State *env,
unsigned flags)
{
}
+abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr);
+
#if defined(TARGET_ABI32)
abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr);
@@ -42,8 +44,6 @@ static inline void cpu_set_tls(CPUX86State *env, target_ulong
newtls)
cpu_x86_load_seg(env, R_GS, env->segs[R_GS].selector);
}
#else
-abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr);
-
static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls)
{
do_arch_prctl(env, TARGET_ARCH_SET_FS, newtls);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 82bd2439eed5..49395dcea978 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5564,6 +5564,10 @@ static bitmask_transtbl mmap_flags_tbl[] = {
{ 0, 0, 0, 0 }
};
+/*
+ * NOTE: TARGET_ABI32 is defined for TARGET_I386 (but not for TARGET_X86_64)
+ * TARGET_I386 is defined if TARGET_X86_64 is defined
+ */
#if defined(TARGET_I386)
/* NOTE: there is really one LDT for all the threads */
@@ -5703,7 +5707,7 @@ static abi_long do_modify_ldt(CPUX86State *env, int func,
abi_ulong ptr,
return ret;
}
-#if defined(TARGET_I386) && defined(TARGET_ABI32)
+#if defined(TARGET_ABI32)
abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr)
{
uint64_t *gdt_table = g2h(env->gdt.base);
@@ -5835,9 +5839,12 @@ static abi_long do_get_thread_area(CPUX86State *env,
abi_ulong ptr)
unlock_user_struct(target_ldt_info, ptr, 1);
return 0;
}
-#endif /* TARGET_I386 && TARGET_ABI32 */
-#ifndef TARGET_ABI32
+abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
+{
+ return -ENOSYS;
+}
+#else
abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
{
abi_long ret = 0;
@@ -5870,7 +5877,7 @@ abi_long do_arch_prctl(CPUX86State *env, int code,
abi_ulong addr)
}
return ret;
}
-#endif
+#endif /* defined(TARGET_ABI32 */
#endif /* defined(TARGET_I386) */
@@ -10356,11 +10363,7 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
break;
#ifdef TARGET_NR_arch_prctl
case TARGET_NR_arch_prctl:
-#if defined(TARGET_I386) && !defined(TARGET_ABI32)
return do_arch_prctl(cpu_env, arg1, arg2);
-#else
-#error unreachable
-#endif
#endif
#ifdef TARGET_NR_pread64
case TARGET_NR_pread64:
--
2.24.1
- [PULL v2 03/37] linux-user/i386: Emulate x86_64 vsyscalls, (continued)
- [PULL v2 03/37] linux-user/i386: Emulate x86_64 vsyscalls, Laurent Vivier, 2020/03/17
- [PULL v2 12/37] linux-user/riscv: Update the syscall_nr's to the 5.5 kernel, Laurent Vivier, 2020/03/17
- [PULL v2 15/37] linux-user, hppa: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 14/37] linux-user, alpha: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 17/37] linux-user, xtensa: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 21/37] linux-user, ppc: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 22/37] linux-user, s390x: remove syscall definitions for !TARGET_S390X, Laurent Vivier, 2020/03/17
- [PULL v2 18/37] linux-user, sh4: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 20/37] linux-user, arm: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 19/37] linux-user, microblaze: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 25/37] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl,
Laurent Vivier <=
- [PULL v2 23/37] linux-user, s390x: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 26/37] linux-user, i386: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 30/37] linux-user, scripts: add a script to update syscall.tbl, Laurent Vivier, 2020/03/17
- [PULL v2 27/37] linux-user, x86_64: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 31/37] linux-user: update syscall.tbl from linux 0bf999f9c5e7, Laurent Vivier, 2020/03/17
- [PULL v2 28/37] linux-user, mips: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 33/37] linux-user,mips: update syscall-args-o32.c.inc, Laurent Vivier, 2020/03/17
- [PULL v2 24/37] linux-user, sparc, sparc64: add syscall table generation support, Laurent Vivier, 2020/03/17
- [PULL v2 32/37] linux-user,mips: move content of mips_syscall_args, Laurent Vivier, 2020/03/17
- [PULL v2 37/37] linux-user, openrisc: sync syscall numbers with kernel v5.5, Laurent Vivier, 2020/03/17