From patchwork Tue Sep 24 21:00:44 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: 174311 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4671857ill; Tue, 24 Sep 2019 14:14:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNpXadj459oOoxq9q0Bcf1MATrGTw5JagcXYv2PyJ1o9cDMs+N6JpLj1OxaNfzZH4bF55n X-Received: by 2002:ac8:5152:: with SMTP id h18mr4961895qtn.210.1569359692661; Tue, 24 Sep 2019 14:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569359692; cv=none; d=google.com; s=arc-20160816; b=BTCx5vNZTda4UAOLxCUGKeEUZwAW7QaXIgJJ+IG/YUEClKp0JdC1Y2MNlC325xEgDX OIeeBmHeu2XjiqkZbyQSAayZA4bLXv+7isVqTW23TQzuYFsmYmRAodaXP+jsWkmz7oQh Gy4rfWrHh28gDtEqSP6IWKkWmPR73Q2hFdVsCjCqxKvWvp1ZUW9CGkCLa6U+rQDXyqPN lSLPMSdBBdJQg/PJnsUGfaZP9SgjIzZmtu5Dg2GPdWzTfBF/L1Z8OwFxS1AWtJ6dBjcM C9DZ4uISnqoHvyNlmsXMkbTNzpkWubso568qttUBnUnB20icbdv6l2gF72/Cp8masn7p 5UaQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wJdzvAZ41TKUWvjFeoNAGSzCvO5q5Lz+7iIWbJ7Vp+g=; b=r3fd3fjDsu+Ug6dlwhmI8yTG0URIeUsneSWcgo+zRM0gYo9MXNRgdNsm44WxL27KRu QQ0RDCCny+MJFmSYC4+kL0gZXJWkYcHg6NsEj5CvsM/1tmOezH8fsEYLS5v14aWldY72 A8J8w2qiDJtgrpkroxwC9BcPwI8wxGMRmKbxwO1378vcdFuU/+q/JyCKPO5VzRPa+GKn lq2cKC7OsCl6xvfOr2EvBurVxWdZ0oRcdjj/+KGkujKBb8nfmTzOkyULczd+zFWx7qfF vr1ufMY+xPyW6mveOUM4BrZ0HP0GEpmD5lD38/okF7ryWRVWFByenVJEfXpzyKku8zgM vkkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BtTq1HMz; 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 h5si2151446qvh.75.2019.09.24.14.14.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Sep 2019 14:14:52 -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=BtTq1HMz; 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]:51586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCs8T-0006N3-Qs for patch@linaro.org; Tue, 24 Sep 2019 17:14:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55601) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCrw3-0002Zw-Ld for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:01:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCrw1-0004Vc-6S for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:01:23 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:37886) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCrw0-0004TY-RK for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:01:21 -0400 Received: by mail-wr1-x441.google.com with SMTP id i1so3630398wro.4 for ; Tue, 24 Sep 2019 14:01:18 -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=wJdzvAZ41TKUWvjFeoNAGSzCvO5q5Lz+7iIWbJ7Vp+g=; b=BtTq1HMz6PswalfgUpIfNccBybOf+X/TTBdcbFTHcWtgymgEW8i2sDfcJcYqp1Ml8r WHkq1/qkqeXZ+Qmdjnj1AQt6JSpnytCtuJo8ja08mYnnWgVAoW19X+sGc+uVJvAmGDLY GPXgrTnrRoy2G1MJ4kJmIYdEUVV25tns103j2Wydyuj2lfU0vK2d0TR68nQ+4pj7/GTR 67nWItoUA/pnDniJ+QLXV2QHcSPhWfkROJr5xxSlkTolpCQs639SVKIC8P6kGICfC/TN Jg1qmQ9oziWhNP1Tzq1gv1pNJ0kMP9MjxSMPGBoyS6P24am/jOY+mL3KEDvHn7NZQ2rq XzTg== 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=wJdzvAZ41TKUWvjFeoNAGSzCvO5q5Lz+7iIWbJ7Vp+g=; b=FNkatTEn3fIR0qey5r0LvNAhSgjCBpQPO378AKpPCFojDCRsAvpN/dmvWQdbciX17X gG6tL1BrkyZGLG3/psxYb0UunqtzRgrXl98fnaUtrfZc292KOL4T6FJdVDKdHWWlZ0WY UeRtfsyG1hzp16zxHvg8qoMoI92UF4fvj03kOyW43awWLu9GQOg1L6pW5BE0GHTdDHFN hgzXCocKdWvLLGN7xJpbN9ZwIV25yDhBlJm/KPSBSEQ/HdjCqdSt25S0nXqNXKteZcXY 0xwvhh78zWpqXSjrSPSUT5JUay+ikVIaGkpEGhQMMcWtgdjIpB1/aTVhP/TiroiNu+wO l53w== X-Gm-Message-State: APjAAAWIwS8bv0AYtTNDQf7vWW0FbMK+oVIKchqk4+STDRHJRnKRYhQ4 wkYQLTE9KCA3RvIbqltGiCqhWQ== X-Received: by 2002:adf:e546:: with SMTP id z6mr4629559wrm.113.1569358877629; Tue, 24 Sep 2019 14:01:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d9sm5349354wrf.62.2019.09.24.14.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 14:01:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CA5241FF9B; Tue, 24 Sep 2019 22:01:07 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 11/33] target/ppc: fix signal delivery for ppc64abi32 Date: Tue, 24 Sep 2019 22:00:44 +0100 Message-Id: <20190924210106.27117-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924210106.27117-1-alex.bennee@linaro.org> References: <20190924210106.27117-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::441 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: jsnow@redhat.com, Riku Voipio , Richard Henderson , f4bug@amsat.org, Laurent Vivier , =?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 Reviewed-by: Laurent Vivier --- 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 =