From patchwork Tue Sep 17 18:41:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173921 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1492473ill; Tue, 17 Sep 2019 11:43:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLbDP4H1dBt6No+ON8oLH3K6I2+E+TvRml2UsCdGoduNLdZFShJfOGPvhERMwubgIdmi4h X-Received: by 2002:ae9:e219:: with SMTP id c25mr5368004qkc.347.1568745800181; Tue, 17 Sep 2019 11:43:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568745800; cv=none; d=google.com; s=arc-20160816; b=Wt7VbH2kYmGDZU+PS8h/Ox95S5VhfqIijy+oC1KoMUrw/h4eQVUrgVZgYG2WUnfLjN XppLR1YQfHUSLu8qLxfCHQGzXKkK93WFWQGUTjEOvCqpCpifGEPgtzTLjD6E/1kWrjjr 6z3sLh9JNEV+/4pfCrxwOXZY80r/+SJhSpyhrmcfHa+DU7iZpUVprnBlXNGntMsGPIi4 rnyyc6L3pfZJ3kU9IiNeZSxfR79VQk5JBMiuvrXjQ4DcgM2OJ1N74GlOc51SATZgiSzl Rl+rVHEPSswBzv47GW2L6+4eiWTzTPTx3nBUTQSjo9fXaJhCX5RxCnBCB5DdJmXZEN3S ox0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=W2mrxFhentklW247RlP8yuKtv3QDjoQaHxNcDuVxHu8=; b=kqVTziOVaqOYZnCecgfCq/JA4/90cX6CSW/6lkeVEB2gRs89+NhXopHuo/nR7xmIXR corwCfu1hAbjIyipWNnAs9ON/rGQQ9ilWFAJ/nxNQx/626W/JKJ0P/xjXMpusMPNhcbM JiB++l69dfGysKOUMd6j1f9gqPeBjt3sMSfNyhKiWFER0a34jqHunswhiw//+9QdMFSk GqsCxwmu2WmzWPYfbv66T4oAFGQv9f41bhv6Km3NCo7SzXf3JENUzUCV7KUQr3xfl3yO c2xJhR9qg3BJVgmb3mDxfczgBeIscIwpXHKwqRl+/cEYgaK8sQ3BAXPYjSCS1mbQ9T9v S6XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="sEdv/bdE"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k7si2328898qtd.144.2019.09.17.11.43.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Sep 2019 11:43:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="sEdv/bdE"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAIRa-0003dF-Uy for patch@linaro.org; Tue, 17 Sep 2019 14:43:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33885) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAIPd-000398-B1 for qemu-devel@nongnu.org; Tue, 17 Sep 2019 14:41:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAIPc-0000C5-6A for qemu-devel@nongnu.org; Tue, 17 Sep 2019 14:41:17 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:39674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAIPb-0000Aw-Uh for qemu-devel@nongnu.org; Tue, 17 Sep 2019 14:41:16 -0400 Received: by mail-wm1-x344.google.com with SMTP id v17so4334316wml.4 for ; Tue, 17 Sep 2019 11:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W2mrxFhentklW247RlP8yuKtv3QDjoQaHxNcDuVxHu8=; b=sEdv/bdEj1RASfFSB9kSovIL85YdolI70YY8ADkQdfMcxaHvUExpRgk8voHX4kYCY8 /iRSLlElzTIZ5fU8f868DTMheXJZ5pl9on7U3+j8nI87C+we6vVRaUw9+jvv4J0KtJ1D pDOVHG7vr0DherArlD0a1VTCOI1jIDIMUkSd5jWNSzsLnApL2gMlhO9ZuO8BWFi3hLC3 oqBxcq5N+P4pZU5hrDYIkTBSmpzLXUmN8fbJjzaRmvMVoqpmlh4/Rff71yVL0rAcEG1J /TlCVZv8B8RwskASnrYjsY9Qok8NXXrs6IxZfhMda+7Lt1I/f1EL29pj3BFYYAn8tjKo EN+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W2mrxFhentklW247RlP8yuKtv3QDjoQaHxNcDuVxHu8=; b=ovm2GhwkmedhvJ4UpvR91KXdrnrb5NsnynkCsXSc8e8y9BemX6whYlzVpWp0f89WOR CLvpjHrgJQH18C30ODp/YI6FgE2WAnxFsj1is/0rTYiMk0U6COP088OwLut5skQpANd3 vPGpNDym7Mkxp8An2zaI0OF4DBxdlubeAkKwUcbvezYdXG4nBmZqjyXBkmuCHofkSZbX JAxrc7L6AwwSPJdlrazaRhnAV2aiTMg/lCSWf9J1AVR54OAWKQ8XNDmjUJwQqJuAFZJR p94y2TXO5Xl2ml7aX15rU6JpdnOlwC3ak2PdPIMG7bCeR5yMJ2ViX/FYY5hPPWQ3l9lZ eZKQ== X-Gm-Message-State: APjAAAXDC/+ZMY1oUtNbzcego0gkQG4cDEk7C+mOvswqBVlkoMuypAJa F81VTcdnuyr0QLMa0xMXc3sloLldYB0= X-Received: by 2002:a1c:1981:: with SMTP id 123mr4519852wmz.88.1568745674754; Tue, 17 Sep 2019 11:41:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x15sm2297663wmc.16.2019.09.17.11.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 11:41:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C11AD1FF91; Tue, 17 Sep 2019 19:41:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 17 Sep 2019 19:41:04 +0100 Message-Id: <20190917184109.12564-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190917184109.12564-1-alex.bennee@linaro.org> References: <20190917184109.12564-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 4/9] target/ppc: fix signal delivery for ppc64abi32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Richard Henderson , qemu-devel@nongnu.org, Laurent Vivier , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We were incorrectly using the 64-bit AIX ABI instead of the 32-bit SYSV ABI for setting NIP for the signal handler. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v2 - change to wording --- linux-user/ppc/signal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c index 619a56950df..5b82af6cb62 100644 --- a/linux-user/ppc/signal.c +++ b/linux-user/ppc/signal.c @@ -501,7 +501,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, int i, err = 0; #if defined(TARGET_PPC64) struct target_sigcontext *sc = 0; +#if !defined(TARGET_ABI32) struct image_info *image = ((TaskState *)thread_cpu->opaque)->info; +#endif #endif rt_sf_addr = get_sigframe(ka, env, sizeof(*rt_sf)); @@ -557,7 +559,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, env->gpr[5] = (target_ulong) h2g(&rt_sf->uc); env->gpr[6] = (target_ulong) h2g(rt_sf); -#if defined(TARGET_PPC64) +#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) if (get_ppc64_abi(image) < 2) { /* ELFv1 PPC64 function pointers are pointers to OPD entries. */ struct target_func_ptr *handler =