From owner-p4-projects@FreeBSD.ORG Sat May 16 09:15:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16E801065675; Sat, 16 May 2009 09:15:41 +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 C9208106566B for ; Sat, 16 May 2009 09:15:40 +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 B70318FC18 for ; Sat, 16 May 2009 09:15:40 +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 n4G9Fe9Q078031 for ; Sat, 16 May 2009 09:15:40 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4G9FeMb078029 for perforce@freebsd.org; Sat, 16 May 2009 09:15:40 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 09:15:40 GMT Message-Id: <200905160915.n4G9FeMb078029@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 162148 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 09:15:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=162148 Change 162148 by lulf@lulf_carrot on 2009/05/16 09:14:49 - Try using the reg structure instead, as it is simpler, and see how far we can get before it might prove a bad choice. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/signal.h#3 edit .. //depot/projects/avr32/src/sys/avr32/include/ucontext.h#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/signal.h#3 (text+ko) ==== @@ -41,6 +41,8 @@ #if __BSD_VISIBLE +#include + struct sigcontext { /* * The fields following 'sc_mask' must match the definition @@ -50,11 +52,7 @@ */ __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 */ + struct reg sc_regs; /* Context registers. */ int xxx[8]; /* XXX reserved */ }; ==== //depot/projects/avr32/src/sys/avr32/include/ucontext.h#3 (text+ko) ==== @@ -39,6 +39,8 @@ #ifndef _MACHINE_MCONTEXT_H_ #define _MACHINE_MCONTEXT_H_ +#include + typedef struct { /* * These fields must match the corresponding fields in struct @@ -46,11 +48,7 @@ * 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 */ + struct reg mc_regs; /* Context registers. */ int __spare__[8]; /* XXX reserved */ } mcontext_t;