提交 f711df67 编写于 作者: R Richard Henderson 提交者: Edgar E. Iglesias

microblaze: target-ify target_ucontext

Rename the members of target_ucontext so that they don't conflict
with possible host macros for ucontext members.  This has already
been done for the other targets.
Signed-off-by: NRichard Henderson <rth@twiddle.net>
Signed-off-by: NEdgar E. Iglesias <edgar@axis.com>
上级 4e02d460
...@@ -3071,11 +3071,11 @@ struct target_stack_t { ...@@ -3071,11 +3071,11 @@ struct target_stack_t {
}; };
struct target_ucontext { struct target_ucontext {
abi_ulong uc_flags; abi_ulong tuc_flags;
abi_ulong uc_link; abi_ulong tuc_link;
struct target_stack_t uc_stack; struct target_stack_t tuc_stack;
struct target_sigcontext sc; struct target_sigcontext tuc_mcontext;
uint32_t extramask[TARGET_NSIG_WORDS - 1]; uint32_t tuc_extramask[TARGET_NSIG_WORDS - 1];
}; };
/* Signal frames. */ /* Signal frames. */
...@@ -3189,7 +3189,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -3189,7 +3189,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.sc.oldmask); err |= __put_user(set->sig[0], &frame->uc.tuc_mcontext.oldmask);
if (err) if (err)
goto badframe; goto badframe;
...@@ -3198,7 +3198,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, ...@@ -3198,7 +3198,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
goto badframe; goto badframe;
} }
setup_sigcontext(&frame->uc.sc, env); setup_sigcontext(&frame->uc.tuc_mcontext, env);
/* 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. */
...@@ -3261,7 +3261,7 @@ long do_sigreturn(CPUState *env) ...@@ -3261,7 +3261,7 @@ long do_sigreturn(CPUState *env)
goto badframe; goto badframe;
/* Restore blocked signals */ /* Restore blocked signals */
if (__get_user(target_set.sig[0], &frame->uc.sc.oldmask)) if (__get_user(target_set.sig[0], &frame->uc.tuc_mcontext.oldmask))
goto badframe; goto badframe;
for(i = 1; i < TARGET_NSIG_WORDS; i++) { for(i = 1; i < TARGET_NSIG_WORDS; i++) {
if (__get_user(target_set.sig[i], &frame->extramask[i - 1])) if (__get_user(target_set.sig[i], &frame->extramask[i - 1]))
...@@ -3270,7 +3270,7 @@ long do_sigreturn(CPUState *env) ...@@ -3270,7 +3270,7 @@ long do_sigreturn(CPUState *env)
target_to_host_sigset_internal(&set, &target_set); target_to_host_sigset_internal(&set, &target_set);
sigprocmask(SIG_SETMASK, &set, NULL); sigprocmask(SIG_SETMASK, &set, NULL);
restore_sigcontext(&frame->uc.sc, env); restore_sigcontext(&frame->uc.tuc_mcontext, env);
/* We got here through a sigreturn syscall, our path back is via an /* We got here through a sigreturn syscall, our path back is via an
rtb insn so setup r14 for that. */ rtb insn so setup r14 for that. */
env->regs[14] = env->sregs[SR_PC]; env->regs[14] = env->sregs[SR_PC];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册