From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 04:10:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07EBA106568E; Fri,  7 Nov 2008 04:10:58 +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 BF90C1065676
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 04:10:57 +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 AEAA68FC14
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 04:10:57 +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 mA74AvZd077712
	for <perforce@freebsd.org>; Fri, 7 Nov 2008 04:10:57 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA74AvPu077710
	for perforce@freebsd.org; Fri, 7 Nov 2008 04:10:57 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 7 Nov 2008 04:10:57 GMT
Message-Id: <200811070410.mA74AvPu077710@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 152611 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: Fri, 07 Nov 2008 04:10:58 -0000

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

Change 152611 by peter@peter_hammer on 2008/11/07 04:10:50

	Make this compile on 32 bit again

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#29 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#13 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#29 (text+ko) ====

@@ -172,7 +172,7 @@
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
          "movl	%2, %%eax\n"    /* set %eax = __NR_thr_exit */
-         "leaq	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
+         "leal	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
 	 "pushl	%%ebx\n"	/* arg on stack */
 	 "pushl	%%ebx\n"	/* fake return address */
          "int	$0x80\n"	/* thr_exit(&tst->os_state.exitcode) */

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#13 (text+ko) ====

@@ -267,10 +267,10 @@
 #if defined(VGP_x86_freebsd)
    /* On FreeBSD, the success/fail status is returned */
    if (err == 1) {
-      LibVEX_Guestx86_put_eflag_c(1, &tst->arch.vex);
+      LibVEX_GuestX86_put_eflag_c(1, &tst->arch.vex);
       err = 0;
    } else {
-      LibVEX_Guestx86_put_eflag_c(0, &tst->arch.vex);
+      LibVEX_GuestX86_put_eflag_c(0, &tst->arch.vex);
    }
 #elif defined(VGP_amd64_freebsd)
    if (err == 1) {
@@ -1635,9 +1635,9 @@
 	 and still has to be fixed up here. */
       if (!(sci->flags & SfNoWriteResult)) {
         if (sres.isError)
-           LibVEX_Guestx86_put_eflag_c(1, &th_regs->vex);
+           LibVEX_GuestX86_put_eflag_c(1, &th_regs->vex);
         else
-           LibVEX_Guestx86_put_eflag_c(0, &th_regs->vex);
+           LibVEX_GuestX86_put_eflag_c(0, &th_regs->vex);
       }
 #elif defined(VGP_amd64_freebsd)
       if (!(sci->flags & SfNoWriteResult)) {