From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 18:48:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4E44A1065679; Sat,  1 Nov 2008 18:48:34 +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 123071065673
	for <perforce@freebsd.org>; Sat,  1 Nov 2008 18:48:34 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 00DCE8FC0A
	for <perforce@freebsd.org>; Sat,  1 Nov 2008 18:48:34 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1ImX1C007595
	for <perforce@freebsd.org>; Sat, 1 Nov 2008 18:48:33 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1ImXWl007593
	for perforce@freebsd.org; Sat, 1 Nov 2008 18:48:33 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 18:48:33 GMT
Message-Id: <200811011848.mA1ImXWl007593@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152323 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Nov 2008 18:48:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=152323

Change 152323 by peter@peter_overcee on 2008/11/01 18:48:28

	Give in and try an explicitly unaligned bitfield in sigaction.  This
	is to work around other signal mask problems elsewhere because valgrind
	likes to assume that (UWord) == bitfield container (eg: m_libcsignal.c)

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#5 edit
.. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#4 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#5 (text+ko) ====

@@ -63,12 +63,12 @@
 #define VKI_SIG_IGN	((__vki_sighandler_t)1)	/* ignore signal */
 
 #define _VKI_NSIG	128
-#define _VKI_NSIG_BPW	32
+#define _VKI_NSIG_BPW	64
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* 32 bit words, even on amd64 - is not long aligned. */
+/* Beware, not longword aligned in struct sigaction */
 typedef struct {
-	vki_uint32_t sig[_VKI_NSIG_WORDS];
+	vki_uint64_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;
 
 #define VKI_SIGHUP		 1
@@ -124,7 +124,8 @@
 struct vki_sigaction {
 	__vki_sighandler_t ksa_handler;
 	unsigned int sa_flags;
-	vki_sigset_t sa_mask;		/* mask last for extensibility */
+	vki_sigset_t sa_mask __attribute__((__packed__));
+	unsigned int __sa_pad;
 };
 
 typedef struct vki_sigaltstack {

==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#4 (text+ko) ====

@@ -66,7 +66,6 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;