From patchwork Tue Aug 3 04:13:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 490845 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp307395jap; Mon, 2 Aug 2021 21:19:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtRkg/o3CmIF+KuYWUB2TLWRSwJB5skpQc8UGB/PPjyGQisSQlz+HAF4siDDSdrwfGjViE X-Received: by 2002:a05:620a:c84:: with SMTP id q4mr19315726qki.243.1627964375011; Mon, 02 Aug 2021 21:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627964375; cv=none; d=google.com; s=arc-20160816; b=ag0ghMD88UdUrFZ3eJVL54ecrHiGgSffZtrpf61n6vbeuMED4qmF2I6ZeAQNvISIQB 7SA+ppqmJEg2D/KXtIyx61+M9jcipVw8qkTijRRgUaKsx6h5V96R1Z8ZVmqYuI/Cgoyz psbfB2K2uiX8W70f8edACjmc/UDhO2n2tqPFYmUnBUMNIMtqEq/CaXJ+B4CQ3Sj2w2q1 TELdcIX3O5I7b+7qbR7stu55Dlvu2pKfHhF1GOfZ5WI7GC9iEY2SU9JtvRjaMh7ZCM5N EGvW70WDwCQRhaC1CS5SCDM3yrt7kjgAg8KmAgHacKGxi9LEBHeHVISDCkjjPkDFkODM 94dw== 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=/Z52jqMahW7nYTfuwDqraaBizHHqXiMT/VaDEwV5Efo=; b=GgYP37WHEbzMdtjc/vFL7Vo+vw9ON8yMDJzMI0NQqQPkgphN47QxjpeQyyRvaVbRgs zvSefADILy7uBgcyAB0ENcdduuAzzhvOGFyVZ2ko+D+XTNhSpO1qeyf8WWTpvUbS6VMH yWU6tbQoTi4OlGAN3SlMRZnl/fb4FzI9RW4fEfWpAUcivUvpNJXRHJwlSy8qspGlIV4W mEE2Nf31iF2NK+KVBdVyF6BHS6AJa7fxRX/TdrfXlFHCPapQwm+0syU215C8R1YWWez7 l77NnoO8r7TXhr0CkOF7cpIxuHcmECikFHH6UadE3C84+/MyyPcwmpu8a+WWp6Dfn+Tu /ALQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o8uT5APG; 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=pass (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 g17si7072920qts.2.2021.08.02.21.19.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Aug 2021 21:19:35 -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=pass header.i=@linaro.org header.s=google header.b=o8uT5APG; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAltu-000613-Dc for patch@linaro.org; Tue, 03 Aug 2021 00:19:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAlpW-0002te-24 for qemu-devel@nongnu.org; Tue, 03 Aug 2021 00:15:02 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:43752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAlpR-00025R-JX for qemu-devel@nongnu.org; Tue, 03 Aug 2021 00:15:01 -0400 Received: by mail-pj1-x1032.google.com with SMTP id pj14-20020a17090b4f4eb029017786cf98f9so2989476pjb.2 for ; Mon, 02 Aug 2021 21:14:57 -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=/Z52jqMahW7nYTfuwDqraaBizHHqXiMT/VaDEwV5Efo=; b=o8uT5APG1T9ArrkbKU6P8DjuiZ1t7IZbE+RNACpcJ4RiY+RMgSUV0c+1b0JwfK1DW6 6AAS+QchoDpWSR9lix/6fJUnnZFlnLtlLbTWYGAlktceRZqQJs7aIduCHOhhQPJAF14S CMBAjD8xBJ06irBQqm4+J+mFcwRPnWt5i39wMnigs32sa95sDWkM7tVqpjg1wnQQSTvP cGBp60JC1PqHXmAKQ8+fhJXCIkgJdDuT/c1t+a/Zci3CyeCknkh1OWz/ZWDC9V1t3xlo 6lhNIbqvz4IHNGS5ppd5TaBTF/sWfYWjPBW2w3YKEhfI2cBbRcYzCZKiclteA4FRbWRY VX0w== 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=/Z52jqMahW7nYTfuwDqraaBizHHqXiMT/VaDEwV5Efo=; b=n3qKgIrLECwSyApxG069G02xMFGpd2vcCnkN7Fysh713ilzydePCTN/TXSAjZpdqlt zAPjse35jqzlsUVhqBLFiQw15lbTDfkTkGnyrUBICZESuSzSAgyOXJudKM5rYY1DWYLJ 4CJwW2ypAy73RwiKT0rKVhNRf3eRpZwfsSc8hVCDIIiKTmEEGfC9vRchH/W8b92aYgsN HOrVQ+/7FBvCTToQFuMTPPRGyC1LnfmkrK0IC9++DU+vuvSeCdb8wXDPS12ohP2AXRWJ gxC2lUpFsvF3OVhx6zBzC4QCVbQP4txS7gH48NMmNfOuoR1ciKkEurpuIIcsAhMhAVCF UOOw== X-Gm-Message-State: AOAM533cCY6tFL3uGJen2WbmspM9XzMypz5dRkkGrsoNDruESQhIzniS he5AqgEDdX3i/tcHORX6ZOvl5XeL8LmsOA== X-Received: by 2002:a17:90b:1e51:: with SMTP id pi17mr2322302pjb.155.1627964096325; Mon, 02 Aug 2021 21:14:56 -0700 (PDT) Received: from localhost.localdomain (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id c23sm13718532pfn.140.2021.08.02.21.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 21:14:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 09/55] target/ppc: Set fault address in ppc_cpu_do_unaligned_access Date: Mon, 2 Aug 2021 18:13:57 -1000 Message-Id: <20210803041443.55452-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803041443.55452-1-richard.henderson@linaro.org> References: <20210803041443.55452-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We ought to have been recording the virtual address for reporting to the guest trap handler. Cc: qemu-ppc@nongnu.org Signed-off-by: Richard Henderson --- target/ppc/excp_helper.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.25.1 diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 0df358f93f..d7743704ac 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -1504,6 +1504,20 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, { CPUPPCState *env = cs->env_ptr; + switch (env->mmu_model) { + case POWERPC_MMU_SOFT_4xx: + case POWERPC_MMU_SOFT_4xx_Z: + env->spr[SPR_40x_DEAR] = vaddr; + break; + case POWERPC_MMU_BOOKE: + case POWERPC_MMU_BOOKE206: + env->spr[SPR_BOOKE_DEAR] = vaddr; + break; + default: + env->spr[SPR_DAR] = vaddr; + break; + } + cs->exception_index = POWERPC_EXCP_ALIGN; env->error_code = 0; cpu_loop_exit_restore(cs, retaddr);