From patchwork Tue Nov 2 11:07:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1549638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=szYdm483; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hk7gj1kk7z9sXN for ; Tue, 2 Nov 2021 22:57:37 +1100 (AEDT) Received: from localhost ([::1]:36382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhsQ3-0001qE-49 for incoming@patchwork.ozlabs.org; Tue, 02 Nov 2021 07:57:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhrhB-0001RF-Ed for qemu-ppc@nongnu.org; Tue, 02 Nov 2021 07:11:13 -0400 Received: from mail-qk1-x730.google.com ([2607:f8b0:4864:20::730]:41758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhrh9-0001yS-L2 for qemu-ppc@nongnu.org; Tue, 02 Nov 2021 07:11:13 -0400 Received: by mail-qk1-x730.google.com with SMTP id br39so6055620qkb.8 for ; Tue, 02 Nov 2021 04:11:11 -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=szYdm483ZYIEW9rjhhKgbOHvhrW8GatAFQojoPP/TJRC2xMCLCFHgWmnV32cyhbcg9 Ru+Z+9L1w7i8J+RferrqXTmfeFXCIg2FnseFMKU26dJwAXKgDfKQ2FXk7Sx4R6/t4zQY YoHEpjs1Wl/q0d/Kbw3qoS+NZt1P+RW5lO8mDCEAQzASPbCpdQjqvsuF3SY4D7GWAXxG BDva/Jty/okIoVVZhZbdjlCGw+ZYLO2uPyz2bIQ188oDLM4UKAMkyG27ykkorxYaRkuR X5PNju9iXkhCGMuWyxxxmtcaz87KwEDi9KIvg1NqxFSZzf7wfL4KjLONUWydFJlBMCTe mRZw== 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=lG8Oqh5s927hDOrX4R0usDTwMY9V2QKcs9zVABZp5yUoSA7RPmDy1ND3mgqq/DBS9b ZHk2ExhyqeOXxOml3n87ZivNgSqsllkY1PPszEmeoe0Y0uiNFgt2g/hlyhXD1YhE9XBB zPkbT9t0PSjYJJ0pSzpKWAfvAIBszc8SCXVmpKuHYLXPZLg1Ppl73HkM53C9OGaZFEuD Qt/0i+coHgByVEyyOsaGiAflEtHN5ECIfQU6wtEFX8rFGubh975P2qDi77WydslFzDi5 dJHNxl73fQUh5Cqd3R/nVuYzOOfkPtjnA5UVQrMMEwavnIRgVtfhKW2bK9OVKGD/LC92 N7dQ== X-Gm-Message-State: AOAM531YNLGCDkytbKm7x0X1KBnRSaa5aDq/Vxn7cQwJOp1MAm+AV3uu zvbrSw0vkSTW/e/VnYGTF2x0zQ== X-Google-Smtp-Source: ABdhPJwGWMwx4uEMmMe4xI35VJuKvVUh0iOMVdsx9PM2Ieciqnu7NTd4quAwzCMQs6ie8f1mhw21eA== X-Received: by 2002:ae9:eb08:: with SMTP id b8mr1484019qkg.1.1635851470804; Tue, 02 Nov 2021 04:11:10 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 04:11:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 49/60] target/ppc: Set fault address in ppc_cpu_do_unaligned_access Date: Tue, 2 Nov 2021 07:07:29 -0400 Message-Id: <20211102110740.215699-50-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 Received-SPF: pass client-ip=2607:f8b0:4864:20::730; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x730.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-ppc@nongnu.org, Warner Losh Errors-To: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-ppc" 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(+) 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);