mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: Pass CPUArchState to target_restore_altstack

Browse Source 
In most cases we were already passing get_sp_from_cpustate
directly to the function.  In other cases, we were passing
a local variable which already contained the same value.
In the rest of the cases, we were passing the stack pointer
out of env directly.

Reviewed by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210426025334.1168495-5-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2021-04-25 19:53:13 -07:00 committed by Laurent Vivier
parent 6b20875503
commit ddc3e74d9c
18 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/aarch64/signal.c
View File

@ -561,7 +561,7 @@ long do_rt_sigreturn(CPUARMState *env)
goto badframe;
}
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/alpha/signal.c
View File

@ -257,7 +257,7 @@ long do_rt_sigreturn(CPUAlphaState *env)
set_sigmask(&set);
restore_sigcontext(env, &frame->uc.tuc_mcontext);
target_restore_altstack(&frame->uc.tuc_stack, env->ir[IR_SP]);
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

4
linux-user/arm/signal.c
View File

@ -685,7 +685,7 @@ static int do_sigframe_return_v2(CPUARMState *env,
}
}
target_restore_altstack(&uc->tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&uc->tuc_stack, env);
#if 0
/* Send SIGTRAP if we're single-stepping */
@ -769,7 +769,7 @@ static long do_rt_sigreturn_v1(CPUARMState *env)
goto badframe;
}
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.tuc_stack, env);
#if 0
/* Send SIGTRAP if we're single-stepping */

2
linux-user/hexagon/signal.c
View File

@ -260,7 +260,7 @@ long do_rt_sigreturn(CPUHexagonState *env)
}
restore_ucontext(env, &frame->uc);
target_restore_altstack(&frame->uc.uc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.uc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/hppa/signal.c
View File

@ -187,7 +187,7 @@ long do_rt_sigreturn(CPUArchState *env)
set_sigmask(&set);
restore_sigcontext(env, &frame->uc.tuc_mcontext);
target_restore_altstack(&frame->uc.tuc_stack, env->gr[30]);
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/i386/signal.c
View File

@ -581,7 +581,7 @@ long do_rt_sigreturn(CPUX86State *env)
goto badframe;
}
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/m68k/signal.c
View File

@ -400,7 +400,7 @@ long do_rt_sigreturn(CPUM68KState *env)
if (target_rt_restore_ucontext(env, &frame->uc))
goto badframe;
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/microblaze/signal.c
View File

@ -209,7 +209,7 @@ long do_rt_sigreturn(CPUMBState *env)
restore_sigcontext(&frame->uc.tuc_mcontext, env);
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/mips/signal.c
View File

@ -368,7 +368,7 @@ long do_rt_sigreturn(CPUMIPSState *env)
set_sigmask(&blocked);
restore_sigcontext(env, &frame->rs_uc.tuc_mcontext);
target_restore_altstack(&frame->rs_uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->rs_uc.tuc_stack, env);
env->active_tc.PC = env->CP0_EPC;
mips_set_hflags_isa_mode_from_pc(env);

2
linux-user/nios2/signal.c
View File

@ -128,7 +128,7 @@ static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext *uc,
__get_user(env->regs[R_RA], &gregs[23]);
__get_user(env->regs[R_SP], &gregs[28]);
target_restore_altstack(&uc->tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&uc->tuc_stack, env);
*pr2 = env->regs[2];
return 0;

2
linux-user/openrisc/signal.c
View File

@ -158,7 +158,7 @@ long do_rt_sigreturn(CPUOpenRISCState *env)
set_sigmask(&set);
restore_sigcontext(env, &frame->uc.tuc_mcontext);
target_restore_altstack(&frame->uc.tuc_stack, frame_addr);
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return cpu_get_gpr(env, 11);

2
linux-user/ppc/signal.c
View File

@ -655,7 +655,7 @@ long do_rt_sigreturn(CPUPPCState *env)
if (do_setcontext(&rt_sf->uc, env, 1))
goto sigsegv;
target_restore_altstack(&rt_sf->uc.tuc_stack, env->gpr[1]);
target_restore_altstack(&rt_sf->uc.tuc_stack, env);
unlock_user_struct(rt_sf, rt_sf_addr, 1);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/riscv/signal.c
View File

@ -192,7 +192,7 @@ long do_rt_sigreturn(CPURISCVState *env)
}
restore_ucontext(env, &frame->uc);
target_restore_altstack(&frame->uc.uc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.uc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/s390x/signal.c
View File

@ -307,7 +307,7 @@ long do_rt_sigreturn(CPUS390XState *env)
goto badframe;
}
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/sh4/signal.c
View File

@ -323,7 +323,7 @@ long do_rt_sigreturn(CPUSH4State *regs)
set_sigmask(&blocked);
restore_sigcontext(regs, &frame->uc.tuc_mcontext);
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(regs));
target_restore_altstack(&frame->uc.tuc_stack, regs);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;

2
linux-user/signal-common.h
View File

@ -24,7 +24,7 @@ int on_sig_stack(unsigned long sp);
int sas_ss_flags(unsigned long sp);
abi_ulong target_sigsp(abi_ulong sp, struct target_sigaction *ka);
void target_save_altstack(target_stack_t *uss, CPUArchState *env);
abi_long target_restore_altstack(target_stack_t *uss, abi_ulong sp);
abi_long target_restore_altstack(target_stack_t *uss, CPUArchState *env);
static inline void target_sigemptyset(target_sigset_t *set)
{

6
linux-user/signal.c
View File

@ -297,7 +297,7 @@ void target_save_altstack(target_stack_t *uss, CPUArchState *env)
__put_user(ts->sigaltstack_used.ss_size, &uss->ss_size);
}
abi_long target_restore_altstack(target_stack_t *uss, abi_ulong sp)
abi_long target_restore_altstack(target_stack_t *uss, CPUArchState *env)
{
TaskState *ts = (TaskState *)thread_cpu->opaque;
size_t minstacksize = TARGET_MINSIGSTKSZ;
@ -315,7 +315,7 @@ abi_long target_restore_altstack(target_stack_t *uss, abi_ulong sp)
__get_user(ss.ss_size, &uss->ss_size);
__get_user(ss.ss_flags, &uss->ss_flags);
if (on_sig_stack(sp)) {
if (on_sig_stack(get_sp_from_cpustate(env))) {
return -TARGET_EPERM;
}
@ -820,7 +820,7 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr,
if (!lock_user_struct(VERIFY_READ, uss, uss_addr, 1)) {
goto out;
}
ret = target_restore_altstack(uss, get_sp_from_cpustate(env));
ret = target_restore_altstack(uss, env);
if (ret) {
goto out;
}

2
linux-user/xtensa/signal.c
View File

@ -253,7 +253,7 @@ long do_rt_sigreturn(CPUXtensaState *env)
set_sigmask(&set);
restore_sigcontext(env, frame);
target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env));
target_restore_altstack(&frame->uc.tuc_stack, env);
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;