On Tue, Oct 26, 2021 at 12:07 AM Kyle Evans <kev...@freebsd.org> wrote:
> On Tue, Oct 19, 2021 at 11:45 AM Warner Losh <i...@bsdimp.com> wrote:
> >
> > Arm specific user context structures for signal handling and the closely
> > related trap frame.
> >
> > Signed-off-by: Stacey Son <s...@freebsd.org>
> > Signed-off-by: Warner Losh <i...@bsdimp.com>
> > ---
> > bsd-user/arm/target_arch_signal.h | 38 +++++++++++++++++++++++++++++++
> > 1 file changed, 38 insertions(+)
> >
> > diff --git a/bsd-user/arm/target_arch_signal.h
> b/bsd-user/arm/target_arch_signal.h
> > index 9fee58ca9c..67355ff28f 100644
> > --- a/bsd-user/arm/target_arch_signal.h
> > +++ b/bsd-user/arm/target_arch_signal.h
> > @@ -90,4 +90,42 @@ typedef struct target_mcontext {
> > } __fpu;
> > } target_mcontext_t;
> >
> > +typedef struct target_ucontext {
> > + target_sigset_t uc_sigmask;
> > + target_mcontext_t uc_mcontext;
> > + abi_ulong uc_link;
> > + target_stack_t uc_stack;
> > + int32_t uc_flags;
> > + int32_t __spare__[4];
> > +} target_ucontext_t;
> > +
> > +struct target_sigframe {
> > + target_siginfo_t sf_si; /* saved siginfo */
> > + target_ucontext_t sf_uc; /* saved ucontext */
> > +};
> > +
> > +
>
> We might be able to kill this extra newline? I'm not familiar enough
> with qemu's style preferences here...
>
done.
> > +/* compare to sys/arm/include/frame.h */
> > +struct target_trapframe {
> > + abi_ulong tf_spsr; /* Zero on arm26 */
> > + abi_ulong tf_r0;
> > + abi_ulong tf_r1;
> > + abi_ulong tf_r2;
> > + abi_ulong tf_r3;
> > + abi_ulong tf_r4;
> > + abi_ulong tf_r5;
> > + abi_ulong tf_r6;
> > + abi_ulong tf_r7;
> > + abi_ulong tf_r8;
> > + abi_ulong tf_r9;
> > + abi_ulong tf_r10;
> > + abi_ulong tf_r11;
> > + abi_ulong tf_r12;
> > + abi_ulong tf_usr_sp;
> > + abi_ulong tf_usr_lr;
> > + abi_ulong tf_svc_sp; /* Not used on arm26 */
> > + abi_ulong tf_svc_lr; /* Not used on arm26 */
> > + abi_ulong tf_pc;
> > +};
> > +
> > #endif /* !_TARGET_ARCH_SIGNAL_H_ */
> > --
> > 2.32.0
> >
>
> I didn't think we actually supported arm26, but I see those comments
> also exist verbatim in machine/frame.h; no objection to reflecting
> them here, as well.
>
Removed. I'll prep a commit for the fork too and remove them from FreeBSD
since they have never been relevant.
> Reviewed-by: Kyle Evans <kev...@freebsd.org>
>
Thanks!
