From owner-p4-projects@FreeBSD.ORG Sat May 16 08:53:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D17D31065670; Sat, 16 May 2009 08:53:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9192D106566B for ; Sat, 16 May 2009 08:53:17 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F5DC8FC13 for ; Sat, 16 May 2009 08:53:17 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4G8rHB4075250 for ; Sat, 16 May 2009 08:53:17 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G8rHtN075248 for perforce@freebsd.org; Sat, 16 May 2009 08:53:17 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 08:53:17 GMT Message-Id: <200905160853.n4G8rHtN075248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 162147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 08:53:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=162147 Change 162147 by lulf@lulf_carrot on 2009/05/16 08:53:06 - Populate sigcontext and mcontext structs. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/signal.h#2 edit .. //depot/projects/avr32/src/sys/avr32/include/ucontext.h#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/signal.h#2 (text+ko) ==== @@ -42,6 +42,20 @@ #if __BSD_VISIBLE struct sigcontext { + /* + * The fields following 'sc_mask' must match the definition + * of struct __mcontext. That way we can support + * struct sigcontext and ucontext_t at the same + * time. + */ + __sigset_t sc_mask; /* signal mask to restore */ + int sc_onstack; /* sigstack state to restore */ + __register_t sc_pc; /* Pc at time of signal. */ + __register_t sc_sr; /* Status register. */ + __register_t sc_sp; /* Original stack pointer. */ + __register_t sc_lr; /* Return reg. */ + __register_t sc_regs[13]; /* Processor registers 0 to 12 */ + int xxx[8]; /* XXX reserved */ }; #endif ==== //depot/projects/avr32/src/sys/avr32/include/ucontext.h#2 (text+ko) ==== @@ -40,7 +40,18 @@ #define _MACHINE_MCONTEXT_H_ typedef struct { - + /* + * These fields must match the corresponding fields in struct + * sigcontext which follow 'sc_mask'. That way we can support + * struct sigcontext and ucontext_t at the same time. + */ + int mc_onstack; /* sigstack state to restore */ + register_t mc_pc; /* Pc at time of signal. */ + register_t mc_sr; /* Status register. */ + register_t mc_sp; /* Original stack pointer. */ + register_t mc_lr; /* Return reg. */ + register_t mc_regs[13]; /* Processor registers 0 to 12 */ + int __spare__[8]; /* XXX reserved */ } mcontext_t; #endif /* !_MACHINE_MCONTEXT_H_ */