Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu
提交 1d8b512b 编写于 作者: R Riku Voipio
浏览文件
操作

signal/all: remove __get/__put_user return value reading 

Remove all the simple cases of reading the return value
of __get_user and __put_user.

We set err = 0 in sparc versions of do_sigreturn and
sparc64_set_context to avoid compile error, but else this patch is
just general removal of err |= __get_user ... idiom.

v2: remove err variable from target_rt_restore_ucontext
Signed-off-by: NRiku Voipio <riku.voipio@linaro.org>
Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
上级 af44da87
显示空白变更内容
内联 并排
Showing with 364 addition and 370 deletion
linux-user/signal.c
浏览文件 @ 1d8b512b
...@@ -846,35 +846,35 @@ setup_sigcontext(struct target_sigcontext *sc, struct target_fpstate *fpstate, ...@@ -846,35 +846,35 @@ setup_sigcontext(struct target_sigcontext *sc, struct target_fpstate *fpstate,
uint16_t magic; uint16_t magic;
/* already locked in setup_frame() */ /* already locked in setup_frame() */
err |= __put_user(env->segs[R_GS].selector, (unsigned int *)&sc->gs); __put_user(env->segs[R_GS].selector, (unsigned int *)&sc->gs);
err |= __put_user(env->segs[R_FS].selector, (unsigned int *)&sc->fs); __put_user(env->segs[R_FS].selector, (unsigned int *)&sc->fs);
err |= __put_user(env->segs[R_ES].selector, (unsigned int *)&sc->es); __put_user(env->segs[R_ES].selector, (unsigned int *)&sc->es);
err |= __put_user(env->segs[R_DS].selector, (unsigned int *)&sc->ds); __put_user(env->segs[R_DS].selector, (unsigned int *)&sc->ds);
err |= __put_user(env->regs[R_EDI], &sc->edi); __put_user(env->regs[R_EDI], &sc->edi);
err |= __put_user(env->regs[R_ESI], &sc->esi); __put_user(env->regs[R_ESI], &sc->esi);
err |= __put_user(env->regs[R_EBP], &sc->ebp); __put_user(env->regs[R_EBP], &sc->ebp);
err |= __put_user(env->regs[R_ESP], &sc->esp); __put_user(env->regs[R_ESP], &sc->esp);
err |= __put_user(env->regs[R_EBX], &sc->ebx); __put_user(env->regs[R_EBX], &sc->ebx);
err |= __put_user(env->regs[R_EDX], &sc->edx); __put_user(env->regs[R_EDX], &sc->edx);
err |= __put_user(env->regs[R_ECX], &sc->ecx); __put_user(env->regs[R_ECX], &sc->ecx);
err |= __put_user(env->regs[R_EAX], &sc->eax); __put_user(env->regs[R_EAX], &sc->eax);
err |= __put_user(cs->exception_index, &sc->trapno); __put_user(cs->exception_index, &sc->trapno);
err |= __put_user(env->error_code, &sc->err); __put_user(env->error_code, &sc->err);
err |= __put_user(env->eip, &sc->eip); __put_user(env->eip, &sc->eip);
err |= __put_user(env->segs[R_CS].selector, (unsigned int *)&sc->cs); __put_user(env->segs[R_CS].selector, (unsigned int *)&sc->cs);
err |= __put_user(env->eflags, &sc->eflags); __put_user(env->eflags, &sc->eflags);
err |= __put_user(env->regs[R_ESP], &sc->esp_at_signal); __put_user(env->regs[R_ESP], &sc->esp_at_signal);
err |= __put_user(env->segs[R_SS].selector, (unsigned int *)&sc->ss); __put_user(env->segs[R_SS].selector, (unsigned int *)&sc->ss);
cpu_x86_fsave(env, fpstate_addr, 1); cpu_x86_fsave(env, fpstate_addr, 1);
fpstate->status = fpstate->sw; fpstate->status = fpstate->sw;
magic = 0xffff; magic = 0xffff;
err |= __put_user(magic, &fpstate->magic); __put_user(magic, &fpstate->magic);
err |= __put_user(fpstate_addr, &sc->fpstate); __put_user(fpstate_addr, &sc->fpstate);
/* non-iBCS2 extensions.. */ /* non-iBCS2 extensions.. */
err |= __put_user(mask, &sc->oldmask); __put_user(mask, &sc->oldmask);
err |= __put_user(env->cr[2], &sc->cr2); __put_user(env->cr[2], &sc->cr2);
return err; return err;
} }
...@@ -918,7 +918,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -918,7 +918,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0))
goto give_sigsegv; goto give_sigsegv;
err |= __put_user(current_exec_domain_sig(sig), __put_user(current_exec_domain_sig(sig),
&frame->sig); &frame->sig);
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
...@@ -936,18 +936,18 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -936,18 +936,18 @@ static void setup_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. If provided, use a stub /* Set up to return from userspace. If provided, use a stub
already in userspace. */ already in userspace. */
if (ka->sa_flags & TARGET_SA_RESTORER) { if (ka->sa_flags & TARGET_SA_RESTORER) {
err |= __put_user(ka->sa_restorer, &frame->pretcode); __put_user(ka->sa_restorer, &frame->pretcode);
} else { } else {
uint16_t val16; uint16_t val16;
abi_ulong retcode_addr; abi_ulong retcode_addr;
retcode_addr = frame_addr + offsetof(struct sigframe, retcode); retcode_addr = frame_addr + offsetof(struct sigframe, retcode);
err |= __put_user(retcode_addr, &frame->pretcode); __put_user(retcode_addr, &frame->pretcode);
/* This is popl %eax ; movl $,%eax ; int $0x80 */ /* This is popl %eax ; movl $,%eax ; int $0x80 */
val16 = 0xb858; val16 = 0xb858;
err |= __put_user(val16, (uint16_t *)(frame->retcode+0)); __put_user(val16, (uint16_t *)(frame->retcode+0));
err |= __put_user(TARGET_NR_sigreturn, (int *)(frame->retcode+2)); __put_user(TARGET_NR_sigreturn, (int *)(frame->retcode+2));
val16 = 0x80cd; val16 = 0x80cd;
err |= __put_user(val16, (uint16_t *)(frame->retcode+6)); __put_user(val16, (uint16_t *)(frame->retcode+6));
} }
if (err) if (err)
...@@ -988,24 +988,22 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -988,24 +988,22 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0))
goto give_sigsegv; goto give_sigsegv;
err |= __put_user(current_exec_domain_sig(sig), __put_user(current_exec_domain_sig(sig), &frame->sig);
&frame->sig);
addr = frame_addr + offsetof(struct rt_sigframe, info); addr = frame_addr + offsetof(struct rt_sigframe, info);
err |= __put_user(addr, &frame->pinfo); __put_user(addr, &frame->pinfo);
addr = frame_addr + offsetof(struct rt_sigframe, uc); addr = frame_addr + offsetof(struct rt_sigframe, uc);
err |= __put_user(addr, &frame->puc); __put_user(addr, &frame->puc);
err |= copy_siginfo_to_user(&frame->info, info); err |= copy_siginfo_to_user(&frame->info, info);
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
/* Create the ucontext. */ /* Create the ucontext. */
err |= __put_user(0, &frame->uc.tuc_flags); __put_user(0, &frame->uc.tuc_flags);
err |= __put_user(0, &frame->uc.tuc_link); __put_user(0, &frame->uc.tuc_link);
err |= __put_user(target_sigaltstack_used.ss_sp, __put_user(target_sigaltstack_used.ss_sp, &frame->uc.tuc_stack.ss_sp);
&frame->uc.tuc_stack.ss_sp); __put_user(sas_ss_flags(get_sp_from_cpustate(env)),
err |= __put_user(sas_ss_flags(get_sp_from_cpustate(env)),
&frame->uc.tuc_stack.ss_flags); &frame->uc.tuc_stack.ss_flags);
err |= __put_user(target_sigaltstack_used.ss_size, __put_user(target_sigaltstack_used.ss_size,
&frame->uc.tuc_stack.ss_size); &frame->uc.tuc_stack.ss_size);
err |= setup_sigcontext(&frame->uc.tuc_mcontext, &frame->fpstate, err |= setup_sigcontext(&frame->uc.tuc_mcontext, &frame->fpstate,
env, set->sig[0], env, set->sig[0],
...@@ -1018,16 +1016,16 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -1018,16 +1016,16 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. If provided, use a stub /* Set up to return from userspace. If provided, use a stub
already in userspace. */ already in userspace. */
if (ka->sa_flags & TARGET_SA_RESTORER) { if (ka->sa_flags & TARGET_SA_RESTORER) {
err |= __put_user(ka->sa_restorer, &frame->pretcode); __put_user(ka->sa_restorer, &frame->pretcode);
} else { } else {
uint16_t val16; uint16_t val16;
addr = frame_addr + offsetof(struct rt_sigframe, retcode); addr = frame_addr + offsetof(struct rt_sigframe, retcode);
err |= __put_user(addr, &frame->pretcode); __put_user(addr, &frame->pretcode);
/* This is movl $,%eax ; int $0x80 */ /* This is movl $,%eax ; int $0x80 */
err |= __put_user(0xb8, (char *)(frame->retcode+0)); __put_user(0xb8, (char *)(frame->retcode+0));
err |= __put_user(TARGET_NR_rt_sigreturn, (int *)(frame->retcode+1)); __put_user(TARGET_NR_rt_sigreturn, (int *)(frame->retcode+1));
val16 = 0x80cd; val16 = 0x80cd;
err |= __put_user(val16, (uint16_t *)(frame->retcode+5)); __put_user(val16, (uint16_t *)(frame->retcode+5));
} }
if (err) if (err)
...@@ -1564,8 +1562,6 @@ static const abi_ulong retcodes[4] = { ...@@ -1564,8 +1562,6 @@ static const abi_ulong retcodes[4] = {
}; };
#define __get_user_error(x,p,e) __get_user(x, p)
static inline int valid_user_regs(CPUARMState *regs) static inline int valid_user_regs(CPUARMState *regs)
{ {
return 1; return 1;
...@@ -1867,24 +1863,24 @@ restore_sigcontext(CPUARMState *env, struct target_sigcontext *sc) ...@@ -1867,24 +1863,24 @@ restore_sigcontext(CPUARMState *env, struct target_sigcontext *sc)
int err = 0; int err = 0;
uint32_t cpsr; uint32_t cpsr;
__get_user_error(env->regs[0], &sc->arm_r0, err); __get_user(env->regs[0], &sc->arm_r0);
__get_user_error(env->regs[1], &sc->arm_r1, err); __get_user(env->regs[1], &sc->arm_r1);
__get_user_error(env->regs[2], &sc->arm_r2, err); __get_user(env->regs[2], &sc->arm_r2);
__get_user_error(env->regs[3], &sc->arm_r3, err); __get_user(env->regs[3], &sc->arm_r3);
__get_user_error(env->regs[4], &sc->arm_r4, err); __get_user(env->regs[4], &sc->arm_r4);
__get_user_error(env->regs[5], &sc->arm_r5, err); __get_user(env->regs[5], &sc->arm_r5);
__get_user_error(env->regs[6], &sc->arm_r6, err); __get_user(env->regs[6], &sc->arm_r6);
__get_user_error(env->regs[7], &sc->arm_r7, err); __get_user(env->regs[7], &sc->arm_r7);
__get_user_error(env->regs[8], &sc->arm_r8, err); __get_user(env->regs[8], &sc->arm_r8);
__get_user_error(env->regs[9], &sc->arm_r9, err); __get_user(env->regs[9], &sc->arm_r9);
__get_user_error(env->regs[10], &sc->arm_r10, err); __get_user(env->regs[10], &sc->arm_r10);
__get_user_error(env->regs[11], &sc->arm_fp, err); __get_user(env->regs[11], &sc->arm_fp);
__get_user_error(env->regs[12], &sc->arm_ip, err); __get_user(env->regs[12], &sc->arm_ip);
__get_user_error(env->regs[13], &sc->arm_sp, err); __get_user(env->regs[13], &sc->arm_sp);
__get_user_error(env->regs[14], &sc->arm_lr, err); __get_user(env->regs[14], &sc->arm_lr);
__get_user_error(env->regs[15], &sc->arm_pc, err); __get_user(env->regs[15], &sc->arm_pc);
#ifdef TARGET_CONFIG_CPU_32 #ifdef TARGET_CONFIG_CPU_32
__get_user_error(cpsr, &sc->arm_cpsr, err); __get_user(cpsr, &sc->arm_cpsr);
cpsr_write(env, cpsr, CPSR_USER | CPSR_EXEC); cpsr_write(env, cpsr, CPSR_USER | CPSR_EXEC);
#endif #endif
...@@ -2276,17 +2272,17 @@ setup___siginfo(__siginfo_t *si, CPUSPARCState *env, abi_ulong mask) ...@@ -2276,17 +2272,17 @@ setup___siginfo(__siginfo_t *si, CPUSPARCState *env, abi_ulong mask)
{ {
int err = 0, i; int err = 0, i;
err |= __put_user(env->psr, &si->si_regs.psr); __put_user(env->psr, &si->si_regs.psr);
err |= __put_user(env->pc, &si->si_regs.pc); __put_user(env->pc, &si->si_regs.pc);
err |= __put_user(env->npc, &si->si_regs.npc); __put_user(env->npc, &si->si_regs.npc);
err |= __put_user(env->y, &si->si_regs.y); __put_user(env->y, &si->si_regs.y);
for (i=0; i < 8; i++) { for (i=0; i < 8; i++) {
err |= __put_user(env->gregs[i], &si->si_regs.u_regs[i]); __put_user(env->gregs[i], &si->si_regs.u_regs[i]);
} }
for (i=0; i < 8; i++) { for (i=0; i < 8; i++) {
err |= __put_user(env->regwptr[UREG_I0 + i], &si->si_regs.u_regs[i+8]); __put_user(env->regwptr[UREG_I0 + i], &si->si_regs.u_regs[i+8]);
} }
err |= __put_user(mask, &si->si_mask); __put_user(mask, &si->si_mask);
return err; return err;
} }
...@@ -2297,13 +2293,13 @@ setup_sigcontext(struct target_sigcontext *sc, /*struct _fpstate *fpstate,*/ ...@@ -2297,13 +2293,13 @@ setup_sigcontext(struct target_sigcontext *sc, /*struct _fpstate *fpstate,*/
{ {
int err = 0; int err = 0;
err |= __put_user(mask, &sc->sigc_mask); __put_user(mask, &sc->sigc_mask);
err |= __put_user(env->regwptr[UREG_SP], &sc->sigc_sp); __put_user(env->regwptr[UREG_SP], &sc->sigc_sp);
err |= __put_user(env->pc, &sc->sigc_pc); __put_user(env->pc, &sc->sigc_pc);
err |= __put_user(env->npc, &sc->sigc_npc); __put_user(env->npc, &sc->sigc_npc);
err |= __put_user(env->psr, &sc->sigc_psr); __put_user(env->psr, &sc->sigc_psr);
err |= __put_user(env->gregs[1], &sc->sigc_g1); __put_user(env->gregs[1], &sc->sigc_g1);
err |= __put_user(env->regwptr[UREG_O0], &sc->sigc_o0); __put_user(env->regwptr[UREG_O0], &sc->sigc_o0);
return err; return err;
} }
...@@ -2335,21 +2331,21 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -2335,21 +2331,21 @@ static void setup_frame(int sig, struct target_sigaction *ka,
#endif #endif
/* 2. Save the current process state */ /* 2. Save the current process state */
err = setup___siginfo(&sf->info, env, set->sig[0]); err = setup___siginfo(&sf->info, env, set->sig[0]);
err |= __put_user(0, &sf->extra_size); __put_user(0, &sf->extra_size);
//err |= save_fpu_state(regs, &sf->fpu_state); //save_fpu_state(regs, &sf->fpu_state);
//err |= __put_user(&sf->fpu_state, &sf->fpu_save); //__put_user(&sf->fpu_state, &sf->fpu_save);
err |= __put_user(set->sig[0], &sf->info.si_mask); __put_user(set->sig[0], &sf->info.si_mask);
for (i = 0; i < TARGET_NSIG_WORDS - 1; i++) { for (i = 0; i < TARGET_NSIG_WORDS - 1; i++) {
err |= __put_user(set->sig[i + 1], &sf->extramask[i]); __put_user(set->sig[i + 1], &sf->extramask[i]);
} }
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
err |= __put_user(env->regwptr[i + UREG_L0], &sf->ss.locals[i]); __put_user(env->regwptr[i + UREG_L0], &sf->ss.locals[i]);
} }
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
err |= __put_user(env->regwptr[i + UREG_I0], &sf->ss.ins[i]); __put_user(env->regwptr[i + UREG_I0], &sf->ss.ins[i]);
} }
if (err) if (err)
goto sigsegv; goto sigsegv;
...@@ -2376,11 +2372,11 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -2376,11 +2372,11 @@ static void setup_frame(int sig, struct target_sigaction *ka,
/* mov __NR_sigreturn, %g1 */ /* mov __NR_sigreturn, %g1 */
val32 = 0x821020d8; val32 = 0x821020d8;
err |= __put_user(val32, &sf->insns[0]); __put_user(val32, &sf->insns[0]);
/* t 0x10 */ /* t 0x10 */
val32 = 0x91d02010; val32 = 0x91d02010;
err |= __put_user(val32, &sf->insns[1]); __put_user(val32, &sf->insns[1]);
if (err) if (err)
goto sigsegv; goto sigsegv;
...@@ -2451,7 +2447,7 @@ long do_sigreturn(CPUSPARCState *env) ...@@ -2451,7 +2447,7 @@ long do_sigreturn(CPUSPARCState *env)
uint32_t up_psr, pc, npc; uint32_t up_psr, pc, npc;
target_sigset_t set; target_sigset_t set;
sigset_t host_set; sigset_t host_set;
int err, i; int err=0, i;
sf_addr = env->regwptr[UREG_FP]; sf_addr = env->regwptr[UREG_FP];
if (!lock_user_struct(VERIFY_READ, sf, sf_addr, 1)) if (!lock_user_struct(VERIFY_READ, sf, sf_addr, 1))
...@@ -2467,14 +2463,14 @@ long do_sigreturn(CPUSPARCState *env) ...@@ -2467,14 +2463,14 @@ long do_sigreturn(CPUSPARCState *env)
if (sf_addr & 3) if (sf_addr & 3)
goto segv_and_exit; goto segv_and_exit;
err = __get_user(pc, &sf->info.si_regs.pc); __get_user(pc, &sf->info.si_regs.pc);
err |= __get_user(npc, &sf->info.si_regs.npc); __get_user(npc, &sf->info.si_regs.npc);
if ((pc | npc) & 3) if ((pc | npc) & 3)
goto segv_and_exit; goto segv_and_exit;
/* 2. Restore the state */ /* 2. Restore the state */
err |= __get_user(up_psr, &sf->info.si_regs.psr); __get_user(up_psr, &sf->info.si_regs.psr);
/* User can only change condition codes and FPU enabling in %psr. */ /* User can only change condition codes and FPU enabling in %psr. */
env->psr = (up_psr & (PSR_ICC /* | PSR_EF */)) env->psr = (up_psr & (PSR_ICC /* | PSR_EF */))
...@@ -2482,12 +2478,12 @@ long do_sigreturn(CPUSPARCState *env) ...@@ -2482,12 +2478,12 @@ long do_sigreturn(CPUSPARCState *env)
env->pc = pc; env->pc = pc;
env->npc = npc; env->npc = npc;
err |= __get_user(env->y, &sf->info.si_regs.y); __get_user(env->y, &sf->info.si_regs.y);
for (i=0; i < 8; i++) { for (i=0; i < 8; i++) {
err |= __get_user(env->gregs[i], &sf->info.si_regs.u_regs[i]); __get_user(env->gregs[i], &sf->info.si_regs.u_regs[i]);
} }
for (i=0; i < 8; i++) { for (i=0; i < 8; i++) {
err |= __get_user(env->regwptr[i + UREG_I0], &sf->info.si_regs.u_regs[i+8]); __get_user(env->regwptr[i + UREG_I0], &sf->info.si_regs.u_regs[i+8]);
} }
/* FIXME: implement FPU save/restore: /* FIXME: implement FPU save/restore:
...@@ -2499,9 +2495,9 @@ long do_sigreturn(CPUSPARCState *env) ...@@ -2499,9 +2495,9 @@ long do_sigreturn(CPUSPARCState *env)
/* This is pretty much atomic, no amount locking would prevent /* This is pretty much atomic, no amount locking would prevent
* the races which exist anyways. * the races which exist anyways.
*/ */
err |= __get_user(set.sig[0], &sf->info.si_mask); __get_user(set.sig[0], &sf->info.si_mask);
for(i = 1; i < TARGET_NSIG_WORDS; i++) { for(i = 1; i < TARGET_NSIG_WORDS; i++) {
err |= (__get_user(set.sig[i], &sf->extramask[i - 1])); __get_user(set.sig[i], &sf->extramask[i - 1]);
} }
target_to_host_sigset_internal(&host_set, &set); target_to_host_sigset_internal(&host_set, &set);
...@@ -2599,15 +2595,15 @@ void sparc64_set_context(CPUSPARCState *env) ...@@ -2599,15 +2595,15 @@ void sparc64_set_context(CPUSPARCState *env)
target_mc_gregset_t *grp; target_mc_gregset_t *grp;
abi_ulong pc, npc, tstate; abi_ulong pc, npc, tstate;
abi_ulong fp, i7, w_addr; abi_ulong fp, i7, w_addr;
int err; int err = 0;
unsigned int i; unsigned int i;
ucp_addr = env->regwptr[UREG_I0]; ucp_addr = env->regwptr[UREG_I0];
if (!lock_user_struct(VERIFY_READ, ucp, ucp_addr, 1)) if (!lock_user_struct(VERIFY_READ, ucp, ucp_addr, 1))
goto do_sigsegv; goto do_sigsegv;
grp = &ucp->tuc_mcontext.mc_gregs; grp = &ucp->tuc_mcontext.mc_gregs;
err = __get_user(pc, &((*grp)[MC_PC])); __get_user(pc, &((*grp)[MC_PC]));
err |= __get_user(npc, &((*grp)[MC_NPC])); __get_user(npc, &((*grp)[MC_NPC]));
if (err || ((pc | npc) & 3)) if (err || ((pc | npc) & 3))
goto do_sigsegv; goto do_sigsegv;
if (env->regwptr[UREG_I1]) { if (env->regwptr[UREG_I1]) {
...@@ -2622,7 +2618,7 @@ void sparc64_set_context(CPUSPARCState *env) ...@@ -2622,7 +2618,7 @@ void sparc64_set_context(CPUSPARCState *env)
src = ucp->tuc_sigmask.sig; src = ucp->tuc_sigmask.sig;
dst = target_set.sig; dst = target_set.sig;
for (i = 0; i < TARGET_NSIG_WORDS; i++, dst++, src++) { for (i = 0; i < TARGET_NSIG_WORDS; i++, dst++, src++) {
err |= __get_user(*dst, src); __get_user(*dst, src);
} }
if (err) if (err)
goto do_sigsegv; goto do_sigsegv;
...@@ -2632,29 +2628,29 @@ void sparc64_set_context(CPUSPARCState *env) ...@@ -2632,29 +2628,29 @@ void sparc64_set_context(CPUSPARCState *env)
} }
env->pc = pc; env->pc = pc;
env->npc = npc; env->npc = npc;
err |= __get_user(env->y, &((*grp)[MC_Y])); __get_user(env->y, &((*grp)[MC_Y]));
err |= __get_user(tstate, &((*grp)[MC_TSTATE])); __get_user(tstate, &((*grp)[MC_TSTATE]));
env->asi = (tstate >> 24) & 0xff; env->asi = (tstate >> 24) & 0xff;
cpu_put_ccr(env, tstate >> 32); cpu_put_ccr(env, tstate >> 32);
cpu_put_cwp64(env, tstate & 0x1f); cpu_put_cwp64(env, tstate & 0x1f);
err |= __get_user(env->gregs[1], (&(*grp)[MC_G1])); __get_user(env->gregs[1], (&(*grp)[MC_G1]));
err |= __get_user(env->gregs[2], (&(*grp)[MC_G2])); __get_user(env->gregs[2], (&(*grp)[MC_G2]));
err |= __get_user(env->gregs[3], (&(*grp)[MC_G3])); __get_user(env->gregs[3], (&(*grp)[MC_G3]));
err |= __get_user(env->gregs[4], (&(*grp)[MC_G4])); __get_user(env->gregs[4], (&(*grp)[MC_G4]));
err |= __get_user(env->gregs[5], (&(*grp)[MC_G5])); __get_user(env->gregs[5], (&(*grp)[MC_G5]));
err |= __get_user(env->gregs[6], (&(*grp)[MC_G6])); __get_user(env->gregs[6], (&(*grp)[MC_G6]));
err |= __get_user(env->gregs[7], (&(*grp)[MC_G7])); __get_user(env->gregs[7], (&(*grp)[MC_G7]));
err |= __get_user(env->regwptr[UREG_I0], (&(*grp)[MC_O0])); __get_user(env->regwptr[UREG_I0], (&(*grp)[MC_O0]));
err |= __get_user(env->regwptr[UREG_I1], (&(*grp)[MC_O1])); __get_user(env->regwptr[UREG_I1], (&(*grp)[MC_O1]));
err |= __get_user(env->regwptr[UREG_I2], (&(*grp)[MC_O2])); __get_user(env->regwptr[UREG_I2], (&(*grp)[MC_O2]));
err |= __get_user(env->regwptr[UREG_I3], (&(*grp)[MC_O3])); __get_user(env->regwptr[UREG_I3], (&(*grp)[MC_O3]));
err |= __get_user(env->regwptr[UREG_I4], (&(*grp)[MC_O4])); __get_user(env->regwptr[UREG_I4], (&(*grp)[MC_O4]));
err |= __get_user(env->regwptr[UREG_I5], (&(*grp)[MC_O5])); __get_user(env->regwptr[UREG_I5], (&(*grp)[MC_O5]));
err |= __get_user(env->regwptr[UREG_I6], (&(*grp)[MC_O6])); __get_user(env->regwptr[UREG_I6], (&(*grp)[MC_O6]));
err |= __get_user(env->regwptr[UREG_I7], (&(*grp)[MC_O7])); __get_user(env->regwptr[UREG_I7], (&(*grp)[MC_O7]));
err |= __get_user(fp, &(ucp->tuc_mcontext.mc_fp)); __get_user(fp, &(ucp->tuc_mcontext.mc_fp));
err |= __get_user(i7, &(ucp->tuc_mcontext.mc_i7)); __get_user(i7, &(ucp->tuc_mcontext.mc_i7));
w_addr = TARGET_STACK_BIAS+env->regwptr[UREG_I6]; w_addr = TARGET_STACK_BIAS+env->regwptr[UREG_I6];
if (put_user(fp, w_addr + offsetof(struct target_reg_window, ins[6]), if (put_user(fp, w_addr + offsetof(struct target_reg_window, ins[6]),
...@@ -2673,15 +2669,15 @@ void sparc64_set_context(CPUSPARCState *env) ...@@ -2673,15 +2669,15 @@ void sparc64_set_context(CPUSPARCState *env)
uint32_t *src = ucp->tuc_mcontext.mc_fpregs.mcfpu_fregs.sregs; uint32_t *src = ucp->tuc_mcontext.mc_fpregs.mcfpu_fregs.sregs;
for (i = 0; i < 64; i++, src++) { for (i = 0; i < 64; i++, src++) {
if (i & 1) { if (i & 1) {
err |= __get_user(env->fpr[i/2].l.lower, src); __get_user(env->fpr[i/2].l.lower, src);
} else { } else {
err |= __get_user(env->fpr[i/2].l.upper, src); __get_user(env->fpr[i/2].l.upper, src);
} }
} }
} }
err |= __get_user(env->fsr, __get_user(env->fsr,
&(ucp->tuc_mcontext.mc_fpregs.mcfpu_fsr)); &(ucp->tuc_mcontext.mc_fpregs.mcfpu_fsr));
err |= __get_user(env->gsr, __get_user(env->gsr,
&(ucp->tuc_mcontext.mc_fpregs.mcfpu_gsr)); &(ucp->tuc_mcontext.mc_fpregs.mcfpu_gsr));
if (err) if (err)
goto do_sigsegv; goto do_sigsegv;
...@@ -2720,39 +2716,39 @@ void sparc64_get_context(CPUSPARCState *env) ...@@ -2720,39 +2716,39 @@ void sparc64_get_context(CPUSPARCState *env)
do_sigprocmask(0, NULL, &set); do_sigprocmask(0, NULL, &set);
host_to_target_sigset_internal(&target_set, &set); host_to_target_sigset_internal(&target_set, &set);
if (TARGET_NSIG_WORDS == 1) { if (TARGET_NSIG_WORDS == 1) {
err |= __put_user(target_set.sig[0], __put_user(target_set.sig[0],
(abi_ulong *)&ucp->tuc_sigmask); (abi_ulong *)&ucp->tuc_sigmask);
} else { } else {
abi_ulong *src, *dst; abi_ulong *src, *dst;
src = target_set.sig; src = target_set.sig;
dst = ucp->tuc_sigmask.sig; dst = ucp->tuc_sigmask.sig;
for (i = 0; i < TARGET_NSIG_WORDS; i++, dst++, src++) { for (i = 0; i < TARGET_NSIG_WORDS; i++, dst++, src++) {
err |= __put_user(*src, dst); __put_user(*src, dst);
} }
if (err) if (err)
goto do_sigsegv; goto do_sigsegv;
} }
/* XXX: tstate must be saved properly */ /* XXX: tstate must be saved properly */
// err |= __put_user(env->tstate, &((*grp)[MC_TSTATE])); // __put_user(env->tstate, &((*grp)[MC_TSTATE]));
err |= __put_user(env->pc, &((*grp)[MC_PC])); __put_user(env->pc, &((*grp)[MC_PC]));
err |= __put_user(env->npc, &((*grp)[MC_NPC])); __put_user(env->npc, &((*grp)[MC_NPC]));
err |= __put_user(env->y, &((*grp)[MC_Y])); __put_user(env->y, &((*grp)[MC_Y]));
err |= __put_user(env->gregs[1], &((*grp)[MC_G1])); __put_user(env->gregs[1], &((*grp)[MC_G1]));
err |= __put_user(env->gregs[2], &((*grp)[MC_G2])); __put_user(env->gregs[2], &((*grp)[MC_G2]));
err |= __put_user(env->gregs[3], &((*grp)[MC_G3])); __put_user(env->gregs[3], &((*grp)[MC_G3]));
err |= __put_user(env->gregs[4], &((*grp)[MC_G4])); __put_user(env->gregs[4], &((*grp)[MC_G4]));
err |= __put_user(env->gregs[5], &((*grp)[MC_G5])); __put_user(env->gregs[5], &((*grp)[MC_G5]));
err |= __put_user(env->gregs[6], &((*grp)[MC_G6])); __put_user(env->gregs[6], &((*grp)[MC_G6]));
err |= __put_user(env->gregs[7], &((*grp)[MC_G7])); __put_user(env->gregs[7], &((*grp)[MC_G7]));
err |= __put_user(env->regwptr[UREG_I0], &((*grp)[MC_O0])); __put_user(env->regwptr[UREG_I0], &((*grp)[MC_O0]));
err |= __put_user(env->regwptr[UREG_I1], &((*grp)[MC_O1])); __put_user(env->regwptr[UREG_I1], &((*grp)[MC_O1]));
err |= __put_user(env->regwptr[UREG_I2], &((*grp)[MC_O2])); __put_user(env->regwptr[UREG_I2], &((*grp)[MC_O2]));
err |= __put_user(env->regwptr[UREG_I3], &((*grp)[MC_O3])); __put_user(env->regwptr[UREG_I3], &((*grp)[MC_O3]));
err |= __put_user(env->regwptr[UREG_I4], &((*grp)[MC_O4])); __put_user(env->regwptr[UREG_I4], &((*grp)[MC_O4]));
err |= __put_user(env->regwptr[UREG_I5], &((*grp)[MC_O5])); __put_user(env->regwptr[UREG_I5], &((*grp)[MC_O5]));
err |= __put_user(env->regwptr[UREG_I6], &((*grp)[MC_O6])); __put_user(env->regwptr[UREG_I6], &((*grp)[MC_O6]));
err |= __put_user(env->regwptr[UREG_I7], &((*grp)[MC_O7])); __put_user(env->regwptr[UREG_I7], &((*grp)[MC_O7]));
w_addr = TARGET_STACK_BIAS+env->regwptr[UREG_I6]; w_addr = TARGET_STACK_BIAS+env->regwptr[UREG_I6];
fp = i7 = 0; fp = i7 = 0;
...@@ -2762,22 +2758,22 @@ void sparc64_get_context(CPUSPARCState *env) ...@@ -2762,22 +2758,22 @@ void sparc64_get_context(CPUSPARCState *env)
if (get_user(i7, w_addr + offsetof(struct target_reg_window, ins[7]), if (get_user(i7, w_addr + offsetof(struct target_reg_window, ins[7]),
abi_ulong) != 0) abi_ulong) != 0)
goto do_sigsegv; goto do_sigsegv;
err |= __put_user(fp, &(mcp->mc_fp)); __put_user(fp, &(mcp->mc_fp));
err |= __put_user(i7, &(mcp->mc_i7)); __put_user(i7, &(mcp->mc_i7));
{ {
uint32_t *dst = ucp->tuc_mcontext.mc_fpregs.mcfpu_fregs.sregs; uint32_t *dst = ucp->tuc_mcontext.mc_fpregs.mcfpu_fregs.sregs;
for (i = 0; i < 64; i++, dst++) { for (i = 0; i < 64; i++, dst++) {
if (i & 1) { if (i & 1) {
err |= __put_user(env->fpr[i/2].l.lower, dst); __put_user(env->fpr[i/2].l.lower, dst);
} else { } else {
err |= __put_user(env->fpr[i/2].l.upper, dst); __put_user(env->fpr[i/2].l.upper, dst);
} }
} }
} }
err |= __put_user(env->fsr, &(mcp->mc_fpregs.mcfpu_fsr)); __put_user(env->fsr, &(mcp->mc_fpregs.mcfpu_fsr));
err |= __put_user(env->gsr, &(mcp->mc_fpregs.mcfpu_gsr)); __put_user(env->gsr, &(mcp->mc_fpregs.mcfpu_gsr));
err |= __put_user(env->fprs, &(mcp->mc_fpregs.mcfpu_fprs)); __put_user(env->fprs, &(mcp->mc_fpregs.mcfpu_fprs));
if (err) if (err)
goto do_sigsegv; goto do_sigsegv;
...@@ -2867,8 +2863,8 @@ static inline int install_sigtramp(unsigned int *tramp, unsigned int syscall) ...@@ -2867,8 +2863,8 @@ static inline int install_sigtramp(unsigned int *tramp, unsigned int syscall)
* syscall * syscall
*/ */
err |= __put_user(0x24020000 + syscall, tramp + 0); __put_user(0x24020000 + syscall, tramp + 0);
err |= __put_user(0x0000000c , tramp + 1); __put_user(0x0000000c , tramp + 1);
return err; return err;
} }
...@@ -2878,34 +2874,34 @@ setup_sigcontext(CPUMIPSState *regs, struct target_sigcontext *sc) ...@@ -2878,34 +2874,34 @@ setup_sigcontext(CPUMIPSState *regs, struct target_sigcontext *sc)
int err = 0; int err = 0;
int i; int i;
err |= __put_user(exception_resume_pc(regs), &sc->sc_pc); __put_user(exception_resume_pc(regs), &sc->sc_pc);
regs->hflags &= ~MIPS_HFLAG_BMASK; regs->hflags &= ~MIPS_HFLAG_BMASK;
__put_user(0, &sc->sc_regs[0]); __put_user(0, &sc->sc_regs[0]);
for (i = 1; i < 32; ++i) { for (i = 1; i < 32; ++i) {
err |= __put_user(regs->active_tc.gpr[i], &sc->sc_regs[i]); __put_user(regs->active_tc.gpr[i], &sc->sc_regs[i]);
} }
err |= __put_user(regs->active_tc.HI[0], &sc->sc_mdhi); __put_user(regs->active_tc.HI[0], &sc->sc_mdhi);
err |= __put_user(regs->active_tc.LO[0], &sc->sc_mdlo); __put_user(regs->active_tc.LO[0], &sc->sc_mdlo);
/* Rather than checking for dsp existence, always copy. The storage /* Rather than checking for dsp existence, always copy. The storage
would just be garbage otherwise. */ would just be garbage otherwise. */
err |= __put_user(regs->active_tc.HI[1], &sc->sc_hi1); __put_user(regs->active_tc.HI[1], &sc->sc_hi1);
err |= __put_user(regs->active_tc.HI[2], &sc->sc_hi2); __put_user(regs->active_tc.HI[2], &sc->sc_hi2);
err |= __put_user(regs->active_tc.HI[3], &sc->sc_hi3); __put_user(regs->active_tc.HI[3], &sc->sc_hi3);
err |= __put_user(regs->active_tc.LO[1], &sc->sc_lo1); __put_user(regs->active_tc.LO[1], &sc->sc_lo1);
err |= __put_user(regs->active_tc.LO[2], &sc->sc_lo2); __put_user(regs->active_tc.LO[2], &sc->sc_lo2);
err |= __put_user(regs->active_tc.LO[3], &sc->sc_lo3); __put_user(regs->active_tc.LO[3], &sc->sc_lo3);
{ {
uint32_t dsp = cpu_rddsp(0x3ff, regs); uint32_t dsp = cpu_rddsp(0x3ff, regs);
err |= __put_user(dsp, &sc->sc_dsp); __put_user(dsp, &sc->sc_dsp);
} }
err |= __put_user(1, &sc->sc_used_math); __put_user(1, &sc->sc_used_math);
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {
err |= __put_user(regs->active_fpu.fpr[i].d, &sc->sc_fpregs[i]); __put_user(regs->active_fpu.fpr[i].d, &sc->sc_fpregs[i]);
} }
return err; return err;
...@@ -2917,29 +2913,29 @@ restore_sigcontext(CPUMIPSState *regs, struct target_sigcontext *sc) ...@@ -2917,29 +2913,29 @@ restore_sigcontext(CPUMIPSState *regs, struct target_sigcontext *sc)
int err = 0; int err = 0;
int i; int i;
err |= __get_user(regs->CP0_EPC, &sc->sc_pc); __get_user(regs->CP0_EPC, &sc->sc_pc);
err |= __get_user(regs->active_tc.HI[0], &sc->sc_mdhi); __get_user(regs->active_tc.HI[0], &sc->sc_mdhi);
err |= __get_user(regs->active_tc.LO[0], &sc->sc_mdlo); __get_user(regs->active_tc.LO[0], &sc->sc_mdlo);
for (i = 1; i < 32; ++i) { for (i = 1; i < 32; ++i) {
err |= __get_user(regs->active_tc.gpr[i], &sc->sc_regs[i]); __get_user(regs->active_tc.gpr[i], &sc->sc_regs[i]);
} }
err |= __get_user(regs->active_tc.HI[1], &sc->sc_hi1); __get_user(regs->active_tc.HI[1], &sc->sc_hi1);
err |= __get_user(regs->active_tc.HI[2], &sc->sc_hi2); __get_user(regs->active_tc.HI[2], &sc->sc_hi2);
err |= __get_user(regs->active_tc.HI[3], &sc->sc_hi3); __get_user(regs->active_tc.HI[3], &sc->sc_hi3);
err |= __get_user(regs->active_tc.LO[1], &sc->sc_lo1); __get_user(regs->active_tc.LO[1], &sc->sc_lo1);
err |= __get_user(regs->active_tc.LO[2], &sc->sc_lo2); __get_user(regs->active_tc.LO[2], &sc->sc_lo2);
err |= __get_user(regs->active_tc.LO[3], &sc->sc_lo3); __get_user(regs->active_tc.LO[3], &sc->sc_lo3);
{ {
uint32_t dsp; uint32_t dsp;
err |= __get_user(dsp, &sc->sc_dsp); __get_user(dsp, &sc->sc_dsp);
cpu_wrdsp(dsp, 0x3ff, regs); cpu_wrdsp(dsp, 0x3ff, regs);
} }
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {
err |= __get_user(regs->active_fpu.fpr[i].d, &sc->sc_fpregs[i]); __get_user(regs->active_fpu.fpr[i].d, &sc->sc_fpregs[i]);
} }
return err; return err;
...@@ -3249,7 +3245,7 @@ static int setup_sigcontext(struct target_sigcontext *sc, ...@@ -3249,7 +3245,7 @@ static int setup_sigcontext(struct target_sigcontext *sc,
int err = 0; int err = 0;
int i; int i;
#define COPY(x) err |= __put_user(regs->x, &sc->sc_##x) #define COPY(x) __put_user(regs->x, &sc->sc_##x)
COPY(gregs[0]); COPY(gregs[1]); COPY(gregs[0]); COPY(gregs[1]);
COPY(gregs[2]); COPY(gregs[3]); COPY(gregs[2]); COPY(gregs[3]);
COPY(gregs[4]); COPY(gregs[5]); COPY(gregs[4]); COPY(gregs[5]);
...@@ -3264,13 +3260,13 @@ static int setup_sigcontext(struct target_sigcontext *sc, ...@@ -3264,13 +3260,13 @@ static int setup_sigcontext(struct target_sigcontext *sc,
#undef COPY #undef COPY
for (i=0; i<16; i++) { for (i=0; i<16; i++) {
err |= __put_user(regs->fregs[i], &sc->sc_fpregs[i]); __put_user(regs->fregs[i], &sc->sc_fpregs[i]);
} }
err |= __put_user(regs->fpscr, &sc->sc_fpscr); __put_user(regs->fpscr, &sc->sc_fpscr);
err |= __put_user(regs->fpul, &sc->sc_fpul); __put_user(regs->fpul, &sc->sc_fpul);
/* non-iBCS2 extensions.. */ /* non-iBCS2 extensions.. */
err |= __put_user(mask, &sc->oldmask); __put_user(mask, &sc->oldmask);
return err; return err;
} }
...@@ -3281,7 +3277,7 @@ static int restore_sigcontext(CPUSH4State *regs, struct target_sigcontext *sc, ...@@ -3281,7 +3277,7 @@ static int restore_sigcontext(CPUSH4State *regs, struct target_sigcontext *sc,
unsigned int err = 0; unsigned int err = 0;
int i; int i;
#define COPY(x) err |= __get_user(regs->x, &sc->sc_##x) #define COPY(x) __get_user(regs->x, &sc->sc_##x)
COPY(gregs[1]); COPY(gregs[1]);
COPY(gregs[2]); COPY(gregs[3]); COPY(gregs[2]); COPY(gregs[3]);
COPY(gregs[4]); COPY(gregs[5]); COPY(gregs[4]); COPY(gregs[5]);
...@@ -3296,13 +3292,13 @@ static int restore_sigcontext(CPUSH4State *regs, struct target_sigcontext *sc, ...@@ -3296,13 +3292,13 @@ static int restore_sigcontext(CPUSH4State *regs, struct target_sigcontext *sc,
#undef COPY #undef COPY
for (i=0; i<16; i++) { for (i=0; i<16; i++) {
err |= __get_user(regs->fregs[i], &sc->sc_fpregs[i]); __get_user(regs->fregs[i], &sc->sc_fpregs[i]);
} }
err |= __get_user(regs->fpscr, &sc->sc_fpscr); __get_user(regs->fpscr, &sc->sc_fpscr);
err |= __get_user(regs->fpul, &sc->sc_fpul); __get_user(regs->fpul, &sc->sc_fpul);
regs->tra = -1; /* disable syscall checks */ regs->tra = -1; /* disable syscall checks */
err |= __get_user(*r0_p, &sc->sc_gregs[0]); __get_user(*r0_p, &sc->sc_gregs[0]);
return err; return err;
} }
...@@ -3324,7 +3320,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -3324,7 +3320,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
err |= setup_sigcontext(&frame->sc, regs, set->sig[0]); err |= setup_sigcontext(&frame->sc, regs, set->sig[0]);
for (i = 0; i < TARGET_NSIG_WORDS - 1; i++) { for (i = 0; i < TARGET_NSIG_WORDS - 1; i++) {
err |= __put_user(set->sig[i + 1], &frame->extramask[i]); __put_user(set->sig[i + 1], &frame->extramask[i]);
} }
/* Set up to return from userspace. If provided, use a stub /* Set up to return from userspace. If provided, use a stub
...@@ -3333,9 +3329,9 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -3333,9 +3329,9 @@ static void setup_frame(int sig, struct target_sigaction *ka,
regs->pr = (unsigned long) ka->sa_restorer; regs->pr = (unsigned long) ka->sa_restorer;
} else { } else {
/* Generate return code (system call to sigreturn) */ /* Generate return code (system call to sigreturn) */
err |= __put_user(MOVW(2), &frame->retcode[0]); __put_user(MOVW(2), &frame->retcode[0]);
err |= __put_user(TRAP_NOARG, &frame->retcode[1]); __put_user(TRAP_NOARG, &frame->retcode[1]);
err |= __put_user((TARGET_NR_sigreturn), &frame->retcode[2]); __put_user((TARGET_NR_sigreturn), &frame->retcode[2]);
regs->pr = (unsigned long) frame->retcode; regs->pr = (unsigned long) frame->retcode;
} }
...@@ -3376,18 +3372,18 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -3376,18 +3372,18 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
err |= copy_siginfo_to_user(&frame->info, info); err |= copy_siginfo_to_user(&frame->info, info);
/* Create the ucontext. */ /* Create the ucontext. */
err |= __put_user(0, &frame->uc.tuc_flags); __put_user(0, &frame->uc.tuc_flags);
err |= __put_user(0, (unsigned long *)&frame->uc.tuc_link); __put_user(0, (unsigned long *)&frame->uc.tuc_link);
err |= __put_user((unsigned long)target_sigaltstack_used.ss_sp, __put_user((unsigned long)target_sigaltstack_used.ss_sp,
&frame->uc.tuc_stack.ss_sp); &frame->uc.tuc_stack.ss_sp);
err |= __put_user(sas_ss_flags(regs->gregs[15]), __put_user(sas_ss_flags(regs->gregs[15]),
&frame->uc.tuc_stack.ss_flags); &frame->uc.tuc_stack.ss_flags);
err |= __put_user(target_sigaltstack_used.ss_size, __put_user(target_sigaltstack_used.ss_size,
&frame->uc.tuc_stack.ss_size); &frame->uc.tuc_stack.ss_size);
err |= setup_sigcontext(&frame->uc.tuc_mcontext, setup_sigcontext(&frame->uc.tuc_mcontext,
regs, set->sig[0]); regs, set->sig[0]);
for(i = 0; i < TARGET_NSIG_WORDS; i++) { for(i = 0; i < TARGET_NSIG_WORDS; i++) {
err |= __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]); __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]);
} }
/* Set up to return from userspace. If provided, use a stub /* Set up to return from userspace. If provided, use a stub
...@@ -3396,9 +3392,9 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -3396,9 +3392,9 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
regs->pr = (unsigned long) ka->sa_restorer; regs->pr = (unsigned long) ka->sa_restorer;
} else { } else {
/* Generate return code (system call to sigreturn) */ /* Generate return code (system call to sigreturn) */
err |= __put_user(MOVW(2), &frame->retcode[0]); __put_user(MOVW(2), &frame->retcode[0]);
err |= __put_user(TRAP_NOARG, &frame->retcode[1]); __put_user(TRAP_NOARG, &frame->retcode[1]);
err |= __put_user((TARGET_NR_rt_sigreturn), &frame->retcode[2]); __put_user((TARGET_NR_rt_sigreturn), &frame->retcode[2]);
regs->pr = (unsigned long) frame->retcode; regs->pr = (unsigned long) frame->retcode;
} }
...@@ -3437,9 +3433,9 @@ long do_sigreturn(CPUSH4State *regs) ...@@ -3437,9 +3433,9 @@ long do_sigreturn(CPUSH4State *regs)
if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1))
goto badframe; goto badframe;
err |= __get_user(target_set.sig[0], &frame->sc.oldmask); __get_user(target_set.sig[0], &frame->sc.oldmask);
for(i = 1; i < TARGET_NSIG_WORDS; i++) { for(i = 1; i < TARGET_NSIG_WORDS; i++) {
err |= (__get_user(target_set.sig[i], &frame->extramask[i - 1])); __get_user(target_set.sig[i], &frame->extramask[i - 1]);
} }
if (err) if (err)
...@@ -3625,7 +3621,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -3625,7 +3621,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
goto badframe; goto badframe;
/* Save the mask. */ /* Save the mask. */
err |= __put_user(set->sig[0], &frame->uc.tuc_mcontext.oldmask); __put_user(set->sig[0], &frame->uc.tuc_mcontext.oldmask);
if (err) if (err)
goto badframe; goto badframe;
...@@ -3646,10 +3642,10 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -3646,10 +3642,10 @@ static void setup_frame(int sig, struct target_sigaction *ka,
/* Note, these encodings are _big endian_! */ /* Note, these encodings are _big endian_! */
/* addi r12, r0, __NR_sigreturn */ /* addi r12, r0, __NR_sigreturn */
t = 0x31800000UL | TARGET_NR_sigreturn; t = 0x31800000UL | TARGET_NR_sigreturn;
err |= __put_user(t, frame->tramp + 0); __put_user(t, frame->tramp + 0);
/* brki r14, 0x8 */ /* brki r14, 0x8 */
t = 0xb9cc0008UL; t = 0xb9cc0008UL;
err |= __put_user(t, frame->tramp + 1); __put_user(t, frame->tramp + 1);
/* Return from sighandler will jump to the tramp. /* Return from sighandler will jump to the tramp.
Negative 8 offset because return is rtsd r15, 8 */ Negative 8 offset because return is rtsd r15, 8 */
...@@ -3821,13 +3817,13 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -3821,13 +3817,13 @@ static void setup_frame(int sig, struct target_sigaction *ka,
* *
* This is movu.w __NR_sigreturn, r9; break 13; * This is movu.w __NR_sigreturn, r9; break 13;
*/ */
err |= __put_user(0x9c5f, frame->retcode+0); __put_user(0x9c5f, frame->retcode+0);
err |= __put_user(TARGET_NR_sigreturn, __put_user(TARGET_NR_sigreturn,
frame->retcode + 1); frame->retcode + 1);
err |= __put_user(0xe93d, frame->retcode + 2); __put_user(0xe93d, frame->retcode + 2);
/* Save the mask. */ /* Save the mask. */
err |= __put_user(set->sig[0], &frame->sc.oldmask); __put_user(set->sig[0], &frame->sc.oldmask);
if (err) if (err)
goto badframe; goto badframe;
...@@ -3950,7 +3946,7 @@ static int restore_sigcontext(CPUOpenRISCState *regs, ...@@ -3950,7 +3946,7 @@ static int restore_sigcontext(CPUOpenRISCState *regs,
* stuff after pushing it) * stuff after pushing it)
*/ */
err |= __get_user(old_usp, &sc->usp); __get_user(old_usp, &sc->usp);
phx_signal("old_usp 0x%lx", old_usp); phx_signal("old_usp 0x%lx", old_usp);
__PHX__ REALLY /* ??? */ __PHX__ REALLY /* ??? */
...@@ -3980,7 +3976,7 @@ static int setup_sigcontext(struct target_sigcontext *sc, ...@@ -3980,7 +3976,7 @@ static int setup_sigcontext(struct target_sigcontext *sc,
/* copy the regs. they are first in sc so we can use sc directly */ /* copy the regs. they are first in sc so we can use sc directly */
/*err |= copy_to_user(&sc, regs, sizeof(struct target_pt_regs));*/ /*copy_to_user(&sc, regs, sizeof(struct target_pt_regs));*/
/* Set the frametype to CRIS_FRAME_NORMAL for the execution of /* Set the frametype to CRIS_FRAME_NORMAL for the execution of
the signal handler. The frametype will be restored to its previous the signal handler. The frametype will be restored to its previous
...@@ -3988,8 +3984,8 @@ static int setup_sigcontext(struct target_sigcontext *sc, ...@@ -3988,8 +3984,8 @@ static int setup_sigcontext(struct target_sigcontext *sc,
/*regs->frametype = CRIS_FRAME_NORMAL;*/ /*regs->frametype = CRIS_FRAME_NORMAL;*/
/* then some other stuff */ /* then some other stuff */
err |= __put_user(mask, &sc->oldmask); __put_user(mask, &sc->oldmask);
err |= __put_user(usp, &sc->usp); return err; __put_user(usp, &sc->usp); return err;
} }
static inline unsigned long align_sigframe(unsigned long sp) static inline unsigned long align_sigframe(unsigned long sp)
...@@ -4048,9 +4044,9 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -4048,9 +4044,9 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
} }
info_addr = frame_addr + offsetof(struct target_rt_sigframe, info); info_addr = frame_addr + offsetof(struct target_rt_sigframe, info);
err |= __put_user(info_addr, &frame->pinfo); __put_user(info_addr, &frame->pinfo);
uc_addr = frame_addr + offsetof(struct target_rt_sigframe, uc); uc_addr = frame_addr + offsetof(struct target_rt_sigframe, uc);
err |= __put_user(uc_addr, &frame->puc); __put_user(uc_addr, &frame->puc);
if (ka->sa_flags & SA_SIGINFO) { if (ka->sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, info); err |= copy_siginfo_to_user(&frame->info, info);
...@@ -4060,12 +4056,12 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -4060,12 +4056,12 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
} }
/*err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));*/ /*err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));*/
err |= __put_user(0, &frame->uc.tuc_flags); __put_user(0, &frame->uc.tuc_flags);
err |= __put_user(0, &frame->uc.tuc_link); __put_user(0, &frame->uc.tuc_link);
err |= __put_user(target_sigaltstack_used.ss_sp, __put_user(target_sigaltstack_used.ss_sp,
&frame->uc.tuc_stack.ss_sp); &frame->uc.tuc_stack.ss_sp);
err |= __put_user(sas_ss_flags(env->gpr[1]), &frame->uc.tuc_stack.ss_flags); __put_user(sas_ss_flags(env->gpr[1]), &frame->uc.tuc_stack.ss_flags);
err |= __put_user(target_sigaltstack_used.ss_size, __put_user(target_sigaltstack_used.ss_size,
&frame->uc.tuc_stack.ss_size); &frame->uc.tuc_stack.ss_size);
err |= setup_sigcontext(&frame->sc, env, set->sig[0]); err |= setup_sigcontext(&frame->sc, env, set->sig[0]);
...@@ -4078,10 +4074,10 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -4078,10 +4074,10 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
/* trampoline - the desired return ip is the retcode itself */ /* trampoline - the desired return ip is the retcode itself */
return_ip = (unsigned long)&frame->retcode; return_ip = (unsigned long)&frame->retcode;
/* This is l.ori r11,r0,__NR_sigreturn, l.sys 1 */ /* This is l.ori r11,r0,__NR_sigreturn, l.sys 1 */
err |= __put_user(0xa960, (short *)(frame->retcode + 0)); __put_user(0xa960, (short *)(frame->retcode + 0));
err |= __put_user(TARGET_NR_rt_sigreturn, (short *)(frame->retcode + 2)); __put_user(TARGET_NR_rt_sigreturn, (short *)(frame->retcode + 2));
err |= __put_user(0x20000001, (unsigned long *)(frame->retcode + 4)); __put_user(0x20000001, (unsigned long *)(frame->retcode + 4));
err |= __put_user(0x15000000, (unsigned long *)(frame->retcode + 8)); __put_user(0x15000000, (unsigned long *)(frame->retcode + 8));
if (err) { if (err) {
goto give_sigsegv; goto give_sigsegv;
...@@ -4372,21 +4368,21 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc) ...@@ -4372,21 +4368,21 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc)
int i; int i;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
err |= __get_user(env->regs[i], &sc->regs.gprs[i]); __get_user(env->regs[i], &sc->regs.gprs[i]);
} }
err |= __get_user(env->psw.mask, &sc->regs.psw.mask); __get_user(env->psw.mask, &sc->regs.psw.mask);
qemu_log("%s: sc->regs.psw.addr 0x%llx env->psw.addr 0x%llx\n", qemu_log("%s: sc->regs.psw.addr 0x%llx env->psw.addr 0x%llx\n",
__FUNCTION__, (unsigned long long)sc->regs.psw.addr, __FUNCTION__, (unsigned long long)sc->regs.psw.addr,
(unsigned long long)env->psw.addr); (unsigned long long)env->psw.addr);
err |= __get_user(env->psw.addr, &sc->regs.psw.addr); __get_user(env->psw.addr, &sc->regs.psw.addr);
/* FIXME: 31-bit -> | PSW_ADDR_AMODE */ /* FIXME: 31-bit -> | PSW_ADDR_AMODE */
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
err |= __get_user(env->aregs[i], &sc->regs.acrs[i]); __get_user(env->aregs[i], &sc->regs.acrs[i]);
} }
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
err |= __get_user(env->fregs[i].ll, &sc->fpregs.fprs[i]); __get_user(env->fregs[i].ll, &sc->fpregs.fprs[i]);
} }
return err; return err;
...@@ -4832,15 +4828,15 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -4832,15 +4828,15 @@ static void setup_frame(int sig, struct target_sigaction *ka,
signal = current_exec_domain_sig(sig); signal = current_exec_domain_sig(sig);
err |= __put_user(ka->_sa_handler, &sc->handler); __put_user(ka->_sa_handler, &sc->handler);
err |= __put_user(set->sig[0], &sc->oldmask); __put_user(set->sig[0], &sc->oldmask);
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
err |= __put_user(set->sig[0] >> 32, &sc->_unused[3]); __put_user(set->sig[0] >> 32, &sc->_unused[3]);
#else #else
err |= __put_user(set->sig[1], &sc->_unused[3]); __put_user(set->sig[1], &sc->_unused[3]);
#endif #endif
err |= __put_user(h2g(&frame->mctx), &sc->regs); __put_user(h2g(&frame->mctx), &sc->regs);
err |= __put_user(sig, &sc->signal); __put_user(sig, &sc->signal);
/* Save user regs. */ /* Save user regs. */
err |= save_user_regs(env, &frame->mctx, TARGET_NR_sigreturn); err |= save_user_regs(env, &frame->mctx, TARGET_NR_sigreturn);
...@@ -4894,18 +4890,18 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -4894,18 +4890,18 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
err |= copy_siginfo_to_user(&rt_sf->info, info); err |= copy_siginfo_to_user(&rt_sf->info, info);
err |= __put_user(0, &rt_sf->uc.tuc_flags); __put_user(0, &rt_sf->uc.tuc_flags);
err |= __put_user(0, &rt_sf->uc.tuc_link); __put_user(0, &rt_sf->uc.tuc_link);
err |= __put_user((target_ulong)target_sigaltstack_used.ss_sp, __put_user((target_ulong)target_sigaltstack_used.ss_sp,
&rt_sf->uc.tuc_stack.ss_sp); &rt_sf->uc.tuc_stack.ss_sp);
err |= __put_user(sas_ss_flags(env->gpr[1]), __put_user(sas_ss_flags(env->gpr[1]),
&rt_sf->uc.tuc_stack.ss_flags); &rt_sf->uc.tuc_stack.ss_flags);
err |= __put_user(target_sigaltstack_used.ss_size, __put_user(target_sigaltstack_used.ss_size,
&rt_sf->uc.tuc_stack.ss_size); &rt_sf->uc.tuc_stack.ss_size);
err |= __put_user(h2g (&rt_sf->uc.tuc_mcontext), __put_user(h2g (&rt_sf->uc.tuc_mcontext),
&rt_sf->uc.tuc_regs); &rt_sf->uc.tuc_regs);
for(i = 0; i < TARGET_NSIG_WORDS; i++) { for(i = 0; i < TARGET_NSIG_WORDS; i++) {
err |= __put_user(set->sig[i], &rt_sf->uc.tuc_sigmask.sig[i]); __put_user(set->sig[i], &rt_sf->uc.tuc_sigmask.sig[i]);
} }
frame = &rt_sf->uc.tuc_mcontext; frame = &rt_sf->uc.tuc_mcontext;
...@@ -4920,7 +4916,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -4920,7 +4916,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Create a stack frame for the caller of the handler. */ /* Create a stack frame for the caller of the handler. */
newsp = rt_sf_addr - (SIGNAL_FRAMESIZE + 16); newsp = rt_sf_addr - (SIGNAL_FRAMESIZE + 16);
err |= __put_user(env->gpr[1], (target_ulong *)(uintptr_t) newsp); __put_user(env->gpr[1], (target_ulong *)(uintptr_t) newsp);
if (err) if (err)
goto sigsegv; goto sigsegv;
...@@ -5115,14 +5111,14 @@ setup_sigcontext(struct target_sigcontext *sc, CPUM68KState *env, ...@@ -5115,14 +5111,14 @@ setup_sigcontext(struct target_sigcontext *sc, CPUM68KState *env,
{ {
int err = 0; int err = 0;
err |= __put_user(mask, &sc->sc_mask); __put_user(mask, &sc->sc_mask);
err |= __put_user(env->aregs[7], &sc->sc_usp); __put_user(env->aregs[7], &sc->sc_usp);
err |= __put_user(env->dregs[0], &sc->sc_d0); __put_user(env->dregs[0], &sc->sc_d0);
err |= __put_user(env->dregs[1], &sc->sc_d1); __put_user(env->dregs[1], &sc->sc_d1);
err |= __put_user(env->aregs[0], &sc->sc_a0); __put_user(env->aregs[0], &sc->sc_a0);
err |= __put_user(env->aregs[1], &sc->sc_a1); __put_user(env->aregs[1], &sc->sc_a1);
err |= __put_user(env->sr, &sc->sc_sr); __put_user(env->sr, &sc->sc_sr);
err |= __put_user(env->pc, &sc->sc_pc); __put_user(env->pc, &sc->sc_pc);
return err; return err;
} }
...@@ -5133,12 +5129,12 @@ restore_sigcontext(CPUM68KState *env, struct target_sigcontext *sc, int *pd0) ...@@ -5133,12 +5129,12 @@ restore_sigcontext(CPUM68KState *env, struct target_sigcontext *sc, int *pd0)
int err = 0; int err = 0;
int temp; int temp;
err |= __get_user(env->aregs[7], &sc->sc_usp); __get_user(env->aregs[7], &sc->sc_usp);
err |= __get_user(env->dregs[1], &sc->sc_d1); __get_user(env->dregs[1], &sc->sc_d1);
err |= __get_user(env->aregs[0], &sc->sc_a0); __get_user(env->aregs[0], &sc->sc_a0);
err |= __get_user(env->aregs[1], &sc->sc_a1); __get_user(env->aregs[1], &sc->sc_a1);
err |= __get_user(env->pc, &sc->sc_pc); __get_user(env->pc, &sc->sc_pc);
err |= __get_user(temp, &sc->sc_sr); __get_user(temp, &sc->sc_sr);
env->sr = (env->sr & 0xff00) | (temp & 0xff); env->sr = (env->sr & 0xff00) | (temp & 0xff);
*pd0 = tswapl(sc->sc_d0); *pd0 = tswapl(sc->sc_d0);
...@@ -5179,10 +5175,10 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -5179,10 +5175,10 @@ static void setup_frame(int sig, struct target_sigaction *ka,
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0))
goto give_sigsegv; goto give_sigsegv;
err |= __put_user(sig, &frame->sig); __put_user(sig, &frame->sig);
sc_addr = frame_addr + offsetof(struct target_sigframe, sc); sc_addr = frame_addr + offsetof(struct target_sigframe, sc);
err |= __put_user(sc_addr, &frame->psc); __put_user(sc_addr, &frame->psc);
err |= setup_sigcontext(&frame->sc, env, set->sig[0]); err |= setup_sigcontext(&frame->sc, env, set->sig[0]);
if (err) if (err)
...@@ -5196,11 +5192,11 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -5196,11 +5192,11 @@ static void setup_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. */ /* Set up to return from userspace. */
retcode_addr = frame_addr + offsetof(struct target_sigframe, retcode); retcode_addr = frame_addr + offsetof(struct target_sigframe, retcode);
err |= __put_user(retcode_addr, &frame->pretcode); __put_user(retcode_addr, &frame->pretcode);
/* moveq #,d0; trap #0 */ /* moveq #,d0; trap #0 */
err |= __put_user(0x70004e40 + (TARGET_NR_sigreturn << 16), __put_user(0x70004e40 + (TARGET_NR_sigreturn << 16),
(long *)(frame->retcode)); (long *)(frame->retcode));
if (err) if (err)
...@@ -5223,29 +5219,28 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc, ...@@ -5223,29 +5219,28 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc,
CPUM68KState *env) CPUM68KState *env)
{ {
target_greg_t *gregs = uc->tuc_mcontext.gregs; target_greg_t *gregs = uc->tuc_mcontext.gregs;
int err;
err = __put_user(TARGET_MCONTEXT_VERSION, &uc->tuc_mcontext.version); __put_user(TARGET_MCONTEXT_VERSION, &uc->tuc_mcontext.version);
err |= __put_user(env->dregs[0], &gregs[0]); __put_user(env->dregs[0], &gregs[0]);
err |= __put_user(env->dregs[1], &gregs[1]); __put_user(env->dregs[1], &gregs[1]);
err |= __put_user(env->dregs[2], &gregs[2]); __put_user(env->dregs[2], &gregs[2]);
err |= __put_user(env->dregs[3], &gregs[3]); __put_user(env->dregs[3], &gregs[3]);
err |= __put_user(env->dregs[4], &gregs[4]); __put_user(env->dregs[4], &gregs[4]);
err |= __put_user(env->dregs[5], &gregs[5]); __put_user(env->dregs[5], &gregs[5]);
err |= __put_user(env->dregs[6], &gregs[6]); __put_user(env->dregs[6], &gregs[6]);
err |= __put_user(env->dregs[7], &gregs[7]); __put_user(env->dregs[7], &gregs[7]);
err |= __put_user(env->aregs[0], &gregs[8]); __put_user(env->aregs[0], &gregs[8]);
err |= __put_user(env->aregs[1], &gregs[9]); __put_user(env->aregs[1], &gregs[9]);
err |= __put_user(env->aregs[2], &gregs[10]); __put_user(env->aregs[2], &gregs[10]);
err |= __put_user(env->aregs[3], &gregs[11]); __put_user(env->aregs[3], &gregs[11]);
err |= __put_user(env->aregs[4], &gregs[12]); __put_user(env->aregs[4], &gregs[12]);
err |= __put_user(env->aregs[5], &gregs[13]); __put_user(env->aregs[5], &gregs[13]);
err |= __put_user(env->aregs[6], &gregs[14]); __put_user(env->aregs[6], &gregs[14]);
err |= __put_user(env->aregs[7], &gregs[15]); __put_user(env->aregs[7], &gregs[15]);
err |= __put_user(env->pc, &gregs[16]); __put_user(env->pc, &gregs[16]);
err |= __put_user(env->sr, &gregs[17]); __put_user(env->sr, &gregs[17]);
return err; return 0;
} }
static inline int target_rt_restore_ucontext(CPUM68KState *env, static inline int target_rt_restore_ucontext(CPUM68KState *env,
...@@ -5253,36 +5248,35 @@ static inline int target_rt_restore_ucontext(CPUM68KState *env, ...@@ -5253,36 +5248,35 @@ static inline int target_rt_restore_ucontext(CPUM68KState *env,
int *pd0) int *pd0)
{ {
int temp; int temp;
int err;
target_greg_t *gregs = uc->tuc_mcontext.gregs; target_greg_t *gregs = uc->tuc_mcontext.gregs;
err = __get_user(temp, &uc->tuc_mcontext.version); __get_user(temp, &uc->tuc_mcontext.version);
if (temp != TARGET_MCONTEXT_VERSION) if (temp != TARGET_MCONTEXT_VERSION)
goto badframe; goto badframe;
/* restore passed registers */ /* restore passed registers */
err |= __get_user(env->dregs[0], &gregs[0]); __get_user(env->dregs[0], &gregs[0]);
err |= __get_user(env->dregs[1], &gregs[1]); __get_user(env->dregs[1], &gregs[1]);
err |= __get_user(env->dregs[2], &gregs[2]); __get_user(env->dregs[2], &gregs[2]);
err |= __get_user(env->dregs[3], &gregs[3]); __get_user(env->dregs[3], &gregs[3]);
err |= __get_user(env->dregs[4], &gregs[4]); __get_user(env->dregs[4], &gregs[4]);
err |= __get_user(env->dregs[5], &gregs[5]); __get_user(env->dregs[5], &gregs[5]);
err |= __get_user(env->dregs[6], &gregs[6]); __get_user(env->dregs[6], &gregs[6]);
err |= __get_user(env->dregs[7], &gregs[7]); __get_user(env->dregs[7], &gregs[7]);
err |= __get_user(env->aregs[0], &gregs[8]); __get_user(env->aregs[0], &gregs[8]);
err |= __get_user(env->aregs[1], &gregs[9]); __get_user(env->aregs[1], &gregs[9]);
err |= __get_user(env->aregs[2], &gregs[10]); __get_user(env->aregs[2], &gregs[10]);
err |= __get_user(env->aregs[3], &gregs[11]); __get_user(env->aregs[3], &gregs[11]);
err |= __get_user(env->aregs[4], &gregs[12]); __get_user(env->aregs[4], &gregs[12]);
err |= __get_user(env->aregs[5], &gregs[13]); __get_user(env->aregs[5], &gregs[13]);
err |= __get_user(env->aregs[6], &gregs[14]); __get_user(env->aregs[6], &gregs[14]);
err |= __get_user(env->aregs[7], &gregs[15]); __get_user(env->aregs[7], &gregs[15]);
err |= __get_user(env->pc, &gregs[16]); __get_user(env->pc, &gregs[16]);
err |= __get_user(temp, &gregs[17]); __get_user(temp, &gregs[17]);
env->sr = (env->sr & 0xff00) | (temp & 0xff); env->sr = (env->sr & 0xff00) | (temp & 0xff);
*pd0 = env->dregs[0]; *pd0 = env->dregs[0];
return err; return 0;
badframe: badframe:
return 1; return 1;
...@@ -5304,25 +5298,25 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -5304,25 +5298,25 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0))
goto give_sigsegv; goto give_sigsegv;
err |= __put_user(sig, &frame->sig); __put_user(sig, &frame->sig);
info_addr = frame_addr + offsetof(struct target_rt_sigframe, info); info_addr = frame_addr + offsetof(struct target_rt_sigframe, info);
err |= __put_user(info_addr, &frame->pinfo); __put_user(info_addr, &frame->pinfo);
uc_addr = frame_addr + offsetof(struct target_rt_sigframe, uc); uc_addr = frame_addr + offsetof(struct target_rt_sigframe, uc);
err |= __put_user(uc_addr, &frame->puc); __put_user(uc_addr, &frame->puc);
err |= copy_siginfo_to_user(&frame->info, info); err |= copy_siginfo_to_user(&frame->info, info);
/* Create the ucontext */ /* Create the ucontext */
err |= __put_user(0, &frame->uc.tuc_flags); __put_user(0, &frame->uc.tuc_flags);
err |= __put_user(0, &frame->uc.tuc_link); __put_user(0, &frame->uc.tuc_link);
err |= __put_user(target_sigaltstack_used.ss_sp, __put_user(target_sigaltstack_used.ss_sp,
&frame->uc.tuc_stack.ss_sp); &frame->uc.tuc_stack.ss_sp);
err |= __put_user(sas_ss_flags(env->aregs[7]), __put_user(sas_ss_flags(env->aregs[7]),
&frame->uc.tuc_stack.ss_flags); &frame->uc.tuc_stack.ss_flags);
err |= __put_user(target_sigaltstack_used.ss_size, __put_user(target_sigaltstack_used.ss_size,
&frame->uc.tuc_stack.ss_size); &frame->uc.tuc_stack.ss_size);
err |= target_rt_setup_ucontext(&frame->uc, env); err |= target_rt_setup_ucontext(&frame->uc, env);
...@@ -5337,13 +5331,13 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -5337,13 +5331,13 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. */ /* Set up to return from userspace. */
retcode_addr = frame_addr + offsetof(struct target_sigframe, retcode); retcode_addr = frame_addr + offsetof(struct target_sigframe, retcode);
err |= __put_user(retcode_addr, &frame->pretcode); __put_user(retcode_addr, &frame->pretcode);
/* moveq #,d0; notb d0; trap #0 */ /* moveq #,d0; notb d0; trap #0 */
err |= __put_user(0x70004600 + ((TARGET_NR_rt_sigreturn ^ 0xff) << 16), __put_user(0x70004600 + ((TARGET_NR_rt_sigreturn ^ 0xff) << 16),
(long *)(frame->retcode + 0)); (long *)(frame->retcode + 0));
err |= __put_user(0x4e40, (short *)(frame->retcode + 4)); __put_user(0x4e40, (short *)(frame->retcode + 4));
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
...@@ -5485,25 +5479,25 @@ static int setup_sigcontext(struct target_sigcontext *sc, CPUAlphaState *env, ...@@ -5485,25 +5479,25 @@ static int setup_sigcontext(struct target_sigcontext *sc, CPUAlphaState *env,
{ {
int i, err = 0; int i, err = 0;
err |= __put_user(on_sig_stack(frame_addr), &sc->sc_onstack); __put_user(on_sig_stack(frame_addr), &sc->sc_onstack);
err |= __put_user(set->sig[0], &sc->sc_mask); __put_user(set->sig[0], &sc->sc_mask);
err |= __put_user(env->pc, &sc->sc_pc); __put_user(env->pc, &sc->sc_pc);
err |= __put_user(8, &sc->sc_ps); __put_user(8, &sc->sc_ps);
for (i = 0; i < 31; ++i) { for (i = 0; i < 31; ++i) {
err |= __put_user(env->ir[i], &sc->sc_regs[i]); __put_user(env->ir[i], &sc->sc_regs[i]);
} }
err |= __put_user(0, &sc->sc_regs[31]); __put_user(0, &sc->sc_regs[31]);
for (i = 0; i < 31; ++i) { for (i = 0; i < 31; ++i) {
err |= __put_user(env->fir[i], &sc->sc_fpregs[i]); __put_user(env->fir[i], &sc->sc_fpregs[i]);
} }
err |= __put_user(0, &sc->sc_fpregs[31]); __put_user(0, &sc->sc_fpregs[31]);
err |= __put_user(cpu_alpha_load_fpcr(env), &sc->sc_fpcr); __put_user(cpu_alpha_load_fpcr(env), &sc->sc_fpcr);
err |= __put_user(0, &sc->sc_traparg_a0); /* FIXME */ __put_user(0, &sc->sc_traparg_a0); /* FIXME */
err |= __put_user(0, &sc->sc_traparg_a1); /* FIXME */ __put_user(0, &sc->sc_traparg_a1); /* FIXME */
err |= __put_user(0, &sc->sc_traparg_a2); /* FIXME */ __put_user(0, &sc->sc_traparg_a2); /* FIXME */
return err; return err;
} }
...@@ -5514,16 +5508,16 @@ static int restore_sigcontext(CPUAlphaState *env, ...@@ -5514,16 +5508,16 @@ static int restore_sigcontext(CPUAlphaState *env,
uint64_t fpcr; uint64_t fpcr;
int i, err = 0; int i, err = 0;
err |= __get_user(env->pc, &sc->sc_pc); __get_user(env->pc, &sc->sc_pc);
for (i = 0; i < 31; ++i) { for (i = 0; i < 31; ++i) {
err |= __get_user(env->ir[i], &sc->sc_regs[i]); __get_user(env->ir[i], &sc->sc_regs[i]);
} }
for (i = 0; i < 31; ++i) { for (i = 0; i < 31; ++i) {
err |= __get_user(env->fir[i], &sc->sc_fpregs[i]); __get_user(env->fir[i], &sc->sc_fpregs[i]);
} }
err |= __get_user(fpcr, &sc->sc_fpcr); __get_user(fpcr, &sc->sc_fpcr);
cpu_alpha_store_fpcr(env, fpcr); cpu_alpha_store_fpcr(env, fpcr);
return err; return err;
...@@ -5559,10 +5553,10 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -5559,10 +5553,10 @@ static void setup_frame(int sig, struct target_sigaction *ka,
if (ka->sa_restorer) { if (ka->sa_restorer) {
r26 = ka->sa_restorer; r26 = ka->sa_restorer;
} else { } else {
err |= __put_user(INSN_MOV_R30_R16, &frame->retcode[0]); __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
err |= __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn, __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn,
&frame->retcode[1]); &frame->retcode[1]);
err |= __put_user(INSN_CALLSYS, &frame->retcode[2]); __put_user(INSN_CALLSYS, &frame->retcode[2]);
/* imb() */ /* imb() */
r26 = frame_addr; r26 = frame_addr;
} }
...@@ -5600,27 +5594,27 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, ...@@ -5600,27 +5594,27 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
err |= copy_siginfo_to_user(&frame->info, info); err |= copy_siginfo_to_user(&frame->info, info);
err |= __put_user(0, &frame->uc.tuc_flags); __put_user(0, &frame->uc.tuc_flags);
err |= __put_user(0, &frame->uc.tuc_link); __put_user(0, &frame->uc.tuc_link);
err |= __put_user(set->sig[0], &frame->uc.tuc_osf_sigmask); __put_user(set->sig[0], &frame->uc.tuc_osf_sigmask);
err |= __put_user(target_sigaltstack_used.ss_sp, __put_user(target_sigaltstack_used.ss_sp,
&frame->uc.tuc_stack.ss_sp); &frame->uc.tuc_stack.ss_sp);
err |= __put_user(sas_ss_flags(env->ir[IR_SP]), __put_user(sas_ss_flags(env->ir[IR_SP]),
&frame->uc.tuc_stack.ss_flags); &frame->uc.tuc_stack.ss_flags);
err |= __put_user(target_sigaltstack_used.ss_size, __put_user(target_sigaltstack_used.ss_size,
&frame->uc.tuc_stack.ss_size); &frame->uc.tuc_stack.ss_size);
err |= setup_sigcontext(&frame->uc.tuc_mcontext, env, frame_addr, set); err |= setup_sigcontext(&frame->uc.tuc_mcontext, env, frame_addr, set);
for (i = 0; i < TARGET_NSIG_WORDS; ++i) { for (i = 0; i < TARGET_NSIG_WORDS; ++i) {
err |= __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]); __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]);
} }
if (ka->sa_restorer) { if (ka->sa_restorer) {
r26 = ka->sa_restorer; r26 = ka->sa_restorer;
} else { } else {
err |= __put_user(INSN_MOV_R30_R16, &frame->retcode[0]); __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
err |= __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn, __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn,
&frame->retcode[1]); &frame->retcode[1]);
err |= __put_user(INSN_CALLSYS, &frame->retcode[2]); __put_user(INSN_CALLSYS, &frame->retcode[2]);
/* imb(); */ /* imb(); */
r26 = frame_addr; r26 = frame_addr;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或