From nobody Tue Feb 10 09:58:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1635855013; cv=none; d=zohomail.com; s=zohoarc; b=A5rDwZHCWwTI45Fz+O7pPEOvKFvtXJsQYOSlhSZfTWucdKC9HvOFL/xI/kGdkPPId8Ju72NANeKKpgTPv1o2MSSPchuUxxZjXuLQ2gl/umiTmxAauW8QnEgZ3ry9k7a1J/HFJS6YkLjURzZazN4gKgEs/EdIc/WbvehiXcZzyoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635855013; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=muffzeHX3yZuoAcxrWs0UhKgv9u/j8rmCNk7xQHU/Hc=; b=FcvL8lohChtyp62zvoWsU8DcFWsFp7PSLPqfFNLXmUcAAD/Kp+3dFvVi2qA72As8ee78Sn1rn+cBoLJaryVsLA4ySP0kI4uWG3KYEF4Ff4erDy67uOsNYY/9+0p8vwXCPO4qxlN7Ew3Wpyc2u+8DsRDR1DgGcziUt3P16RCdIQA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635855013532620.4408267247397; Tue, 2 Nov 2021 05:10:13 -0700 (PDT) Received: from localhost ([::1]:47500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhscG-0003Fu-Jm for importer@patchew.org; Tue, 02 Nov 2021 08:10:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhrhI-0001gL-K8 for qemu-devel@nongnu.org; Tue, 02 Nov 2021 07:11:20 -0400 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]:34475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhrhD-00021C-RU for qemu-devel@nongnu.org; Tue, 02 Nov 2021 07:11:17 -0400 Received: by mail-qt1-x82f.google.com with SMTP id u7so68531qtc.1 for ; Tue, 02 Nov 2021 04:11:15 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-57.nyc.biz.rr.com. [172.254.253.57]) by smtp.gmail.com with ESMTPSA id bm25sm12730854qkb.4.2021.11.02.04.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 04:11:14 -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=Lj+prjzCkRKwr8A/CCwy6qMqerbsh4bGMMvVIfAIG9Cr/VpQQorVXp0P/SDBLTrwF2 rDbQT3drlrBWj5UF8s0doENaizgjANjY+8T4rUAPqN+FWEpVQVEv3sDg+9spXN8NlbHT Yh0Of6TP62GxSCwqrYJ34svgqFhSNe8I7VoABmHqjGNTPC2DfLkGYFruNq73YeFnJtAj ulyRxzyho14ZCfTwtR8cl4tehOhOI385odNFreIKDi5m6WIM36Cl9JEoXK1sWoeqS3rg DX9eIcWNMc1jxhVfURpVAyq6dHDz5k1u2tK26xFaH68IHfNoafGBc93F6YPwwZCrtAl3 tzBQ== 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=hMfAotcs8r1PP3K2tCf+o0+ddA8/6s0OhZ8iPmhv8axs/+IJqFnjugx6oDXiDNU0zT on+5GwRP432kNz7MLsEg6Z2PTddSmINjhOZ+NgU1+rjox85kheD5LaTqgnM23ITioEcX yB5najqyp3xM4ikT7phIOaJYbbf7kzPspf5/EXwDZaPbJyVO13boopJ/bDHz2qCBg6hM BEAmXsyw+qOonl0CIOVHtAzPEzcflP+e7RCuJQQn5I0RQPIQipjovEoTf483GZmWQAc5 WSMp0Rtkq1PbkaKOE+6BqofAWi1vV7M32h4GxFQ9rQM6KecAVIFCCIvZwjgEzDM20ZVJ FSow== X-Gm-Message-State: AOAM5326mnT+HbmDJco8f2VLemkzviJ1H87FpyCn6mQ1f5dLrTO7PCIs I7cFYP4J4YHsuEIY/HrlDe1CtPGa8EHdjg== X-Google-Smtp-Source: ABdhPJzP1lqnDiXmfJCJOllmrxpWoPfqSGgVBDxEiTdQpVgvZglMBjg16+hIEnZqUKFAlakQ89ZVPQ== X-Received: by 2002:a05:622a:148d:: with SMTP id t13mr36195317qtx.393.1635851475059; Tue, 02 Nov 2021 04:11:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 56/60] target/sparc: Set fault address in sparc_cpu_do_unaligned_access Date: Tue, 2 Nov 2021 07:07:36 -0400 Message-Id: <20211102110740.215699-57-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211102110740.215699-1-richard.henderson@linaro.org> References: <20211102110740.215699-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82f; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x82f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1635855014465100001 Content-Type: text/plain; charset="utf-8" We ought to have been recording the virtual address for reporting to the guest trap handler. Move the function to mmu_helper.c, so that we can re-use code shared with get_physical_address_data. Reviewed-by: Mark Cave-Ayland Signed-off-by: Richard Henderson --- target/sparc/ldst_helper.c | 13 ------------- target/sparc/mmu_helper.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 13 deletions(-) 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, h= waddr 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 =3D SPARC_CPU(cs); - CPUSPARCState *env =3D &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, vad= dr 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 =3D SPARC_CPU(cs); + CPUSPARCState *env =3D &cpu->env; + +#ifdef TARGET_SPARC64 + env->dmmu.sfsr =3D build_sfsr(env, mmu_idx, access_type); + env->dmmu.sfar =3D addr; +#else + env->mmuregs[4] =3D addr; +#endif + + cpu_raise_exception_ra(env, TT_UNALIGNED, retaddr); +} +#endif /* !CONFIG_USER_ONLY */ --=20 2.25.1