[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 26/38] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl
From: |
Laurent Vivier |
Subject: |
[PULL 26/38] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl |
Date: |
Mon, 16 Mar 2020 17:15:38 +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 36bb9dab0bf1..107958f7168d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5577,6 +5577,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 */
@@ -5716,7 +5720,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);
@@ -5848,9 +5852,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;
@@ -5883,7 +5890,7 @@ abi_long do_arch_prctl(CPUX86State *env, int code,
abi_ulong addr)
}
return ret;
}
-#endif
+#endif /* defined(TARGET_ABI32 */
#endif /* defined(TARGET_I386) */
@@ -10468,11 +10475,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 37/38] linux-user, nios2: sync syscall numbers with kernel v5.5, (continued)
- [PULL 37/38] linux-user, nios2: sync syscall numbers with kernel v5.5, Laurent Vivier, 2020/03/16
- [PULL 11/38] linux-user/syscall: Add support for clock_gettime64/clock_settime64, Laurent Vivier, 2020/03/16
- [PULL 13/38] linux-user/riscv: Update the syscall_nr's to the 5.5 kernel, Laurent Vivier, 2020/03/16
- [PULL 18/38] linux-user, xtensa: add syscall table generation support, Laurent Vivier, 2020/03/16
- [PULL 30/38] linux-user, mips64: add syscall table generation support, Laurent Vivier, 2020/03/16
- [PULL 33/38] linux-user,mips: move content of mips_syscall_args, Laurent Vivier, 2020/03/16
- [PULL 04/38] linux-user: Add x86_64 vsyscall page to /proc/self/maps, Laurent Vivier, 2020/03/16
- [PULL 08/38] linux-user: fix socket() strace, Laurent Vivier, 2020/03/16
- [PULL 01/38] target/i386: Renumber EXCP_SYSCALL, Laurent Vivier, 2020/03/16
- [PULL 17/38] linux-user, m68k: add syscall table generation support, Laurent Vivier, 2020/03/16
- [PULL 26/38] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl,
Laurent Vivier <=
- [PULL 34/38] linux-user,mips: update syscall-args-o32.c.inc, Laurent Vivier, 2020/03/16
- [PULL 28/38] linux-user, x86_64: add syscall table generation support, Laurent Vivier, 2020/03/16
- [PULL 24/38] linux-user, s390x: add syscall table generation support, Laurent Vivier, 2020/03/16
- [PULL 38/38] linux-user, openrisc: sync syscall numbers with kernel v5.5, Laurent Vivier, 2020/03/16
- Re: [PULL 00/38] Linux user for 5.0 patches, Peter Maydell, 2020/03/16
- Re: [PULL 00/38] Linux user for 5.0 patches, no-reply, 2020/03/16
- Re: [PULL 00/38] Linux user for 5.0 patches, no-reply, 2020/03/16
- Re: [PULL 00/38] Linux user for 5.0 patches, no-reply, 2020/03/16
- Re: [PULL 00/38] Linux user for 5.0 patches, no-reply, 2020/03/16