From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFh4H-0008Sn-SY for qemu-devel@nongnu.org; Fri, 29 Apr 2011 02:20:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFh4F-0002i9-EM for qemu-devel@nongnu.org; Fri, 29 Apr 2011 02:20:45 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:58569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFh4F-0002i4-3X for qemu-devel@nongnu.org; Fri, 29 Apr 2011 02:20:43 -0400 Received: by qwj8 with SMTP id 8so1898181qwj.4 for ; Thu, 28 Apr 2011 23:20:42 -0700 (PDT) MIME-Version: 1.0 Date: Fri, 29 Apr 2011 11:20:42 +0500 Message-ID: From: Khansa Butt Content-Type: multipart/alternative; boundary=0016364edfc463c8e704a208acfb Subject: [Qemu-devel] [PATCH 3/3] linux-user:Signal handling for MIPS64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Riku Voipio , qemu-devel@nongnu.org --0016364edfc463c8e704a208acfb Content-Type: text/plain; charset=ISO-8859-1 >>From 1ab1973118d9e676fcaaf234d153c8c7056aa82a Mon Sep 17 00:00:00 2001 From: Ehsan-ul-Haq, Abdul Qadeer, Abdul Waheed, Khansa Butt < khansa@kics.edu.pk> Date: Fri, 29 Apr 2011 10:52:38 +0500 Subject: [PATCH 3/3] linux-user:Signal handling for MIPS64 Signed-off-by: Khansa Butt --- linux-user/signal.c | 331 +++++++++++++++++++++++++++++++++++++++++++-- linux-user/syscall_defs.h | 4 + 2 files changed, 325 insertions(+), 10 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 66786db..e387a5b 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -221,7 +221,11 @@ static inline void host_to_target_siginfo_noswap(target_siginfo_t *tinfo, /* XXX: potential problem if 64 bit */ tinfo->_sifields._rt._sigval.sival_ptr = (abi_ulong)(unsigned long)info->si_value.sival_ptr; + } else { + tinfo->_sifields._kill._pid = info->si_pid; + tinfo->_sifields._kill._uid = info->si_uid; } + } static void tswap_siginfo(target_siginfo_t *tinfo, @@ -243,6 +247,9 @@ static void tswap_siginfo(target_siginfo_t *tinfo, tinfo->_sifields._rt._uid = tswap32(info->_sifields._rt._uid); tinfo->_sifields._rt._sigval.sival_ptr = tswapl(info->_sifields._rt._sigval.sival_ptr); + } else { + tinfo->_sifields._kill._pid = tswap32(info->_sifields._kill._pid); + tinfo->_sifields._kill._uid = tswap32(info->_sifields._kill._uid); } } @@ -2413,28 +2420,332 @@ void sparc64_get_context(CPUSPARCState *env) #endif #elif defined(TARGET_ABI_MIPSN64) -static void setup_frame(int sig, struct target_sigaction *ka, - target_sigset_t *set, CPUState *env) +struct target_sigcontext { + uint32_t sc_regmask; /* Unused */ + uint32_t sc_status; + uint64_t sc_pc; + uint64_t sc_regs[32]; + uint64_t sc_fpregs[32]; + uint32_t sc_ownedfp; /* Unused */ + uint32_t sc_fpc_csr; + uint32_t sc_fpc_eir; /* Unused */ + uint32_t sc_used_math; + uint32_t sc_dsp; /* dsp status, was sc_ssflags */ + uint32_t pad0; + uint64_t sc_mdhi; + uint64_t sc_mdlo; + target_ulong sc_hi1; /* Was sc_cause */ + target_ulong sc_lo1; /* Was sc_badvaddr */ + target_ulong sc_hi2; /* Was sc_sigset[4] */ + target_ulong sc_lo2; + target_ulong sc_hi3; + target_ulong sc_lo3; +}; + +struct target_ucontext { + target_ulong tuc_flags; + target_ulong tuc_link; + target_stack_t tuc_stack; + struct target_sigcontext tuc_mcontext; + target_sigset_t tuc_sigmask; +}; + +struct target_rt_sigframe { + uint64_t rs_ass[8]; /* argument save space for n64 */ + uint32_t rs_code[2]; /* signal trampoline */ + struct target_siginfo rs_info; + struct target_ucontext rs_uc; +}; + +/* Install trampoline to jump back from signal handler */ +static inline int install_sigtramp(unsigned int *tramp, unsigned int syscall) { - fprintf(stderr, "setup_frame: not implemented\n"); + int err; + + /* + * Set up the return code ... + * + * li v0, __NR__foo_sigreturn + * syscall + */ + + err = __put_user(0x24020000 + syscall, tramp + 0); + err |= __put_user(0x0000000c , tramp + 1); + /* flush_cache_sigtramp((unsigned long) tramp); */ + return err; +} + +static inline int +setup_sigcontext(CPUState *regs, struct target_sigcontext *sc) +{ + int err = 0; + + err |= __put_user(regs->active_tc.PC, &sc->sc_pc); + +#define save_gp_reg(i) do { \ + err |= __put_user(regs->active_tc.gpr[i], &sc->sc_regs[i]); \ + } while (0) + __put_user(0, &sc->sc_regs[0]); save_gp_reg(1); save_gp_reg(2); + save_gp_reg(3); save_gp_reg(4); save_gp_reg(5); save_gp_reg(6); + save_gp_reg(7); save_gp_reg(8); save_gp_reg(9); save_gp_reg(10); + save_gp_reg(11); save_gp_reg(12); save_gp_reg(13); save_gp_reg(14); + save_gp_reg(15); save_gp_reg(16); save_gp_reg(17); save_gp_reg(18); + save_gp_reg(19); save_gp_reg(20); save_gp_reg(21); save_gp_reg(22); + save_gp_reg(23); save_gp_reg(24); save_gp_reg(25); save_gp_reg(26); + save_gp_reg(27); save_gp_reg(28); save_gp_reg(29); save_gp_reg(30); + save_gp_reg(31); +#undef save_gp_reg + + err |= __put_user(regs->active_tc.HI[0], &sc->sc_mdhi); + err |= __put_user(regs->active_tc.LO[0], &sc->sc_mdlo); + + /* Not used yet, but might be useful if we ever have DSP suppport */ +#if 0 + if (cpu_has_dsp) { + err |= __put_user(mfhi1(), &sc->sc_hi1); + err |= __put_user(mflo1(), &sc->sc_lo1); + err |= __put_user(mfhi2(), &sc->sc_hi2); + err |= __put_user(mflo2(), &sc->sc_lo2); + err |= __put_user(mfhi3(), &sc->sc_hi3); + err |= __put_user(mflo3(), &sc->sc_lo3); + err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp); + } + /* same with 64 bit */ +#ifdef CONFIG_64BIT + err |= __put_user(regs->hi, &sc->sc_hi[0]); + err |= __put_user(regs->lo, &sc->sc_lo[0]); + if (cpu_has_dsp) { + err |= __put_user(mfhi1(), &sc->sc_hi[1]); + err |= __put_user(mflo1(), &sc->sc_lo[1]); + err |= __put_user(mfhi2(), &sc->sc_hi[2]); + err |= __put_user(mflo2(), &sc->sc_lo[2]); + err |= __put_user(mfhi3(), &sc->sc_hi[3]); + err |= __put_user(mflo3(), &sc->sc_lo[3]); + err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp); + } +#endif +#endif + +#if 0 + err |= __put_user(!!used_math(), &sc->sc_used_math); + + if (!used_math()) + goto out; + + /* + * Save FPU state to signal context. Signal handler will "inherit" + * current FPU state. + */ + preempt_disable(); + + if (!is_fpu_owner()) { + own_fpu(); + restore_fp(current); + } + err |= save_fp_context(sc); + + preempt_enable(); + out: +#endif + return err; +} + +static inline int +restore_sigcontext(CPUState *regs, struct target_sigcontext *sc) +{ + int err = 0; + + err |= __get_user(regs->CP0_EPC, &sc->sc_pc); + + err |= __get_user(regs->active_tc.HI[0], &sc->sc_mdhi); + err |= __get_user(regs->active_tc.LO[0], &sc->sc_mdlo); + +#define restore_gp_reg(i) do { \ + err |= __get_user(regs->active_tc.gpr[i], &sc->sc_regs[i]); \ + } while (0) + restore_gp_reg( 1); restore_gp_reg( 2); restore_gp_reg( 3); + restore_gp_reg( 4); restore_gp_reg( 5); restore_gp_reg( 6); + restore_gp_reg( 7); restore_gp_reg( 8); restore_gp_reg( 9); + restore_gp_reg(10); restore_gp_reg(11); restore_gp_reg(12); + restore_gp_reg(13); restore_gp_reg(14); restore_gp_reg(15); + restore_gp_reg(16); restore_gp_reg(17); restore_gp_reg(18); + restore_gp_reg(19); restore_gp_reg(20); restore_gp_reg(21); + restore_gp_reg(22); restore_gp_reg(23); restore_gp_reg(24); + restore_gp_reg(25); restore_gp_reg(26); restore_gp_reg(27); + restore_gp_reg(28); restore_gp_reg(29); restore_gp_reg(30); + restore_gp_reg(31); +#undef restore_gp_reg + +#if 0 + if (cpu_has_dsp) { + err |= __get_user(treg, &sc->sc_hi1); mthi1(treg); + err |= __get_user(treg, &sc->sc_lo1); mtlo1(treg); + err |= __get_user(treg, &sc->sc_hi2); mthi2(treg); + err |= __get_user(treg, &sc->sc_lo2); mtlo2(treg); + err |= __get_user(treg, &sc->sc_hi3); mthi3(treg); + err |= __get_user(treg, &sc->sc_lo3); mtlo3(treg); + err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK); + } +#ifdef CONFIG_64BIT + err |= __get_user(regs->hi, &sc->sc_hi[0]); + err |= __get_user(regs->lo, &sc->sc_lo[0]); + if (cpu_has_dsp) { + err |= __get_user(treg, &sc->sc_hi[1]); mthi1(treg); + err |= __get_user(treg, &sc->sc_lo[1]); mthi1(treg); + err |= __get_user(treg, &sc->sc_hi[2]); mthi2(treg); + err |= __get_user(treg, &sc->sc_lo[2]); mthi2(treg); + err |= __get_user(treg, &sc->sc_hi[3]); mthi3(treg); + err |= __get_user(treg, &sc->sc_lo[3]); mthi3(treg); + err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK); + } +#endif + + err |= __get_user(used_math, &sc->sc_used_math); + conditional_used_math(used_math); + + preempt_disable(); + + if (used_math()) { + /* restore fpu context if we have used it before */ + own_fpu(); + err |= restore_fp_context(sc); + } else { + /* signal handler may have used FPU. Give it up. */ + lose_fpu(); + } + + preempt_enable(); +#endif + return err; +} +/* + * Determine which stack to use.. + */ +static inline abi_ulong +get_sigframe(struct target_sigaction *ka, CPUState *regs, size_t frame_size) +{ + unsigned long sp; + + /* Default to using normal stack */ + sp = regs->active_tc.gpr[29]; + + /* + * FPU emulator may have it's own trampoline active just + * above the user stack, 16-bytes before the next lowest + * 16 byte boundary. Try to avoid trashing it. + */ + sp -= 32; + + /* This is the X/Open sanctioned signal stack switching. */ + if ((ka->sa_flags & TARGET_SA_ONSTACK) && (sas_ss_flags (sp) == 0)) { + sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size; + } + + return (sp - frame_size) & ~7; } static void setup_rt_frame(int sig, struct target_sigaction *ka, target_siginfo_t *info, - target_sigset_t *set, CPUState *env) + target_sigset_t *set, CPUState *env) { - fprintf(stderr, "setup_rt_frame: not implemented\n"); + struct target_rt_sigframe *frame; + abi_ulong frame_addr; + int i; + + frame_addr = get_sigframe(ka, env, sizeof(*frame)); + if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) + goto give_sigsegv; + + install_sigtramp(frame->rs_code, TARGET_NR_rt_sigreturn); + + copy_siginfo_to_user(&frame->rs_info, info); + + __put_user(0, &frame->rs_uc.tuc_flags); + __put_user(0, &frame->rs_uc.tuc_link); + __put_user(target_sigaltstack_used.ss_sp, &frame->rs_uc.tuc_stack.ss_sp); + __put_user(target_sigaltstack_used.ss_size, &frame->rs_uc.tuc_stack.ss_size); + __put_user(sas_ss_flags(get_sp_from_cpustate(env)), + &frame->rs_uc.tuc_stack.ss_flags); + + setup_sigcontext(env, &frame->rs_uc.tuc_mcontext); + + for (i = 0; i < TARGET_NSIG_WORDS; i++) { + __put_user(set->sig[i], &frame->rs_uc.tuc_sigmask.sig[i]); + } + + /* + * Arguments to signal handler: + * + * a0 = signal number + * a1 = pointer to struct siginfo + * a2 = pointer to struct ucontext + * + * $25 and PC point to the signal handler, $29 points to the + * struct sigframe. + */ + env->active_tc.gpr[ 4] = sig; + env->active_tc.gpr[ 5] = frame_addr + + offsetof(struct target_rt_sigframe, rs_info); + env->active_tc.gpr[ 6] = frame_addr + + offsetof(struct target_rt_sigframe, rs_uc); + env->active_tc.gpr[29] = frame_addr; + env->active_tc.gpr[31] = frame_addr + + offsetof(struct target_rt_sigframe, rs_code); + /* The original kernel code sets CP0_EPC to the handler + * since it returns to userland using eret + * we cannot do this here, and we must set PC directly */ + env->active_tc.PC = env->active_tc.gpr[25] = ka->_sa_handler; + unlock_user_struct(frame, frame_addr, 1); + return; + +give_sigsegv: + unlock_user_struct(frame, frame_addr, 1); + force_sig(TARGET_SIGSEGV/*, current*/); + return; } -long do_sigreturn(CPUState *env) +long do_rt_sigreturn(CPUState *env) { - fprintf(stderr, "do_sigreturn: not implemented\n"); - return -TARGET_ENOSYS; + struct target_rt_sigframe *frame; + abi_ulong frame_addr; + sigset_t blocked; + +#if defined(DEBUG_SIGNAL) + fprintf(stderr, "do_rt_sigreturn\n"); +#endif + frame_addr = env->active_tc.gpr[29]; + if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) + goto badframe; + + target_to_host_sigset(&blocked, &frame->rs_uc.tuc_sigmask); + sigprocmask(SIG_SETMASK, &blocked, NULL); + + if (restore_sigcontext(env, &frame->rs_uc.tuc_mcontext)) + goto badframe; + + if (do_sigaltstack(frame_addr + + offsetof(struct target_rt_sigframe, rs_uc.tuc_stack), + 0, get_sp_from_cpustate(env)) == -EFAULT) + goto badframe; + + env->active_tc.PC = env->CP0_EPC; + env->CP0_EPC = 0; + return -TARGET_QEMU_ESIGRETURN; + +badframe: + force_sig(TARGET_SIGSEGV/*, current*/); + return 0; } -long do_rt_sigreturn(CPUState *env) +static void setup_frame(int sig, struct target_sigaction *ka, + target_sigset_t *set, CPUState *env) { - fprintf(stderr, "do_rt_sigreturn: not implemented\n"); + fprintf(stderr, "setup_frame: not implemented\n"); +} + +long do_sigreturn(CPUState *env) +{ + fprintf(stderr, "do_sigreturn: not implemented\n"); return -TARGET_ENOSYS; } diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index bde8921..50a8599 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -506,7 +506,11 @@ struct target_sigaction { }; #elif defined(TARGET_MIPS) struct target_sigaction { +#if defined(TARGET_ABI_MIPSN64) + abi_ulong sa_flags; +#else uint32_t sa_flags; +#endif #if defined(TARGET_ABI_MIPSN32) uint32_t _sa_handler; #else -- 1.7.3.4 --0016364edfc463c8e704a208acfb Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
From 1ab1973118d9e676fcaaf234d153c8c7056aa82a Mon Sep 17 00:00:00 2001=
From: Ehsan-ul-Haq, Abdul Qadeer, Abdul Waheed, Khansa Butt <= khansa@kics.edu.pk>
Date: Fri, 29 Apr 2011 10:52:38 +0500
Subject: [PATCH 3/3] linux-= user:Signal handling for MIPS64


