X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=linux-user%2Fsignal.c;h=0d2e3018788f56f2fc871444f45afefa9f1521d7;hb=9dfa5b421dcb7f213163d2bd80549d6ca4bc74a6;hp=9873071394de968da27eab665fdcabb6cf95c243;hpb=66099dd9af853e0504c975f7ac6416cc82b95903;p=qemu diff --git a/linux-user/signal.c b/linux-user/signal.c index 9873071..0d2e301 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -60,44 +60,122 @@ static int signal_pending; /* non zero if a signal may be pending */ static void host_signal_handler(int host_signum, siginfo_t *info, void *puc); -/* XXX: do it properly */ +static uint8_t host_to_target_signal_table[65] = { + [SIGHUP] = TARGET_SIGHUP, + [SIGINT] = TARGET_SIGINT, + [SIGQUIT] = TARGET_SIGQUIT, + [SIGILL] = TARGET_SIGILL, + [SIGTRAP] = TARGET_SIGTRAP, + [SIGABRT] = TARGET_SIGABRT, + [SIGIOT] = TARGET_SIGIOT, + [SIGBUS] = TARGET_SIGBUS, + [SIGFPE] = TARGET_SIGFPE, + [SIGKILL] = TARGET_SIGKILL, + [SIGUSR1] = TARGET_SIGUSR1, + [SIGSEGV] = TARGET_SIGSEGV, + [SIGUSR2] = TARGET_SIGUSR2, + [SIGPIPE] = TARGET_SIGPIPE, + [SIGALRM] = TARGET_SIGALRM, + [SIGTERM] = TARGET_SIGTERM, +#ifdef SIGSTKFLT + [SIGSTKFLT] = TARGET_SIGSTKFLT, +#endif + [SIGCHLD] = TARGET_SIGCHLD, + [SIGCONT] = TARGET_SIGCONT, + [SIGSTOP] = TARGET_SIGSTOP, + [SIGTSTP] = TARGET_SIGTSTP, + [SIGTTIN] = TARGET_SIGTTIN, + [SIGTTOU] = TARGET_SIGTTOU, + [SIGURG] = TARGET_SIGURG, + [SIGXCPU] = TARGET_SIGXCPU, + [SIGXFSZ] = TARGET_SIGXFSZ, + [SIGVTALRM] = TARGET_SIGVTALRM, + [SIGPROF] = TARGET_SIGPROF, + [SIGWINCH] = TARGET_SIGWINCH, + [SIGIO] = TARGET_SIGIO, + [SIGPWR] = TARGET_SIGPWR, + [SIGSYS] = TARGET_SIGSYS, + /* next signals stay the same */ +}; +static uint8_t target_to_host_signal_table[65]; + static inline int host_to_target_signal(int sig) { - return sig; + return host_to_target_signal_table[sig]; } static inline int target_to_host_signal(int sig) { - return sig; + return target_to_host_signal_table[sig]; } -void host_to_target_sigset(target_sigset_t *d, sigset_t *s) +void host_to_target_sigset(target_sigset_t *d, const sigset_t *s) { int i; - for(i = 0;i < TARGET_NSIG_WORDS; i++) { + unsigned long sigmask; + uint32_t target_sigmask; + + sigmask = ((unsigned long *)s)[0]; + target_sigmask = 0; + for(i = 0; i < 32; i++) { + if (sigmask & (1 << i)) + target_sigmask |= 1 << (host_to_target_signal(i + 1) - 1); + } +#if TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 32 + d->sig[0] = tswapl(target_sigmask); + for(i = 1;i < TARGET_NSIG_WORDS; i++) { d->sig[i] = tswapl(((unsigned long *)s)[i]); } +#elif TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 64 && TARGET_NSIG_WORDS == 2 + d->sig[0] = tswapl(target_sigmask); + d->sig[1] = tswapl(sigmask >> 32); +#else +#error host_to_target_sigset +#endif } -void target_to_host_sigset(sigset_t *d, target_sigset_t *s) +void target_to_host_sigset(sigset_t *d, const target_sigset_t *s) { int i; - for(i = 0;i < TARGET_NSIG_WORDS; i++) { + unsigned long sigmask; + target_ulong target_sigmask; + + target_sigmask = tswapl(s->sig[0]); + sigmask = 0; + for(i = 0; i < 32; i++) { + if (target_sigmask & (1 << i)) + sigmask |= 1 << (target_to_host_signal(i + 1) - 1); + } +#if TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 32 + ((unsigned long *)d)[0] = sigmask; + for(i = 1;i < TARGET_NSIG_WORDS; i++) { ((unsigned long *)d)[i] = tswapl(s->sig[i]); } +#elif TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 64 && TARGET_NSIG_WORDS == 2 + ((unsigned long *)d)[0] = sigmask | ((unsigned long)tswapl(s->sig[1]) << 32); +#else +#error target_to_host_sigset +#endif /* TARGET_LONG_BITS */ } void host_to_target_old_sigset(target_ulong *old_sigset, const sigset_t *sigset) { - *old_sigset = tswap32(*(unsigned long *)sigset & 0xffffffff); + target_sigset_t d; + host_to_target_sigset(&d, sigset); + *old_sigset = d.sig[0]; } void target_to_host_old_sigset(sigset_t *sigset, const target_ulong *old_sigset) { - sigemptyset(sigset); - *(unsigned long *)sigset = tswapl(*old_sigset); + target_sigset_t d; + int i; + + d.sig[0] = *old_sigset; + for(i = 1;i < TARGET_NSIG_WORDS; i++) + d.sig[i] = 0; + target_to_host_sigset(sigset, &d); } /* siginfo conversion */ @@ -110,7 +188,8 @@ static inline void host_to_target_siginfo_noswap(target_siginfo_t *tinfo, tinfo->si_signo = sig; tinfo->si_errno = 0; tinfo->si_code = 0; - if (sig == SIGILL || sig == SIGFPE || sig == SIGSEGV || sig == SIGBUS) { + if (sig == SIGILL || sig == SIGFPE || sig == SIGSEGV || + sig == SIGBUS || sig == SIGTRAP) { /* should never come here, but who knows. The information for the target is irrelevant */ tinfo->_sifields._sigfault._addr = 0; @@ -131,7 +210,8 @@ static void tswap_siginfo(target_siginfo_t *tinfo, tinfo->si_signo = tswap32(sig); tinfo->si_errno = tswap32(info->si_errno); tinfo->si_code = tswap32(info->si_code); - if (sig == SIGILL || sig == SIGFPE || sig == SIGSEGV || sig == SIGBUS) { + if (sig == SIGILL || sig == SIGFPE || sig == SIGSEGV || + sig == SIGBUS || sig == SIGTRAP) { tinfo->_sifields._sigfault._addr = tswapl(info->_sifields._sigfault._addr); } else if (sig >= TARGET_SIGRTMIN) { @@ -165,15 +245,25 @@ void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo) void signal_init(void) { struct sigaction act; - int i; + int i, j; + /* generate signal conversion tables */ + for(i = 1; i <= 64; i++) { + if (host_to_target_signal_table[i] == 0) + host_to_target_signal_table[i] = i; + } + for(i = 1; i <= 64; i++) { + j = host_to_target_signal_table[i]; + target_to_host_signal_table[j] = i; + } + /* set all host signal handlers. ALL signals are blocked during the handlers to serialize them. */ sigfillset(&act.sa_mask); act.sa_flags = SA_SIGINFO; act.sa_sigaction = host_signal_handler; for(i = 1; i < NSIG; i++) { - sigaction(i, &act, NULL); + sigaction(i, &act, NULL); } memset(sigact_table, 0, sizeof(sigact_table)); @@ -316,7 +406,7 @@ static void host_signal_handler(int host_signum, siginfo_t *info, /* the CPU emulator uses some host signals to detect exceptions, we we forward to it some signals */ if (host_signum == SIGSEGV || host_signum == SIGBUS) { - if (cpu_x86_signal_handler(host_signum, info, puc)) + if (cpu_signal_handler(host_signum, info, puc)) return; } @@ -331,7 +421,7 @@ static void host_signal_handler(int host_signum, siginfo_t *info, host_to_target_siginfo_noswap(&tinfo, info); if (queue_signal(sig, &tinfo) == 1) { /* interrupt the virtual CPU as soon as possible */ - cpu_x86_interrupt(global_env); + cpu_interrupt(global_env, CPU_INTERRUPT_EXIT); } } @@ -362,6 +452,80 @@ int do_sigaction(int sig, const struct target_sigaction *act, return 0; } +#define __put_user(x,ptr)\ +({\ + int size = sizeof(*ptr);\ + switch(size) {\ + case 1:\ + stb(ptr, (typeof(*ptr))(x));\ + break;\ + case 2:\ + stw(ptr, (typeof(*ptr))(x));\ + break;\ + case 4:\ + stl(ptr, (typeof(*ptr))(x));\ + break;\ + case 8:\ + stq(ptr, (typeof(*ptr))(x));\ + break;\ + default:\ + abort();\ + }\ + 0;\ +}) + +#define __get_user(x, ptr) \ +({\ + int size = sizeof(*ptr);\ + switch(size) {\ + case 1:\ + x = (typeof(*ptr))ldub(ptr);\ + break;\ + case 2:\ + x = (typeof(*ptr))lduw(ptr);\ + break;\ + case 4:\ + x = (typeof(*ptr))ldl(ptr);\ + break;\ + case 8:\ + x = (typeof(*ptr))ldq(ptr);\ + break;\ + default:\ + abort();\ + }\ + 0;\ +}) + + +#define __copy_to_user(dst, src, size)\ +({\ + memcpy(dst, src, size);\ + 0;\ +}) + +#define __copy_from_user(dst, src, size)\ +({\ + memcpy(dst, src, size);\ + 0;\ +}) + +#define __clear_user(dst, size)\ +({\ + memset(dst, 0, size);\ + 0;\ +}) + +#ifndef offsetof +#define offsetof(type, field) ((size_t) &((type *)0)->field) +#endif + +static inline int copy_siginfo_to_user(target_siginfo_t *tinfo, + const target_siginfo_t *info) +{ + tswap_siginfo(tinfo, info); + return 0; +} + #ifdef TARGET_I386 /* from the Linux kernel */ @@ -470,44 +634,6 @@ struct rt_sigframe * Set up a signal frame. */ -#define __put_user(x,ptr)\ -({\ - int size = sizeof(*ptr);\ - switch(size) {\ - case 1:\ - stb(ptr, (typeof(*ptr))(x));\ - break;\ - case 2:\ - stw(ptr, (typeof(*ptr))(x));\ - break;\ - case 4:\ - stl(ptr, (typeof(*ptr))(x));\ - break;\ - case 8:\ - stq(ptr, (typeof(*ptr))(x));\ - break;\ - default:\ - abort();\ - }\ - 0;\ -}) - -#define get_user(val, ptr) (typeof(*ptr))(*(ptr)) - - -#define __copy_to_user(dst, src, size)\ -({\ - memcpy(dst, src, size);\ - 0;\ -}) - -static inline int copy_siginfo_to_user(target_siginfo_t *tinfo, - const target_siginfo_t *info) -{ - tswap_siginfo(tinfo, info); - return 0; -} - /* XXX: save x87 state */ static int setup_sigcontext(struct target_sigcontext *sc, struct target_fpstate *fpstate, @@ -515,10 +641,10 @@ setup_sigcontext(struct target_sigcontext *sc, struct target_fpstate *fpstate, { int err = 0; - err |= __put_user(env->segs[R_GS], (unsigned int *)&sc->gs); - err |= __put_user(env->segs[R_FS], (unsigned int *)&sc->fs); - err |= __put_user(env->segs[R_ES], (unsigned int *)&sc->es); - err |= __put_user(env->segs[R_DS], (unsigned int *)&sc->ds); + err |= __put_user(env->segs[R_GS].selector, (unsigned int *)&sc->gs); + err |= __put_user(env->segs[R_FS].selector, (unsigned int *)&sc->fs); + err |= __put_user(env->segs[R_ES].selector, (unsigned int *)&sc->es); + err |= __put_user(env->segs[R_DS].selector, (unsigned int *)&sc->ds); err |= __put_user(env->regs[R_EDI], &sc->edi); err |= __put_user(env->regs[R_ESI], &sc->esi); err |= __put_user(env->regs[R_EBP], &sc->ebp); @@ -530,22 +656,19 @@ setup_sigcontext(struct target_sigcontext *sc, struct target_fpstate *fpstate, err |= __put_user(env->exception_index, &sc->trapno); err |= __put_user(env->error_code, &sc->err); err |= __put_user(env->eip, &sc->eip); - err |= __put_user(env->segs[R_CS], (unsigned int *)&sc->cs); + err |= __put_user(env->segs[R_CS].selector, (unsigned int *)&sc->cs); err |= __put_user(env->eflags, &sc->eflags); err |= __put_user(env->regs[R_ESP], &sc->esp_at_signal); - err |= __put_user(env->segs[R_SS], (unsigned int *)&sc->ss); -#if 0 - tmp = save_i387(fpstate); - if (tmp < 0) - err = 1; - else - err |= __put_user(tmp ? fpstate : NULL, &sc->fpstate); -#else - err |= __put_user(0, &sc->fpstate); -#endif + err |= __put_user(env->segs[R_SS].selector, (unsigned int *)&sc->ss); + + cpu_x86_fsave(env, (void *)fpstate, 1); + fpstate->status = fpstate->sw; + err |= __put_user(0xffff, &fpstate->magic); + err |= __put_user(fpstate, &sc->fpstate); + /* non-iBCS2 extensions.. */ err |= __put_user(mask, &sc->oldmask); - err |= __put_user(/*current->thread.cr2*/ 0, &sc->cr2); + err |= __put_user(env->cr[2], &sc->cr2); return err; } @@ -568,13 +691,14 @@ get_sigframe(struct emulated_sigaction *ka, CPUX86State *env, size_t frame_size) } /* This is the legacy signal stack switching. */ - else if ((regs->xss & 0xffff) != __USER_DS && - !(ka->sa.sa_flags & SA_RESTORER) && - ka->sa.sa_restorer) { - esp = (unsigned long) ka->sa.sa_restorer; - } + else #endif - return (void *)((esp - frame_size) & -8ul); + if ((env->segs[R_SS].selector & 0xffff) != __USER_DS && + !(ka->sa.sa_flags & TARGET_SA_RESTORER) && + ka->sa.sa_restorer) { + esp = (unsigned long) ka->sa.sa_restorer; + } + return (void *)((esp - frame_size) & -8ul); } static void setup_frame(int sig, struct emulated_sigaction *ka, @@ -719,25 +843,6 @@ restore_sigcontext(CPUX86State *env, struct target_sigcontext *sc, int *peax) { unsigned int err = 0; - - -#define COPY(x) err |= __get_user(regs->x, &sc->x) - -#define COPY_SEG(seg) \ - { unsigned short tmp; \ - err |= __get_user(tmp, &sc->seg); \ - regs->x##seg = tmp; } - -#define COPY_SEG_STRICT(seg) \ - { unsigned short tmp; \ - err |= __get_user(tmp, &sc->seg); \ - regs->x##seg = tmp|3; } - -#define GET_SEG(seg) \ - { unsigned short tmp; \ - err |= __get_user(tmp, &sc->seg); \ - loadsegment(seg,tmp); } - cpu_x86_load_seg(env, R_GS, lduw(&sc->gs)); cpu_x86_load_seg(env, R_FS, lduw(&sc->fs)); cpu_x86_load_seg(env, R_ES, lduw(&sc->es)); @@ -762,17 +867,18 @@ restore_sigcontext(CPUX86State *env, struct target_sigcontext *sc, int *peax) // regs->orig_eax = -1; /* disable syscall checks */ } -#if 0 { struct _fpstate * buf; - err |= __get_user(buf, &sc->fpstate); + buf = (void *)ldl(&sc->fpstate); if (buf) { +#if 0 if (verify_area(VERIFY_READ, buf, sizeof(*buf))) goto badframe; - err |= restore_i387(buf); +#endif + cpu_x86_frstor(env, (void *)buf, 1); } } -#endif + *peax = ldl(&sc->eax); return err; #if 0 @@ -788,6 +894,9 @@ long do_sigreturn(CPUX86State *env) sigset_t set; int eax, i; +#if defined(DEBUG_SIGNAL) + fprintf(stderr, "do_sigreturn\n"); +#endif /* set blocked signals */ target_set.sig[0] = frame->sc.oldmask; for(i = 1; i < TARGET_NSIG_WORDS; i++) @@ -840,6 +949,404 @@ badframe: return 0; } +#elif defined(TARGET_ARM) + +struct target_sigcontext { + target_ulong trap_no; + target_ulong error_code; + target_ulong oldmask; + target_ulong arm_r0; + target_ulong arm_r1; + target_ulong arm_r2; + target_ulong arm_r3; + target_ulong arm_r4; + target_ulong arm_r5; + target_ulong arm_r6; + target_ulong arm_r7; + target_ulong arm_r8; + target_ulong arm_r9; + target_ulong arm_r10; + target_ulong arm_fp; + target_ulong arm_ip; + target_ulong arm_sp; + target_ulong arm_lr; + target_ulong arm_pc; + target_ulong arm_cpsr; + target_ulong fault_address; +}; + +typedef struct target_sigaltstack { + target_ulong ss_sp; + int ss_flags; + target_ulong ss_size; +} target_stack_t; + +struct target_ucontext { + target_ulong uc_flags; + target_ulong uc_link; + target_stack_t uc_stack; + struct target_sigcontext uc_mcontext; + target_sigset_t uc_sigmask; /* mask last for extensibility */ +}; + +struct sigframe +{ + struct target_sigcontext sc; + target_ulong extramask[TARGET_NSIG_WORDS-1]; + target_ulong retcode; +}; + +struct rt_sigframe +{ + struct target_siginfo *pinfo; + void *puc; + struct target_siginfo info; + struct target_ucontext uc; + target_ulong retcode; +}; + +#define TARGET_CONFIG_CPU_32 1 + +/* + * For ARM syscalls, we encode the syscall number into the instruction. + */ +#define SWI_SYS_SIGRETURN (0xef000000|(TARGET_NR_sigreturn + ARM_SYSCALL_BASE)) +#define SWI_SYS_RT_SIGRETURN (0xef000000|(TARGET_NR_rt_sigreturn + ARM_SYSCALL_BASE)) + +/* + * For Thumb syscalls, we pass the syscall number via r7. We therefore + * need two 16-bit instructions. + */ +#define SWI_THUMB_SIGRETURN (0xdf00 << 16 | 0x2700 | (TARGET_NR_sigreturn)) +#define SWI_THUMB_RT_SIGRETURN (0xdf00 << 16 | 0x2700 | (TARGET_NR_rt_sigreturn)) + +static const target_ulong retcodes[4] = { + SWI_SYS_SIGRETURN, SWI_THUMB_SIGRETURN, + SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN +}; + + +#define __put_user_error(x,p,e) __put_user(x, p) +#define __get_user_error(x,p,e) __get_user(x, p) + +static inline int valid_user_regs(CPUState *regs) +{ + return 1; +} + +static int +setup_sigcontext(struct target_sigcontext *sc, /*struct _fpstate *fpstate,*/ + CPUState *env, unsigned long mask) +{ + int err = 0; + + __put_user_error(env->regs[0], &sc->arm_r0, err); + __put_user_error(env->regs[1], &sc->arm_r1, err); + __put_user_error(env->regs[2], &sc->arm_r2, err); + __put_user_error(env->regs[3], &sc->arm_r3, err); + __put_user_error(env->regs[4], &sc->arm_r4, err); + __put_user_error(env->regs[5], &sc->arm_r5, err); + __put_user_error(env->regs[6], &sc->arm_r6, err); + __put_user_error(env->regs[7], &sc->arm_r7, err); + __put_user_error(env->regs[8], &sc->arm_r8, err); + __put_user_error(env->regs[9], &sc->arm_r9, err); + __put_user_error(env->regs[10], &sc->arm_r10, err); + __put_user_error(env->regs[11], &sc->arm_fp, err); + __put_user_error(env->regs[12], &sc->arm_ip, err); + __put_user_error(env->regs[13], &sc->arm_sp, err); + __put_user_error(env->regs[14], &sc->arm_lr, err); + __put_user_error(env->regs[15], &sc->arm_pc, err); +#ifdef TARGET_CONFIG_CPU_32 + __put_user_error(env->cpsr, &sc->arm_cpsr, err); +#endif + + __put_user_error(/* current->thread.trap_no */ 0, &sc->trap_no, err); + __put_user_error(/* current->thread.error_code */ 0, &sc->error_code, err); + __put_user_error(/* current->thread.address */ 0, &sc->fault_address, err); + __put_user_error(mask, &sc->oldmask, err); + + return err; +} + +static inline void * +get_sigframe(struct emulated_sigaction *ka, CPUState *regs, int framesize) +{ + unsigned long sp = regs->regs[13]; + +#if 0 + /* + * This is the X/Open sanctioned signal stack switching. + */ + if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp)) + sp = current->sas_ss_sp + current->sas_ss_size; +#endif + /* + * ATPCS B01 mandates 8-byte alignment + */ + return (void *)((sp - framesize) & ~7); +} + +static int +setup_return(CPUState *env, struct emulated_sigaction *ka, + target_ulong *rc, void *frame, int usig) +{ + target_ulong handler = (target_ulong)ka->sa._sa_handler; + target_ulong retcode; + int thumb = 0; +#if defined(TARGET_CONFIG_CPU_32) + target_ulong cpsr = env->cpsr; + +#if 0 + /* + * Maybe we need to deliver a 32-bit signal to a 26-bit task. + */ + if (ka->sa.sa_flags & SA_THIRTYTWO) + cpsr = (cpsr & ~MODE_MASK) | USR_MODE; + +#ifdef CONFIG_ARM_THUMB + if (elf_hwcap & HWCAP_THUMB) { + /* + * The LSB of the handler determines if we're going to + * be using THUMB or ARM mode for this signal handler. + */ + thumb = handler & 1; + + if (thumb) + cpsr |= T_BIT; + else + cpsr &= ~T_BIT; + } +#endif +#endif +#endif /* TARGET_CONFIG_CPU_32 */ + + if (ka->sa.sa_flags & TARGET_SA_RESTORER) { + retcode = (target_ulong)ka->sa.sa_restorer; + } else { + unsigned int idx = thumb; + + if (ka->sa.sa_flags & TARGET_SA_SIGINFO) + idx += 2; + + if (__put_user(retcodes[idx], rc)) + return 1; +#if 0 + flush_icache_range((target_ulong)rc, + (target_ulong)(rc + 1)); +#endif + retcode = ((target_ulong)rc) + thumb; + } + + env->regs[0] = usig; + env->regs[13] = (target_ulong)frame; + env->regs[14] = retcode; + env->regs[15] = handler & (thumb ? ~1 : ~3); + +#ifdef TARGET_CONFIG_CPU_32 + env->cpsr = cpsr; +#endif + + return 0; +} + +static void setup_frame(int usig, struct emulated_sigaction *ka, + target_sigset_t *set, CPUState *regs) +{ + struct sigframe *frame = get_sigframe(ka, regs, sizeof(*frame)); + int err = 0; + + err |= setup_sigcontext(&frame->sc, /*&frame->fpstate,*/ regs, set->sig[0]); + + if (TARGET_NSIG_WORDS > 1) { + err |= __copy_to_user(frame->extramask, &set->sig[1], + sizeof(frame->extramask)); + } + + if (err == 0) + err = setup_return(regs, ka, &frame->retcode, frame, usig); + // return err; +} + +static void setup_rt_frame(int usig, struct emulated_sigaction *ka, + target_siginfo_t *info, + target_sigset_t *set, CPUState *env) +{ + struct rt_sigframe *frame = get_sigframe(ka, env, sizeof(*frame)); + int err = 0; + +#if 0 + if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame))) + return 1; +#endif + __put_user_error(&frame->info, (target_ulong *)&frame->pinfo, err); + __put_user_error(&frame->uc, (target_ulong *)&frame->puc, err); + err |= copy_siginfo_to_user(&frame->info, info); + + /* Clear all the bits of the ucontext we don't use. */ + err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext)); + + err |= setup_sigcontext(&frame->uc.uc_mcontext, /*&frame->fpstate,*/ + env, set->sig[0]); + err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); + + if (err == 0) + err = setup_return(env, ka, &frame->retcode, frame, usig); + + if (err == 0) { + /* + * For realtime signals we must also set the second and third + * arguments for the signal handler. + * -- Peter Maydell 2000-12-06 + */ + env->regs[1] = (target_ulong)frame->pinfo; + env->regs[2] = (target_ulong)frame->puc; + } + + // return err; +} + +static int +restore_sigcontext(CPUState *env, struct target_sigcontext *sc) +{ + int err = 0; + + __get_user_error(env->regs[0], &sc->arm_r0, err); + __get_user_error(env->regs[1], &sc->arm_r1, err); + __get_user_error(env->regs[2], &sc->arm_r2, err); + __get_user_error(env->regs[3], &sc->arm_r3, err); + __get_user_error(env->regs[4], &sc->arm_r4, err); + __get_user_error(env->regs[5], &sc->arm_r5, err); + __get_user_error(env->regs[6], &sc->arm_r6, err); + __get_user_error(env->regs[7], &sc->arm_r7, err); + __get_user_error(env->regs[8], &sc->arm_r8, err); + __get_user_error(env->regs[9], &sc->arm_r9, err); + __get_user_error(env->regs[10], &sc->arm_r10, err); + __get_user_error(env->regs[11], &sc->arm_fp, err); + __get_user_error(env->regs[12], &sc->arm_ip, err); + __get_user_error(env->regs[13], &sc->arm_sp, err); + __get_user_error(env->regs[14], &sc->arm_lr, err); + __get_user_error(env->regs[15], &sc->arm_pc, err); +#ifdef TARGET_CONFIG_CPU_32 + __get_user_error(env->cpsr, &sc->arm_cpsr, err); +#endif + + err |= !valid_user_regs(env); + + return err; +} + +long do_sigreturn(CPUState *env) +{ + struct sigframe *frame; + target_sigset_t set; + sigset_t host_set; + + /* + * Since we stacked the signal on a 64-bit boundary, + * then 'sp' should be word aligned here. If it's + * not, then the user is trying to mess with us. + */ + if (env->regs[13] & 7) + goto badframe; + + frame = (struct sigframe *)env->regs[13]; + +#if 0 + if (verify_area(VERIFY_READ, frame, sizeof (*frame))) + goto badframe; +#endif + if (__get_user(set.sig[0], &frame->sc.oldmask) + || (TARGET_NSIG_WORDS > 1 + && __copy_from_user(&set.sig[1], &frame->extramask, + sizeof(frame->extramask)))) + goto badframe; + + target_to_host_sigset(&host_set, &set); + sigprocmask(SIG_SETMASK, &host_set, NULL); + + if (restore_sigcontext(env, &frame->sc)) + goto badframe; + +#if 0 + /* Send SIGTRAP if we're single-stepping */ + if (ptrace_cancel_bpt(current)) + send_sig(SIGTRAP, current, 1); +#endif + return env->regs[0]; + +badframe: + force_sig(SIGSEGV /* , current */); + return 0; +} + +long do_rt_sigreturn(CPUState *env) +{ + struct rt_sigframe *frame; + target_sigset_t set; + sigset_t host_set; + + /* + * Since we stacked the signal on a 64-bit boundary, + * then 'sp' should be word aligned here. If it's + * not, then the user is trying to mess with us. + */ + if (env->regs[13] & 7) + goto badframe; + + frame = (struct rt_sigframe *)env->regs[13]; + +#if 0 + if (verify_area(VERIFY_READ, frame, sizeof (*frame))) + goto badframe; +#endif + if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) + goto badframe; + + target_to_host_sigset(&host_set, &set); + sigprocmask(SIG_SETMASK, &host_set, NULL); + + if (restore_sigcontext(env, &frame->uc.uc_mcontext)) + goto badframe; + +#if 0 + /* Send SIGTRAP if we're single-stepping */ + if (ptrace_cancel_bpt(current)) + send_sig(SIGTRAP, current, 1); +#endif + return env->regs[0]; + +badframe: + force_sig(SIGSEGV /* , current */); + return 0; +} + +#else + +static void setup_frame(int sig, struct emulated_sigaction *ka, + target_sigset_t *set, CPUState *env) +{ + fprintf(stderr, "setup_frame: not implemented\n"); +} + +static void setup_rt_frame(int sig, struct emulated_sigaction *ka, + target_siginfo_t *info, + target_sigset_t *set, CPUState *env) +{ + fprintf(stderr, "setup_rt_frame: not implemented\n"); +} + +long do_sigreturn(CPUState *env) +{ + fprintf(stderr, "do_sigreturn: not implemented\n"); + return -ENOSYS; +} + +long do_rt_sigreturn(CPUState *env) +{ + fprintf(stderr, "do_rt_sigreturn: not implemented\n"); + return -ENOSYS; +} + #endif void process_pending_signals(void *cpu_env)