From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 08:04:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 56BBD1065673; Tue, 11 Nov 2008 08:04:09 +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 1174B1065677
	for <perforce@freebsd.org>; Tue, 11 Nov 2008 08:04:09 +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 EA3A58FC1E
	for <perforce@freebsd.org>; Tue, 11 Nov 2008 08:04:08 +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 mAB848Ai020856
	for <perforce@freebsd.org>; Tue, 11 Nov 2008 08:04:08 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAB848dc020854
	for perforce@freebsd.org; Tue, 11 Nov 2008 08:04:08 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Tue, 11 Nov 2008 08:04:08 GMT
Message-Id: <200811110804.mAB848dc020854@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 152800 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: Tue, 11 Nov 2008 08:04:09 -0000

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

Change 152800 by peter@peter_freefall on 2008/11/11 08:03:33

	Get a little closer to 32 bit libthr functionality.  Put the client's startup
	args on the correct stack.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#14 edit

Differences ...

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

@@ -355,15 +355,15 @@
    VG_(sigprocmask)(VKI_SIG_SETMASK, &blockall, &savedmask);
 
    /* Set the client state for scheduler to run libthr's trampoline */
-   ctst->arch.vex.guest_ESP = (Addr)tp.stack_base + tp.stack_size - 4;
+   ctst->arch.vex.guest_ESP = (Addr)tp.stack_base + tp.stack_size - 8;
    ctst->arch.vex.guest_EIP = (Addr)tp.start_func;
+   *(UWord *)(ctst->arch.vex.guest_ESP + 4) = (UWord)tp.arg;	/* Client arg */
+   *(UWord *)(ctst->arch.vex.guest_ESP + 0) = 0;		/* fake return addr */
 
    /* Set up valgrind's trampoline on its own stack */
    stk = ML_(allocstack)(ctid);
    tp.stack_base = (void *)ctst->os_state.valgrind_stack_base;
    tp.stack_size = (Addr)stk - (Addr)tp.stack_base;
-   *(UWord *)(stk - 4) = (UWord)tp.arg;	/* Client arg */
-   *(UWord *)(stk - 8) = 0xdeadc0de;	/* fake return addr */
    /* This is for thr_new() to run valgrind's trampoline */
    tp.start_func = (void *)ML_(start_thread_NORETURN);
    tp.arg = &VG_(threads)[ctid];
@@ -383,6 +383,7 @@
 
       POST_MEM_WRITE((Addr)tp.parent_tid, sizeof(long));
       POST_MEM_WRITE((Addr)tp.child_tid, sizeof(long));
+      POST_MEM_WRITE((Addr)ctst->arch.vex.guest_ESP, 8);
 
       /* Thread creation was successful; let the child have the chance
          to run */