From owner-p4-projects@FreeBSD.ORG  Sun Nov  2 02:41:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C845106567E; Sun,  2 Nov 2008 02:41:35 +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 E4CDC1065676
	for <perforce@freebsd.org>; Sun,  2 Nov 2008 02:41: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 D29E08FC08
	for <perforce@freebsd.org>; Sun,  2 Nov 2008 02:41: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 mA22fYxf076393
	for <perforce@freebsd.org>; Sun, 2 Nov 2008 02:41:34 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA22fYYh076391
	for perforce@freebsd.org; Sun, 2 Nov 2008 02:41:34 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sun, 2 Nov 2008 02:41:34 GMT
Message-Id: <200811020241.mA22fYYh076391@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 152342 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: Sun, 02 Nov 2008 02:41:35 -0000

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

Change 152342 by peter@peter_overcee on 2008/11/02 02:41:09

	Oops.  In the error case, return sres.err, not sres.res in %EAX/RAX.
	(Fallout from the AIX port restructuring changes)

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#11 edit

Differences ...

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

@@ -647,22 +647,24 @@
 #elif defined(VGP_x86_freebsd)
    VexGuestX86State* gst = (VexGuestX86State*)gst_vanilla;
    vg_assert(canonical->what == SsComplete);
-   gst->guest_EAX = canonical->sres.res;
-   gst->guest_EDX = canonical->sres.res2;
    if (canonical->sres.isError) {
+      gst->guest_EAX = canonical->sres.err;
       LibVEX_GuestX86_put_eflag_c( 1, gst );
    } else {
+      gst->guest_EAX = canonical->sres.res;
+      gst->guest_EDX = canonical->sres.res2;
       LibVEX_GuestX86_put_eflag_c( 0, gst );
    }
 
 #elif defined(VGP_amd64_freebsd)
    VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla;
    vg_assert(canonical->what == SsComplete);
-   gst->guest_RAX = canonical->sres.res;
-   gst->guest_RDX = canonical->sres.res2;
    if (canonical->sres.isError) {
+      gst->guest_RAX = canonical->sres.err;
       LibVEX_GuestAMD64_put_rflag_c( 1, gst );
    } else {
+      gst->guest_RAX = canonical->sres.res;
+      gst->guest_RDX = canonical->sres.res2;
       LibVEX_GuestAMD64_put_rflag_c( 0, gst );
    }