ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl 

Define do_arch_prctl() for i386 and x86_64, but return -TARGET_ENOSYS
for i386.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
Message-Id: <20200310103403.3284090-14-laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Laurent Vivier 2020-03-10 11:33:55 +01:00
parent bb0cdc0367
commit 9d12f79daa
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/i386/target_cpu.h
View File

@ -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) #if defined(TARGET_ABI32)
abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr); 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); cpu_x86_load_seg(env, R_GS, env->segs[R_GS].selector);
} }
#else #else
abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr);
static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls) static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls)
{ {
do_arch_prctl(env, TARGET_ARCH_SET_FS, newtls); do_arch_prctl(env, TARGET_ARCH_SET_FS, newtls);

19
linux-user/syscall.c
View File

@ -5545,6 +5545,10 @@ static bitmask_transtbl mmap_flags_tbl[] = {
{ 0, 0, 0, 0 } { 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) #if defined(TARGET_I386)
/* NOTE: there is really one LDT for all the threads */ /* NOTE: there is really one LDT for all the threads */
@ -5684,7 +5688,7 @@ static abi_long do_modify_ldt(CPUX86State *env, int func, abi_ulong ptr,
return ret; return ret;
} }
#if defined(TARGET_I386) && defined(TARGET_ABI32) #if defined(TARGET_ABI32)
abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr) abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr)
{ {
uint64_t *gdt_table = g2h(env->gdt.base); uint64_t *gdt_table = g2h(env->gdt.base);
@ -5816,9 +5820,12 @@ static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
unlock_user_struct(target_ldt_info, ptr, 1); unlock_user_struct(target_ldt_info, ptr, 1);
return 0; 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 do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
{ {
abi_long ret = 0; abi_long ret = 0;
@ -5851,7 +5858,7 @@ abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
} }
return ret; return ret;
} }
#endif #endif /* defined(TARGET_ABI32 */
#endif /* defined(TARGET_I386) */ #endif /* defined(TARGET_I386) */
@ -10321,11 +10328,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
break; break;
#ifdef TARGET_NR_arch_prctl #ifdef TARGET_NR_arch_prctl
case TARGET_NR_arch_prctl: case TARGET_NR_arch_prctl:
#if defined(TARGET_I386) && !defined(TARGET_ABI32)
return do_arch_prctl(cpu_env, arg1, arg2); return do_arch_prctl(cpu_env, arg1, arg2);
#else
#error unreachable
#endif
#endif #endif
#ifdef TARGET_NR_pread64 #ifdef TARGET_NR_pread64
case TARGET_NR_pread64: case TARGET_NR_pread64: