From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 21:16:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2AD421065673; Sat,  1 Nov 2008 21:16:04 +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 E2FAC1065670
	for <perforce@freebsd.org>; Sat,  1 Nov 2008 21:16:03 +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 9E50C8FC13
	for <perforce@freebsd.org>; Sat,  1 Nov 2008 21:16:03 +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 mA1LG3ks032137
	for <perforce@freebsd.org>; Sat, 1 Nov 2008 21:16:03 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1LG3WY032135
	for perforce@freebsd.org; Sat, 1 Nov 2008 21:16:03 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 21:16:03 GMT
Message-Id: <200811012116.mA1LG3WY032135@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 152328 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 21:16:04 -0000

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

Change 152328 by peter@peter_overcee on 2008/11/01 21:16:03

	Fix warnings on i386.  The UCONTEXT macros return 'long'
	all platforms except i386-freebsd, so that upset some printf
	strings.  Cast them to long (instead of int) for freebsd rather
	than adding ifdefs to ``MI'' code.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 edit
.. //depot/projects/valgrind/coregrind/m_signals.c#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 (text+ko) ====

@@ -37,7 +37,7 @@
 void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
                                   const ThreadArchState* arch);
 
-#if defined(VGP_x86_linux)
+#if defined(VGP_x86_linux) || defined(VGP_x86_freebsd)
 void ML_(fill_elffpxregs_from_tst)(vki_elf_fpxregset_t* xfpu,
                                    const ThreadArchState* arch);
 #endif

==== //depot/projects/valgrind/coregrind/m_signals.c#8 (text+ko) ====

@@ -307,10 +307,10 @@
    }
 
 #elif defined(VGP_x86_freebsd)
-#  define VG_UCONTEXT_INSTR_PTR(uc)       ((uc)->uc_mcontext.eip)
-#  define VG_UCONTEXT_STACK_PTR(uc)       ((uc)->uc_mcontext.esp)
-#  define VG_UCONTEXT_FRAME_PTR(uc)       ((uc)->uc_mcontext.ebp)
-#  define VG_UCONTEXT_SYSCALL_NUM(uc)     ((uc)->uc_mcontext.eax)
+#  define VG_UCONTEXT_INSTR_PTR(uc)       ((UWord)(uc)->uc_mcontext.eip)
+#  define VG_UCONTEXT_STACK_PTR(uc)       ((UWord)(uc)->uc_mcontext.esp)
+#  define VG_UCONTEXT_FRAME_PTR(uc)       ((UWord)(uc)->uc_mcontext.ebp)
+#  define VG_UCONTEXT_SYSCALL_NUM(uc)     ((UWord)(uc)->uc_mcontext.eax)
 #  define VG_UCONTEXT_SYSCALL_SYSRES(uc)                        \
       /* Convert the value in uc_mcontext.eax into a SysRes. */ \
       VG_(mk_SysRes_x86_freebsd)( (uc)->uc_mcontext.eax, \