From owner-p4-projects@FreeBSD.ORG Mon Nov 10 20:16:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97AB2106567B; Mon, 10 Nov 2008 20:16:47 +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 5B31F1065678 for ; Mon, 10 Nov 2008 20:16:47 +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 47DD48FC08 for ; Mon, 10 Nov 2008 20:16:47 +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 mAAKGlx2018353 for ; Mon, 10 Nov 2008 20:16:47 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAAKGl68018351 for perforce@freebsd.org; Mon, 10 Nov 2008 20:16:47 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 10 Nov 2008 20:16:47 GMT Message-Id: <200811102016.mAAKGl68018351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Nov 2008 20:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=152760 Change 152760 by peter@peter_hammer on 2008/11/10 20:16:02 Implement 32bit thr_new() for libthr Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#12 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#12 (text+ko) ==== @@ -347,29 +347,26 @@ if (debug) VG_(printf)("clone child has SETTLS: tls at %#lx\n", (Addr)tp.tls_base); -#if 0 /* XXX implement. use set_thread_area stuff */ - ctst->arch.vex.guest_FS_ZERO = (UWord)tp.tls_base; -#endif + sys_set_thread_area( ctid, 2, tp.tls_base ); + ctst->arch.vex.guest_GS = (2 << 3) | 3; /* GSEL(GUGS_SEL, SEL_UPL) */ tp.tls_base = 0; /* Don't have the kernel do it too */ /* start the thread with everything blocked */ VG_(sigprocmask)(VKI_SIG_SETMASK, &blockall, &savedmask); -#if 0 /* XXX implement. either use stack args or change to regparm */ /* Set the client state for scheduler to run libthr's trampoline */ - ctst->arch.vex.guest_RDI = (Addr)tp.arg; - ctst->arch.vex.guest_RSP = (Addr)tp.stack_base + tp.stack_size - 8; - ctst->arch.vex.guest_RIP = (Addr)tp.start_func; -#endif + ctst->arch.vex.guest_ESP = (Addr)tp.stack_base + tp.stack_size - 4; + ctst->arch.vex.guest_EIP = (Addr)tp.start_func; - /* But this is for thr_new() to run valgrind's trampoline */ - tp.start_func = (void *)ML_(start_thread_NORETURN); - tp.arg = &VG_(threads)[ctid]; - - /* And valgrind's trampoline on its own stack */ + /* 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) = 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]; /* Create the new thread */ res = VG_(do_syscall2)(__NR_thr_new, (UWord)&tp, sizeof(tp));