From patchwork Sat Oct 30 17:16:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516509 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp1457455iml; Sat, 30 Oct 2021 11:27:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEzMuliqUisrSJIiyeiJbx+i2Wd+zz7wCMjHpLPLlOPRmeRa4bt2mIEHQb2Ciwh/hggqUV X-Received: by 2002:a05:6808:17a7:: with SMTP id bg39mr13244352oib.70.1635618432229; Sat, 30 Oct 2021 11:27:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635618432; cv=none; d=google.com; s=arc-20160816; b=KNzkThTBtaiLB6CZcox5ly1I1PtLkEdRe6ZpLwGrA/mPiGjcruc0/S/DvapBBixGAQ MU79x9jp671L59QS4KaSolOcYoqK3zBH1HvqUe5leANHboLoL8hwnDKNitZiLylh08Yf SY530wTwX6zNK3QaOXlTyR20b/I183rm3XmsUc+wOx1OI1v4QuM0yCi/p8qWSzZ+zsUK y+frCwjaqVWLDI9ILO1XWP+2xBeOgE9qzMA1iOXu4JmEOo2oMmoPtRh4+OA2+2lpm95G Q3kMV2HddktXTEFJo2mVHUU7jIQLDUFnikrrEP/9/Od4U1zzqjEq05om+gUXOvrzCzTA wWzg== 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=hDIIDmSt3XkX7dozNp8YyanBuOQiSpBj16JErrhb+ZE=; b=1Bv37CUkx/wNGGBY5rsH3ugchcB4veKL1PNoOTsahG1b9+MorKr3Iimq3+wE/mS8At JhzWDDpAqq8KlraGL/3GzDjl35vkafViM8qgxheHy85bPvRMmRYkNJqxKQK6ERwwdtYL YN/AsBPAfrMnZtUheIYmrsiuLrGltuybwavsTaN+u+enNnR3kxORwOzDmGNN5berEFJ6 2CKD0+LCgC+DkR3To9CCio+jfjC6dUOFK9HUl3qorvArNs7VjySpQ1M44WaIC3PJU1+O T+zgl8iOXIJlvsaiiwGndafzSMltq7Ng4pkeY8iuN/m8RR8VRHHfDv2801u7LQOHy1YP yYig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lrdYcKbz; 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 bl34si6786518oib.175.2021.10.30.11.27.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 30 Oct 2021 11:27:12 -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=lrdYcKbz; 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]:40408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgt4R-000809-IT for patch@linaro.org; Sat, 30 Oct 2021 14:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgs1s-0001UY-6j for qemu-devel@nongnu.org; Sat, 30 Oct 2021 13:20:28 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:35512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgs1o-0002C3-1v for qemu-devel@nongnu.org; Sat, 30 Oct 2021 13:20:25 -0400 Received: by mail-pf1-x42d.google.com with SMTP id s5so753007pfg.2 for ; Sat, 30 Oct 2021 10:20:22 -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=hDIIDmSt3XkX7dozNp8YyanBuOQiSpBj16JErrhb+ZE=; b=lrdYcKbzQ0c+F3yUg3gPnHdd01mr+Zsevis/Hpk6OAGdzCnjHeHgZDjjBKuAgUgLuZ x+sio0YitJs9t7SbbuGirw48WVgAZntqXU+zXzeIadwZjuhz99q5kXIK9dv9NtCTnqvP nRo8oPvg6H2ujVWC7IZDPydxlIz7lsFqz7joHIJ1MrYn3RuvUuec9wBQnNZJbWUE1XA/ rxKl0KbYUg2Bvonb3bKkFRklpY3SqunsQDVn+dwVE9jUA6FoBFZMEopBGeVyHI/NNP7s 4sMdiESoiT3YdkIfD2dDgDs6SkTOZycahkSyMDTfRPwrXSmE50bjlYlxa4QKFrK26j+F kUXQ== 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=hDIIDmSt3XkX7dozNp8YyanBuOQiSpBj16JErrhb+ZE=; b=4ES7mHGrtUAKMDMZDs+1uQ80w9jpmkGAM66ne2aerKX7uu55ugsSwglbRGrFKhQp/V qxn6u+vEFa8q8ic3osoGicx7YBjg1948zev/tW/4MI9Tbwn8xw6OC7I4uCv4EtDho9Gt QacTdq3YvPYgNDHuuboJiXnbWcpIGJqkQfSTSvSg+RMVvRz8xXidnqjoiP+y4/+pXo5l FglDwYFa5NzMLgCwl5kXoTTib/6QBW0xn7SRTj9+GaILb/YuQyXvA482WVaPgC600674 v78qLAy2ZUjuhAI/pww+0ZZK1QqFqrJ3vdY7YOjDhYPgjoufF0yJF5uznMHiAA5JKyfR x8Mw== X-Gm-Message-State: AOAM533HrIccwWp4F6RFcOpHUKRrkT/ouBL8xTmPc00D5G/XFnzF+pn0 4NdK/bBu9IpPhXsvG8JorB3KbeSa2oZSPg== X-Received: by 2002:a62:5304:0:b0:44c:719c:a2c with SMTP id h4-20020a625304000000b0044c719c0a2cmr17729993pfb.13.1635614421984; Sat, 30 Oct 2021 10:20:21 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:20:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 49/66] target/ppc: Set fault address in ppc_cpu_do_unaligned_access Date: Sat, 30 Oct 2021 10:16:18 -0700 Message-Id: <20211030171635.1689530-50-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 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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: Peter Maydell , laurent@vivier.eu, f4bug@amsat.org, qemu-ppc@nongnu.org, alex.bennee@linaro.org, imp@bsdimp.com 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 Reviewed-by: Warner Losh Reviewed-by: Peter Maydell 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 88a8de4b80..e568a54536 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -1465,6 +1465,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);