Sig= ned-off-by: Khansa Butt <khansa@ki= cs.edu.pk>
---
=A0linux-user/signal.c =A0 =A0 =A0 | =A0331 ++++++++++++= +++++++++++++++++++++++++++++++--
=A0linux-user/syscall_defs.h | = =A0 =A04 +
=A02 files changed, 325 insertions(+), 10 deletions(-)=

diff --git a/linux-user/signal.c b/linux-user/signal.c
index 66786db..e387a5b 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -221,7 +221,11 @@ static inline vo= id host_to_target_siginfo_noswap(target_siginfo_t *tinfo,
=A0=A0 =A0 =A0 =A0 /* XXX: potential problem if 64 bit */
= =A0=A0 =A0 =A0 =A0 tinfo->_sifields._rt._sigval.sival_ptr =3D
= =A0=A0 =A0 =A0 =A0 =A0 =A0 (abi_ulong)(unsigned long)info->si_value.siva= l_ptr;
+ =A0 =A0} else {
+ =A0 =A0 =A0 =A0tinfo->_sifields._kill._pid =3D info->si_pid;
+ =A0 =A0 =A0 =A0tinfo->_sifields._kill._uid =3D info->si_ui= d;
=A0=A0 =A0 }
+
=A0}
=A0
=A0static void tswap_siginfo(target_siginfo_t *tinfo,
@@ -243,6 +247,9 @@ static void tswap_siginfo(target_siginfo_t *tinfo,=
=A0=A0 =A0 =A0 =A0 tinfo->_sifields._rt._uid =3D tswap32(info= ->_sifields._rt._uid);
=A0=A0 =A0 =A0 =A0 tinfo->_sifields.= _rt._sigval.sival_ptr =3D
=A0=A0 =A0 =A0 =A0 =A0 =A0 tswapl(info->_sifields._rt._sigval.sival= _ptr);
+ =A0 =A0} else {
+ =A0 =A0 =A0 =A0tinfo->_si= fields._kill._pid =3D tswap32(info->_sifields._kill._pid);
+ = =A0 =A0 =A0 =A0tinfo->_sifields._kill._uid =3D tswap32(info->_sifield= s._kill._uid);
=A0=A0 =A0 }
=A0}
=A0
@@ -2413,28 +2420,= 332 @@ void sparc64_get_context(CPUSPARCState *env)
=A0#endif
=A0#elif defined(TARGET_ABI_MIPSN64)
=A0
-static= void setup_frame(int sig, struct target_sigaction *ka,
- ta= rget_sigset_t *set, CPUState *env)
+struct target_sigcontext {
+ =A0 =A0uint32_t =A0 sc_regmask; =A0 =A0 /* Unused */
+ = =A0 =A0uint32_t =A0 sc_status;
+ =A0 =A0uint64_t =A0 sc_pc;
+ =A0 =A0uint64_t =A0 sc_regs[3= 2];
+ =A0 =A0uint64_t =A0 sc_fpregs[32];
+ =A0 =A0uint3= 2_t =A0 sc_ownedfp; =A0 =A0 /* Unused */
+ =A0 =A0uint32_t =A0 sc= _fpc_csr;
+ =A0 =A0uint32_t =A0 sc_fpc_eir; =A0 =A0 /* Unused */<= /div>
+ =A0 =A0uint32_t =A0 sc_used_math;
+ =A0 =A0uint32_t =A0 sc= _dsp; =A0 =A0 =A0 =A0 /* dsp status, was sc_ssflags */
+ =A0 =A0u= int32_t =A0 pad0;
+ =A0 =A0uint64_t =A0 sc_mdhi;
+ =A0 = =A0uint64_t =A0 sc_mdlo;
+ =A0 =A0target_ulong =A0 sc_hi1; =A0 =A0 =A0 =A0 /* Was sc_cause */
<= div>+ =A0 =A0target_ulong =A0 sc_lo1; =A0 =A0 =A0 =A0 /* Was sc_badvaddr */=
+ =A0 =A0target_ulong =A0 sc_hi2; =A0 =A0 =A0 =A0 /* Was sc_sigs= et[4] */
+ =A0 =A0target_ulong =A0 sc_lo2;
+ =A0 =A0target_ulong =A0 sc_hi3;
+ =A0 =A0target_ulong =A0 = sc_lo3;
+};
+
+struct target_ucontext {
=
+ =A0 =A0target_ulong tuc_flags;
+ =A0 =A0target_ulong tuc_l= ink;
+ =A0 =A0target_stack_t tuc_stack;
+ =A0 =A0struct target_sigcontext tuc_mcontext;
+ =A0 =A0tar= get_sigset_t tuc_sigmask;
+};
+
+struct targe= t_rt_sigframe {
+ =A0 =A0uint64_t rs_ass[8]; =A0 =A0 =A0 =A0 =A0 = =A0 =A0 /* argument save space for n64 */
+ =A0 =A0uint32_t rs_code[2]; =A0 =A0 =A0 =A0 =A0 =A0 =A0/* signal tra= mpoline */
+ =A0 =A0struct target_siginfo rs_info;
+ = =A0 =A0struct target_ucontext rs_uc;
+};
+
+/= * Install trampoline to jump back from signal handler */
+static inline int install_sigtramp(unsigned int *tramp, =A0 unsigned = int syscall)
=A0{
- =A0 =A0fprintf(stderr, "setup_= frame: not implemented\n");
+ =A0 =A0int err;
+
+ =A0 =A0/*
+ =A0 =A0* Set up the return code ...
+ =A0= =A0*
+ =A0 =A0* =A0 =A0 =A0 =A0 li =A0 =A0 =A0v0, __NR__foo_sigr= eturn
+ =A0 =A0* =A0 =A0 =A0 =A0 syscall
+ =A0 =A0*/
+
+ =A0 =A0err =3D __put_user(0x24020000 + syscall, tramp= + 0);
+ =A0 =A0err |=3D __put_user(0x0000000c =A0 =A0 =A0 =A0 =A0, tramp + 1= );
+ =A0 =A0/* flush_cache_sigtramp((unsigned long) tramp); */
+ =A0 =A0return err;
+}
+
+static inl= ine int
+setup_sigcontext(CPUState *regs, struct target_sigcontex= t *sc)
+{
+ =A0 =A0int err =3D 0;
+
+ =A0 =A0er= r |=3D __put_user(regs->active_tc.PC, &sc->sc_pc);
+
+#define save_gp_reg(i) do { =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 \
+ =A0 =A0 =A0 =A0err |=3D __put_user(regs->activ= e_tc.gpr[i], &sc->sc_regs[i]); \
+ =A0 =A0} while (0)
+ =A0 =A0__put_user(0, &sc->sc_r= egs[0]); save_gp_reg(1); save_gp_reg(2);
+ =A0 =A0save_gp_reg(3);= save_gp_reg(4); save_gp_reg(5); save_gp_reg(6);
+ =A0 =A0save_gp= _reg(7); save_gp_reg(8); save_gp_reg(9); save_gp_reg(10);
+ =A0 =A0save_gp_reg(11); save_gp_reg(12); save_gp_reg(13); save_gp_re= g(14);
+ =A0 =A0save_gp_reg(15); save_gp_reg(16); save_gp_reg(17)= ; save_gp_reg(18);
+ =A0 =A0save_gp_reg(19); save_gp_reg(20); sav= e_gp_reg(21); save_gp_reg(22);
+ =A0 =A0save_gp_reg(23); save_gp_reg(24); save_gp_reg(25); save_gp_re= g(26);
+ =A0 =A0save_gp_reg(27); save_gp_reg(28); save_gp_reg(29)= ; save_gp_reg(30);
+ =A0 =A0save_gp_reg(31);
+#undef sa= ve_gp_reg
+
+ =A0 =A0err |=3D __put_user(regs->active_tc.HI[0], &am= p;sc->sc_mdhi);
+ =A0 =A0err |=3D __put_user(regs->active_t= c.LO[0], &sc->sc_mdlo);
+
+ =A0 =A0/* Not used y= et, but might be useful if we ever have DSP suppport */
+#if 0
+ =A0 =A0if (cpu_has_dsp) {
+ =A0 =A0err |= =3D __put_user(mfhi1(), &sc->sc_hi1);
+ =A0 =A0err |=3D __= put_user(mflo1(), &sc->sc_lo1);
+ =A0 =A0err |=3D __put_us= er(mfhi2(), &sc->sc_hi2);
+ =A0 =A0err |=3D __put_user(mflo2(), &sc->sc_lo2);
+= =A0 =A0err |=3D __put_user(mfhi3(), &sc->sc_hi3);
+ =A0 = =A0err |=3D __put_user(mflo3(), &sc->sc_lo3);
+ =A0 =A0err= |=3D __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
+ =A0 =A0}
+ =A0 =A0/* same with 64 bit */
+#ifdef= CONFIG_64BIT
+ =A0 =A0err |=3D __put_user(regs->hi, &sc-&= gt;sc_hi[0]);
+ =A0 =A0err |=3D __put_user(regs->lo, &sc-&= gt;sc_lo[0]);
+ =A0 =A0if (cpu_has_dsp) {
+ =A0 =A0err |=3D __put_user(mfh= i1(), &sc->sc_hi[1]);
+ =A0 =A0err |=3D __put_user(mflo1()= , &sc->sc_lo[1]);
+ =A0 =A0err |=3D __put_user(mfhi2(), &a= mp;sc->sc_hi[2]);
+ =A0 =A0err |=3D __put_user(mflo2(), &sc->sc_lo[2]);
+ =A0 =A0err |=3D __put_user(mfhi3(), &sc->sc_hi[3]);
+ = =A0 =A0err |=3D __put_user(mflo3(), &sc->sc_lo[3]);
+ =A0 = =A0err |=3D __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
+ =A0 =A0}
+#endif
+#endif
+
+= #if 0
+ =A0 =A0err |=3D __put_user(!!used_math(), &sc->sc_= used_math);
+
+ =A0 =A0if (!used_math())
+ = =A0 =A0goto out;
+
+ =A0 =A0/*
+ =A0 =A0* Save FPU state to signal = context. =A0Signal handler will "inherit"
+ =A0 =A0* cu= rrent FPU state.
+ =A0 =A0*/
+ =A0 =A0preempt_disable()= ;
+
+ =A0 =A0if (!is_fpu_owner()) {
+ =A0 =A0own_fpu();
+ =A0 =A0restore_fp(current);
+ =A0 =A0}
+ =A0 =A0err= |=3D save_fp_context(sc);
+
+ =A0 =A0preempt_enable();=
+ =A0 =A0out:
+#endif
+ =A0 =A0return err;
+}
+
<= div>+static inline int
+restore_sigcontext(CPUState *regs, struct= target_sigcontext *sc)
+{
+ =A0 =A0int err =3D 0;
+
+ =A0 =A0err |=3D __get_user(regs->CP0_EPC, &sc->sc_p= c);
+
+ =A0 =A0err |=3D __get_user(regs->active_tc.H= I[0], &sc->sc_mdhi);
+ =A0 =A0err |=3D __get_user(regs->= ;active_tc.LO[0], &sc->sc_mdlo);
+
+#define restore_gp_reg(i) do { =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\
+ =A0 =A0 =A0 =A0err |=3D __= get_user(regs->active_tc.gpr[i], &sc->sc_regs[i]); =A0 =A0 \
+ =A0 =A0} while (0)
+ =A0 =A0restore_gp_reg( 1); restore_g= p_reg( 2); restore_gp_reg( 3);
+ =A0 =A0restore_gp_reg( 4); restore_gp_reg( 5); restore_gp_reg( 6);
+ =A0 =A0restore_gp_reg( 7); restore_gp_reg( 8); restore_gp_reg( 9= );
+ =A0 =A0restore_gp_reg(10); restore_gp_reg(11); restore_gp_re= g(12);
+ =A0 =A0restore_gp_reg(13); restore_gp_reg(14); restore_gp_reg(15);
+ =A0 =A0restore_gp_reg(16); restore_gp_reg(17); restore_gp_reg(18= );
+ =A0 =A0restore_gp_reg(19); restore_gp_reg(20); restore_gp_re= g(21);
+ =A0 =A0restore_gp_reg(22); restore_gp_reg(23); restore_gp_reg(24);
+ =A0 =A0restore_gp_reg(25); restore_gp_reg(26); restore_gp_reg(27= );
+ =A0 =A0restore_gp_reg(28); restore_gp_reg(29); restore_gp_re= g(30);
+ =A0 =A0restore_gp_reg(31);
+#undef restore_gp_reg
+
+#if 0
+ =A0 =A0if (cpu_has_dsp) {
+ =A0 = =A0err |=3D __get_user(treg, &sc->sc_hi1); mthi1(treg);
+ = =A0 =A0err |=3D __get_user(treg, &sc->sc_lo1); mtlo1(treg);
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_hi2); mthi2(treg);
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_lo2); mtlo2(treg= );
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_hi3); mthi3(= treg);
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_lo3); mtlo3(treg);
<= div>+ =A0 =A0err |=3D __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP= _MASK);
+ =A0 =A0}
+#ifdef CONFIG_64BIT
+ =A0= =A0err |=3D __get_user(regs->hi, &sc->sc_hi[0]);
+ =A0 =A0err |=3D __get_user(regs->lo, &sc->sc_lo[0]);
=
+ =A0 =A0if (cpu_has_dsp) {
+ =A0 =A0err |=3D __get_user(tre= g, &sc->sc_hi[1]); mthi1(treg);
+ =A0 =A0err |=3D __get_us= er(treg, &sc->sc_lo[1]); mthi1(treg);
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_hi[2]); mthi2(treg);=
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_lo[2]); mthi2(= treg);
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_hi[3]); = mthi3(treg);
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_lo[3]); mthi3(treg);=
+ =A0 =A0err |=3D __get_user(treg, &sc->sc_dsp); wrdsp(tr= eg, DSP_MASK);
+ =A0 =A0}
+#endif
+
+ =A0 =A0err |=3D __get_user(used_math, &sc->sc_used_math);
+ =A0 =A0conditional_used_math(used_math);
+
+ =A0= =A0preempt_disable();
+
+ =A0 =A0if (used_math()) {
+ =A0 =A0/* restore fpu context if we have used it before */
<= div>+ =A0 =A0own_fpu();
+ =A0 =A0err |=3D restore_fp_context(sc);
+ =A0 =A0} else {<= /div>
+ =A0 =A0/* signal handler may have used FPU. =A0Give it up. */
+ =A0 =A0lose_fpu();
+ =A0 =A0}
+
+ = =A0 =A0preempt_enable();
+#endif
+ =A0 =A0return err;
+}
+/*
+ * Determine which stack to use..
+ */
+static i= nline abi_ulong
+get_sigframe(struct target_sigaction *ka, CPUSta= te *regs, size_t frame_size)
+{
+ =A0 =A0unsigned long sp;
+
+ =A0 = =A0/* Default to using normal stack */
+ =A0 =A0sp =3D regs->a= ctive_tc.gpr[29];
+
+ =A0 =A0/*
+ =A0 =A0 * F= PU emulator may have it's own trampoline active just
+ =A0 =A0 * above the user stack, 16-bytes before the next lowest
+ =A0 =A0 * 16 byte boundary. =A0Try to avoid trashing it.
= + =A0 =A0 */
+ =A0 =A0sp -=3D 32;
+
+ =A0 =A0= /* This is the X/Open sanctioned signal stack switching. =A0*/
+ =A0 =A0if ((ka->sa_flags & TARGET_SA_ONSTACK) && (sas= _ss_flags (sp) =3D=3D 0)) {
+ =A0 =A0 =A0 =A0sp =3D target_sigalt= stack_used.ss_sp + target_sigaltstack_used.ss_size;
+ =A0 =A0}
+
+ =A0 =A0return (sp - frame_size) & ~7;
=A0}
=A0
=A0static void setup_rt_frame(int sig, struct target_sigaction *ka,=
=A0=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0target= _siginfo_t *info,
- =A0 target_sigset_t *set, CPUState *env)
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 target_sigset_t *set, CPUState *env)
=A0{
- =A0 =A0fprintf(stderr, "setup_rt_frame: not im= plemented\n");
+ =A0 =A0struct target_rt_sigframe *frame;
+ =A0 =A0abi_ulong frame_addr;
+ =A0 =A0int i;
+
+ =A0 =A0frame_addr =3D get_sigf= rame(ka, env, sizeof(*frame));
+ =A0 =A0if (!lock_user_struct(VER= IFY_WRITE, frame, frame_addr, 0))
+ =A0 =A0goto give_sigsegv;
+
+ =A0 =A0install_sigtramp(frame->rs_code, TARGET_NR_rt_sigreturn);<= /div>
+
+ =A0 =A0copy_siginfo_to_user(&frame->rs_info,= info);
+
+ =A0 =A0__put_user(0, &frame->rs_uc.t= uc_flags);
+ =A0 =A0__put_user(0, &frame->rs_uc.tuc_link);
+ =A0= =A0__put_user(target_sigaltstack_used.ss_sp, &frame->rs_uc.tuc_stac= k.ss_sp);
+ =A0 =A0__put_user(target_sigaltstack_used.ss_size, &a= mp;frame->rs_uc.tuc_stack.ss_size);
+ =A0 =A0__put_user(sas_ss_flags(get_sp_from_cpustate(env)),
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 &frame->rs_uc.tuc_stack.ss_flags);
+
+ =A0 =A0setup_sigcontext(env, &frame->rs_uc.tuc= _mcontext);
+
+ =A0 =A0for (i =3D 0; i < TARGET_NSIG_WORDS; i++) {
+ =A0 =A0 =A0 =A0__put_user(set->sig[i], &frame->rs_uc.tuc_sig= mask.sig[i]);
+ =A0 =A0}
+
+ =A0 =A0/*
<= div>+ =A0 =A0* Arguments to signal handler:
+ =A0 =A0*
+ =A0 =A0* =A0 a0 =3D signal number
+ = =A0 =A0* =A0 a1 =3D pointer to struct siginfo
+ =A0 =A0* =A0 a2 = =3D pointer to struct ucontext
+ =A0 =A0*
+ =A0 =A0* $2= 5 and PC point to the signal handler, $29 points to the
+ =A0 =A0* struct sigframe.
+ =A0 =A0*/
+ =A0 =A0e= nv->active_tc.gpr[ 4] =3D sig;
+ =A0 =A0env->active_tc.gpr[= 5] =3D frame_addr
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 + offsetof(struct target_rt_sigframe, rs_info);
+ =A0 =A0env->active_tc.gpr[ 6] =3D frame_addr
+ =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 + offsetof(struct target_rt= _sigframe, rs_uc);
+ =A0 =A0env->active_tc.gpr[29] =3D frame_a= ddr;
+ =A0 =A0env->active_tc.gpr[31] =3D frame_addr
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 + offsetof(s= truct target_rt_sigframe, rs_code);
+ =A0 =A0/* The original kern= el code sets CP0_EPC to the handler
+ =A0 =A0* since it returns t= o userland using eret
+ =A0 =A0* we cannot do this here, and we must set PC directly */
+ =A0 =A0env->active_tc.PC =3D env->active_tc.gpr[25] =3D ka->_sa= _handler;
+ =A0 =A0unlock_user_struct(frame, frame_addr, 1);
+ =A0 =A0return;
+
+give_sigsegv:
+ =A0 =A0unlock_user_struct(frame= , frame_addr, 1);
+ =A0 =A0force_sig(TARGET_SIGSEGV/*, current*/)= ;
+ =A0 =A0return;
=A0}
=A0
-long d= o_sigreturn(CPUState *env)
+long do_rt_sigreturn(CPUState *env)
=A0{
- =A0 = =A0fprintf(stderr, "do_sigreturn: not implemented\n");
= - =A0 =A0return -TARGET_ENOSYS;
+ =A0 =A0struct target_rt_sigfram= e *frame;
+ =A0 =A0abi_ulong frame_addr;
+ =A0 =A0sigset_t blocked;
+
+#if defined(DEBUG_SIGNAL)
+ =A0 =A0fprintf(s= tderr, "do_rt_sigreturn\n");
+#endif
+ =A0 = =A0frame_addr =3D env->active_tc.gpr[29];
+ =A0 =A0if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1))
+ =A0 =A0goto badframe;
+
+ =A0 =A0target_to_hos= t_sigset(&blocked, &frame->rs_uc.tuc_sigmask);
+ =A0 = =A0sigprocmask(SIG_SETMASK, &blocked, NULL);
+
+ =A0 =A0if (restore_sigcontext(env, &frame->rs_uc.= tuc_mcontext))
+ =A0 =A0 =A0 =A0goto badframe;
+
<= div>+ =A0 =A0if (do_sigaltstack(frame_addr +
+ =A0 =A0 =A0 =A0 = =A0 =A0 =A0 offsetof(struct target_rt_sigframe, rs_uc.tuc_stack),
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 0, get_sp_from_cpustate(env)) =3D=3D -EF= AULT)
+ =A0 =A0 =A0 =A0goto badframe;
+
+ =A0= =A0env->active_tc.PC =3D env->CP0_EPC;
+ =A0 =A0env->CP= 0_EPC =3D 0;
+ =A0 =A0return -TARGET_QEMU_ESIGRETURN;
+
+badframe:
+ =A0 =A0force_sig(TARGET_SIGSEGV/*, = current*/);
+ =A0 =A0return 0;
=A0}
=A0
=
-long do_rt_sigreturn(CPUState *env)
+static void setup_fram= e(int sig, struct target_sigaction *ka,
+ =A0 =A0 =A0 =A0 =A0 =A0target_sigset_t *set, CPUState *env)
=A0{
- =A0 =A0fprintf(stderr, "do_rt_sigreturn: not implem= ented\n");
+ =A0 =A0fprintf(stderr, "setup_frame: not i= mplemented\n");
+}
+
+long do_sigreturn(CPUState *env)
+= {
+ =A0 =A0fprintf(stderr, "do_sigreturn: not implemented\n&= quot;);
=A0=A0 =A0 return -TARGET_ENOSYS;
=A0}
=A0
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index bde8921..50a8599 100644
--- a/linux-user/syscall_def= s.h
+++ b/linux-user/syscall_defs.h
@@ -506,7 +506,11 @= @ struct target_sigaction {
=A0};
=A0#elif defined(TARGET_MIPS)
=A0struct targ= et_sigaction {
+#if defined(TARGET_ABI_MIPSN64)
+ =A0 = =A0abi_ulong sa_flags;
+#else
=A0 uint32_t sa_flags;
+#endif
=A0#if defined(TARGET_ABI_MIPSN32)
=A0 uint32_t _sa_handler;
=A0#else
--=A0
1.7.3.4
--0016364edfc463c8e704a208acfb--