Message ID | 20211030171635.1689530-57-richard.henderson@linaro.org |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp1463501iml; Sat, 30 Oct 2021 11:35:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyR11nv7avHnSRpNsL4naV2uN2xUQrutjBsAgnWNL0H3d7Ykd4iN1s9Zp26zrvFzLtO/9V2 X-Received: by 2002:a05:6808:14c5:: with SMTP id f5mr828931oiw.53.1635618906602; Sat, 30 Oct 2021 11:35:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635618906; cv=none; d=google.com; s=arc-20160816; b=LAKOTPpTRScAxDfO5Qf/wZOtI34HmXwDa2m0HXZK8cVVbFQh68PzxMCRBGDuCGSDB8 +HLTpNLj8Qxav4LYwbFIITIVLMfXiDjk5fmdLdq5a/+ZAX+3sf+BsA5UpZH7SbotJLZg WdjgknRUfa5/4+zl8gOEc17DoVsUVdYmft9/SPgenI3+UnfdeZearId/1uq4sJlUc+7N CpTphLlLga65dY5MN8kc+btQITmuDTEYlQsXItW0p9CgAggmX8ixu5fFFG6ObbpEgDsg ZdYNmhYV+o+N8bZd2cflNXpjknJP+zP7oofjmjOn/Y07xlG0PC2ijHrpbHtSg6TfXDnQ 32fA== 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=muffzeHX3yZuoAcxrWs0UhKgv9u/j8rmCNk7xQHU/Hc=; b=R3FQpqMzAm+73yI1B5xDmanjWWPqMaBfX7sV20U06HYCm6SO9u+VJobVqylmMHfkiq X+x6KDKhoxvV+DMagSQ9sTA9PtXeVjRD0OO+eycJg2/odWqTZegrXxfGA1aaGiqA07vW JWf5CmtNgguxLPJfFj3L1m5modvhJWw9/AnDGYgqVhlyKA5Wms7kUY7OT73Ye8PTKN1u EjFzYcnMOdDvpB7v3bIi5GAo+Y2Ci00Q9cniB/8Sdhk4tn+3PQfIP5QSW7Z9t09Poj8T ybmRYWCqYxwDJ3Z5DyxBH7WUlwfG/NKNt62oVWxPdZ3f+e/jgJQF3Eyi7BmUbbhIilFP BMLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OuWHDlUP; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b21si16056265ots.45.2021.10.30.11.35.06 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 30 Oct 2021 11:35:06 -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=OuWHDlUP; 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]:53252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1mgtC5-0008IB-Vd for patch@linaro.org; Sat, 30 Oct 2021 14:35:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1mgs20-0001dP-3s for qemu-devel@nongnu.org; Sat, 30 Oct 2021 13:20:36 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:40675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1mgs1u-0002FM-8e for qemu-devel@nongnu.org; Sat, 30 Oct 2021 13:20:35 -0400 Received: by mail-pf1-x435.google.com with SMTP id g11so925738pfv.7 for <qemu-devel@nongnu.org>; Sat, 30 Oct 2021 10:20:29 -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=muffzeHX3yZuoAcxrWs0UhKgv9u/j8rmCNk7xQHU/Hc=; b=OuWHDlUPC4yeA0vCAwp4rucFVp+b5FyGJ0mNq2QCx77hvUMFr/5Y8nftABDMhv+gIy 74oQRgfDoGEq8EX+JphlewuQzTh3RAh1Hqlc/wV1b/6jnBVdFxh7XNTQqvjbddRD2G3p yqqvVnNRj9b/tMiQBEDxfJIheXWpN3SekIOgusKAIX8DOw/XilskWIq/A+dUnhttzz3t Q+k2K4rr7h5I8nvYm4BM/txVTqVrSKnIT93mdY8lfq9FQfBhT3JN6U/Ugx7/lvIhXQ1b +VtUzwRtr9qAsXw4+baANx5NAHHBG0WDuRAG89vpOTIEMmPt2AO6ZUmAGw65yN3PDSpn 6RHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=muffzeHX3yZuoAcxrWs0UhKgv9u/j8rmCNk7xQHU/Hc=; b=gGItJUVNEy5an4F53Cmedw57fIwXYuRZSDhl8Dkx/YCNFtuG4bZ8Q9/N94Ksv3SW30 tyzN6/oUXFwBMFimbCpKotHdLCcdPJTkm5seiBY++7n269FREqqOjw/DHIeP5O4stdXT Zy8kLhTJlZTHnJbkDZhB5nL6oWz+B3BoRDEWJOxR/I4LWfpC52nLFH4RB5UAa0WcE4Nd uPF51mGYYphN2ZLnDl4ci0So4WdJQ/IQyHkRRwkIBsbT7qaBrkQfneGoz061CRSjbqgt YD4OkCH8kIXSropeV391QJECX3BU8VCmuUAWvfoQMYKxIyY1GVDZJrV8jBralOKtzWRn 1U6g== X-Gm-Message-State: AOAM532ozdKYyiR0QwhHU4diuClxbpaJjojMDKIW6EbqeduD6/yIpEyu ApKMYOsmSNv6ffOlW/UzdCkoHsQ09l1Ozg== X-Received: by 2002:a63:da0a:: with SMTP id c10mr13320198pgh.333.1635614428300; Sat, 30 Oct 2021 10:20:28 -0700 (PDT) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id k14sm9584798pji.45.2021.10.30.10.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:20:27 -0700 (PDT) From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH v6 56/66] target/sparc: Set fault address in sparc_cpu_do_unaligned_access Date: Sat, 30 Oct 2021 10:16:25 -0700 Message-Id: <20211030171635.1689530-57-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211030171635.1689530-1-richard.henderson@linaro.org> References: <20211030171635.1689530-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, alex.bennee@linaro.org, laurent@vivier.eu, imp@bsdimp.com, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
user-only: Cleanup SIGSEGV and SIGBUS handling
|
expand
|
diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c index 0549b6adf1..a3e1cf9b6e 100644 --- a/target/sparc/ldst_helper.c +++ b/target/sparc/ldst_helper.c @@ -1953,16 +1953,3 @@ void sparc_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, is_asi, size, retaddr); } #endif - -#if !defined(CONFIG_USER_ONLY) -void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs, vaddr addr, - MMUAccessType access_type, - int mmu_idx, - uintptr_t retaddr) -{ - SPARCCPU *cpu = SPARC_CPU(cs); - CPUSPARCState *env = &cpu->env; - - cpu_raise_exception_ra(env, TT_UNALIGNED, retaddr); -} -#endif diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c index 014601e701..f2668389b0 100644 --- a/target/sparc/mmu_helper.c +++ b/target/sparc/mmu_helper.c @@ -922,3 +922,23 @@ hwaddr sparc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } return phys_addr; } + +#ifndef CONFIG_USER_ONLY +void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs, vaddr addr, + MMUAccessType access_type, + int mmu_idx, + uintptr_t retaddr) +{ + SPARCCPU *cpu = SPARC_CPU(cs); + CPUSPARCState *env = &cpu->env; + +#ifdef TARGET_SPARC64 + env->dmmu.sfsr = build_sfsr(env, mmu_idx, access_type); + env->dmmu.sfar = addr; +#else + env->mmuregs[4] = addr; +#endif + + cpu_raise_exception_ra(env, TT_UNALIGNED, retaddr); +} +#endif /* !CONFIG_USER_ONLY */