From patchwork Mon Dec 21 14:09:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1419051 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=G3x9+Rvd; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D01Z46b3Zz9sVk for ; Tue, 22 Dec 2020 01:09:46 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D2106386EC78; Mon, 21 Dec 2020 14:09:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2106386EC78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1608559780; bh=TTNN1OodW6al6OZpspTUsHmLo1dnwFyVG62qgOIrQ6M=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=G3x9+Rvdr3x/be6AouZbfjeZ5gZctY7w5zPeE6/eR6ShyimI374NRONrpe9HgF97r tEWY9jmL3f9jK6RjQgXQx0nRwcxH5I/77JOj2uB2z7KZfuB7HCvWaKQdKzBgNWnWQ3 Yr2ih0RB458PgV5o1UynwDfsa52KDotU4Nny4Wic= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from hera.aquilenet.fr (hera.aquilenet.fr [IPv6:2a0c:e300::1]) by sourceware.org (Postfix) with ESMTPS id 100D9386EC6E for ; Mon, 21 Dec 2020 14:09:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 100D9386EC6E Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 9DDECE14; Mon, 21 Dec 2020 15:09:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k8jUMP3uIqLw; Mon, 21 Dec 2020 15:09:35 +0100 (CET) Received: from function.youpi.perso.aquilenet.fr (lfbn-bor-1-56-204.w90-50.abo.wanadoo.fr [90.50.148.204]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 8F762DD9; Mon, 21 Dec 2020 15:09:35 +0100 (CET) Received: from samy by function.youpi.perso.aquilenet.fr with local (Exim 4.94) (envelope-from ) id 1krLsU-00HOCa-7d; Mon, 21 Dec 2020 15:09:34 +0100 Date: Mon, 21 Dec 2020 15:09:34 +0100 To: gcc-patches@gcc.gnu.org, Thomas Schwinge Subject: [PATCH] hurd: libgcc unwinding over signal trampolines with SIGINFO Message-ID: <20201221140934.ma2afv2dtaiosfjh@function> Mail-Followup-To: gcc-patches@gcc.gnu.org, Thomas Schwinge , bug-hurd@gnu.org References: <20200529114650.tent6dxgq4bzbkdz@function> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200529114650.tent6dxgq4bzbkdz@function> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Samuel Thibault via Gcc-patches From: Samuel Thibault Reply-To: Samuel Thibault Cc: bug-hurd@gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" When the application sets SA_SIGINFO, the signal trampoline parameters are different to follow POSIX. libgcc/ * config/i386/gnu-unwind.h (x86_gnu_fallback_frame_state): Add the posix siginfo case to struct handler_args. Detect between legacy and siginfo from the second parameter, which is a small sigcode in the legacy case, and a pointer in the siginfo case. diff --git a/libgcc/config/i386/gnu-unwind.h b/libgcc/config/i386/gnu-unwind.h index db47f0ac1d4..3eefe7de7e5 100644 --- a/libgcc/config/i386/gnu-unwind.h +++ b/libgcc/config/i386/gnu-unwind.h @@ -38,10 +38,21 @@ x86_gnu_fallback_frame_state { struct handler_args { int signo; - int sigcode; - struct sigcontext *scp; + union + { + struct + { + long int sigcode; + struct sigcontext *scp; + } legacy; + struct + { + siginfo_t *siginfop; + ucontext_t *uctxp; + } posix; + }; } *handler_args; - struct sigcontext *scp; + long int sigcode; unsigned long usp; /* @@ -75,29 +86,52 @@ x86_gnu_fallback_frame_state return _URC_END_OF_STACK; handler_args = context->cfa; - scp = handler_args->scp; - usp = scp->sc_uesp; + sigcode = handler_args->legacy.sigcode; + if (sigcode < 4096) + { + /* This cannot be a SIGINFO pointer, assume legacy. */ + struct sigcontext *scp = handler_args->legacy.scp; + usp = scp->sc_uesp; + + fs->regs.reg[0].loc.offset = (unsigned long)&scp->sc_eax - usp; + fs->regs.reg[1].loc.offset = (unsigned long)&scp->sc_ecx - usp; + fs->regs.reg[2].loc.offset = (unsigned long)&scp->sc_edx - usp; + fs->regs.reg[3].loc.offset = (unsigned long)&scp->sc_ebx - usp; + fs->regs.reg[5].loc.offset = (unsigned long)&scp->sc_ebp - usp; + fs->regs.reg[6].loc.offset = (unsigned long)&scp->sc_esi - usp; + fs->regs.reg[7].loc.offset = (unsigned long)&scp->sc_edi - usp; + fs->regs.reg[8].loc.offset = (unsigned long)&scp->sc_eip - usp; + } + else + { + /* This is not a valid sigcode, assume SIGINFO. */ + ucontext_t *uctxp = handler_args->posix.uctxp; + gregset_t *gregset = &uctxp->uc_mcontext.gregs; + usp = (*gregset)[REG_UESP]; + + fs->regs.reg[0].loc.offset = (unsigned long)&(*gregset)[REG_EAX] - usp; + fs->regs.reg[1].loc.offset = (unsigned long)&(*gregset)[REG_ECX] - usp; + fs->regs.reg[2].loc.offset = (unsigned long)&(*gregset)[REG_EDX] - usp; + fs->regs.reg[3].loc.offset = (unsigned long)&(*gregset)[REG_EBX] - usp; + fs->regs.reg[5].loc.offset = (unsigned long)&(*gregset)[REG_EBP] - usp; + fs->regs.reg[6].loc.offset = (unsigned long)&(*gregset)[REG_ESI] - usp; + fs->regs.reg[7].loc.offset = (unsigned long)&(*gregset)[REG_EDI] - usp; + fs->regs.reg[8].loc.offset = (unsigned long)&(*gregset)[REG_EIP] - usp; + } fs->regs.cfa_how = CFA_REG_OFFSET; fs->regs.cfa_reg = 4; fs->regs.cfa_offset = usp - (unsigned long) context->cfa; fs->regs.reg[0].how = REG_SAVED_OFFSET; - fs->regs.reg[0].loc.offset = (unsigned long)&scp->sc_eax - usp; fs->regs.reg[1].how = REG_SAVED_OFFSET; - fs->regs.reg[1].loc.offset = (unsigned long)&scp->sc_ecx - usp; fs->regs.reg[2].how = REG_SAVED_OFFSET; - fs->regs.reg[2].loc.offset = (unsigned long)&scp->sc_edx - usp; fs->regs.reg[3].how = REG_SAVED_OFFSET; - fs->regs.reg[3].loc.offset = (unsigned long)&scp->sc_ebx - usp; fs->regs.reg[5].how = REG_SAVED_OFFSET; - fs->regs.reg[5].loc.offset = (unsigned long)&scp->sc_ebp - usp; fs->regs.reg[6].how = REG_SAVED_OFFSET; - fs->regs.reg[6].loc.offset = (unsigned long)&scp->sc_esi - usp; fs->regs.reg[7].how = REG_SAVED_OFFSET; - fs->regs.reg[7].loc.offset = (unsigned long)&scp->sc_edi - usp; fs->regs.reg[8].how = REG_SAVED_OFFSET; - fs->regs.reg[8].loc.offset = (unsigned long)&scp->sc_eip - usp; + fs->retaddr_column = 8; fs->signal_frame = 1;