From owner-svn-src-head@freebsd.org Sat Nov 16 20:33:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2AFE01ADA56; Sat, 16 Nov 2019 20:33:47 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Fn4B6cc9z4Pf5; Sat, 16 Nov 2019 20:33:46 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C21FD70D0; Sat, 16 Nov 2019 20:33:46 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAGKXkR7018807; Sat, 16 Nov 2019 20:33:46 GMT (envelope-from bdragon@FreeBSD.org) Received: (from bdragon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAGKXkte018805; Sat, 16 Nov 2019 20:33:46 GMT (envelope-from bdragon@FreeBSD.org) Message-Id: <201911162033.xAGKXkte018805@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdragon set sender to bdragon@FreeBSD.org using -f From: Brandon Bergren Date: Sat, 16 Nov 2019 20:33:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354780 - head/lib/libc/powerpc64/gen X-SVN-Group: head X-SVN-Commit-Author: bdragon X-SVN-Commit-Paths: head/lib/libc/powerpc64/gen X-SVN-Commit-Revision: 354780 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2019 20:33:47 -0000 Author: bdragon Date: Sat Nov 16 20:33:46 2019 New Revision: 354780 URL: https://svnweb.freebsd.org/changeset/base/354780 Log: [PowerPC] Fix *context on ELFv2 Due to ELFv1 specific code in _ctx_start.S and makecontext.c, userspace context switching was completely broken on ELFv2. With this change, we now pass the libthr test suite. Approved by: jhibbits (mentor) Differential Revision: https://reviews.freebsd.org/D22421 Modified: head/lib/libc/powerpc64/gen/_ctx_start.S head/lib/libc/powerpc64/gen/makecontext.c Modified: head/lib/libc/powerpc64/gen/_ctx_start.S ============================================================================== --- head/lib/libc/powerpc64/gen/_ctx_start.S Sat Nov 16 19:12:17 2019 (r354779) +++ head/lib/libc/powerpc64/gen/_ctx_start.S Sat Nov 16 20:33:46 2019 (r354780) @@ -32,8 +32,14 @@ .globl CNAME(abort) ENTRY(_ctx_start) +#if !defined(_CALL_ELF) || _CALL_ELF == 1 + /* Load values from function descriptor */ ld %r2,8(%r14) ld %r14,0(%r14) +#else + /* Load global entry point */ + mr %r12,%r14 +#endif mtlr %r14 blrl /* branch to start function */ mr %r3,%r15 /* pass pointer to ucontext as argument */ Modified: head/lib/libc/powerpc64/gen/makecontext.c ============================================================================== --- head/lib/libc/powerpc64/gen/makecontext.c Sat Nov 16 19:12:17 2019 (r354779) +++ head/lib/libc/powerpc64/gen/makecontext.c Sat Nov 16 20:33:46 2019 (r354780) @@ -113,7 +113,12 @@ __makecontext(ucontext_t *ucp, void (*start)(void), in * Use caller-saved regs 14/15 to hold params that _ctx_start * will use to invoke the user-supplied func */ +#if !defined(_CALL_ELF) || _CALL_ELF == 1 + /* Cast to ensure this is treated as a function descriptor. */ mc->mc_srr0 = *(uintptr_t *)_ctx_start; +#else + mc->mc_srr0 = (uintptr_t) _ctx_start; +#endif mc->mc_gpr[1] = (uintptr_t) sp; /* new stack pointer */ mc->mc_gpr[14] = (uintptr_t) start; /* r14 <- start */ mc->mc_gpr[15] = (uintptr_t) ucp; /* r15 <- ucp */