From patchwork Tue Nov 2 11:07:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516684 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp4444406iml; Tue, 2 Nov 2021 05:02:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEi/IOCi20HNYKn17AqkzngALyBP2ymyqsSxIKfetCin9RlYln9lg8CRWf98i7koF3EIVY X-Received: by 2002:a05:6808:14d6:: with SMTP id f22mr4591103oiw.101.1635854575669; Tue, 02 Nov 2021 05:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635854575; cv=none; d=google.com; s=arc-20160816; b=umd0pwl1AeiwknmYCvwP3ddir7NiOW6DDhuwPAU1jIE0yJlekIXGh8cmlySiq9f/Pt K/pODaHv+0qD3xMpLUCXB+JuVezEzDix1NtHRuBHl0rfWCfQJcloMMtUsR/Az8MKky0E Hnk4L2JGVLP7ypKGy55HAZMlC1aXQ3Af4iRcGTP4sIbuKNB9qrC4jybHfUkZhRJRHBwA UjUnpaovklPEZMM8ptFVOM3Eu31p9bmplWAJkGwW9HCD0gL8bhCIW0nS8omfIZpcKPsg X94kAREvZYvP0vR2T1tl9IAGEniBQpijeQGZb6KsYi1P/Dv1OIJt6t4i8ZJjtXYixNsp lr2w== 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=3/CJUXQvBCEoPlihnnAPxMwhS0SfN83B4jFLy6O6YSI=; b=aMqvI700BqbAztkGcFIIruM6UUittvfLmtiRInv32davZwxbFfNoJIcsH0u1JFXCR8 f2bfwTOd8ec6e+f4AkrPBGBspmWXdhiroMGud98HrjikyXMYvaaRDngN6EGlpETlIcea x5D9XkTVmtu3p46hp4KjmGG85XLaI9ypNLJf71ZxZyrKRUJTd243mNeVENGoaXr22lpC oBiZTl8cAwxiLccSPXoi8h7VsnLdWxjm6dQHpzoTvQsTwJT0y9jQCCFbB0KZijWJP5eA 8xwGkqGwkmrjgAuQXUG5BFTGliktKGXlJ/yFc3iqEM+/dEXW/vw0uMHNTbUdT4fZOxvM U/+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HkmiMGny; 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 33si15412995otv.158.2021.11.02.05.02.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Nov 2021 05:02:55 -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=HkmiMGny; 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]:54066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhsVD-0005gW-1O for patch@linaro.org; Tue, 02 Nov 2021 08:02:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhrhD-0001b3-Li for qemu-devel@nongnu.org; Tue, 02 Nov 2021 07:11:15 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:38541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhrhB-00020C-Py for qemu-devel@nongnu.org; Tue, 02 Nov 2021 07:11:15 -0400 Received: by mail-qt1-x832.google.com with SMTP id h4so17869324qth.5 for ; Tue, 02 Nov 2021 04:11:13 -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=3/CJUXQvBCEoPlihnnAPxMwhS0SfN83B4jFLy6O6YSI=; b=HkmiMGnyWOOqa4GQSEbtV6qObdJv69K1qJh4yUj+/Ejafg4m9CoNLBbTIrypKWWRCh /2IpX9BFAeMknOr1zl2rtkTzX8LTx2fnpSHAZYpPHrkAI9DBRZxsYTOajWT7YA3pBXjD CTW2tdsSGdWLxhQKNP90VdWhHxDf0wY7olmcyUTFJAqox3xnAYbSzhhDEZ34r5iYWNJ+ wlJZnHXgkmm8b7n6uGY3ODcwCpZjxmjWqYfDhkQCUcRLIPVbWdkB+KeotSgjAI5TgwhK kR0ZwZjVoobV5woLHHYjmbAiEkP38nPXxn4r3dNIncB11QAez6nyxtOGPWaEucf6RAs4 jUQw== 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=3/CJUXQvBCEoPlihnnAPxMwhS0SfN83B4jFLy6O6YSI=; b=pnK1RhZ5ae4Ut5MVGy/VmEvQm67CMnoRADuJESWBl4HNk7q3N9Oz9S2O6JRZiOaFeY cKI+t9VCpk6PQqKMMAmznlW/Y3Yj8/J9z5H9E9Kvl2dx+vNjgSTsb3b95zD2L5fKIGZ5 0mqHta96WAAnBbujrU4K7EGtHC4Qi6NiG+r/y/wcqzppiECgrcAdKBu5bfvS2dFDRVIR kc+tSd0dufG/zrK6UP/1j3x31kU7CCM00zosHGyB9oC5dJfOjCtwglGaJ0b3XR9v9PhC 1qbjQATS8FNOCDNfvj2rhDD72ToFRDCClRFPxnXndsDdEahWVo0BJG/iHjvdJ5GaeR15 PzNQ== X-Gm-Message-State: AOAM533KAIETVrPMXPtevPkzZmacB+BwNnjfOGoQoWCCuqfKECGNjH1Y yiF0Rl/XwbDZPGsAkIpsZ5tiLL0bI6yAKg== X-Received: by 2002:a05:622a:2c2:: with SMTP id a2mr32279346qtx.305.1635851472960; Tue, 02 Nov 2021 04:11:12 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 04:11:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 53/60] target/sh4: Set fault address in superh_cpu_do_unaligned_access Date: Tue, 2 Nov 2021 07:07:33 -0400 Message-Id: <20211102110740.215699-54-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::832; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x832.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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yoshinori Sato 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: Yoshinori Sato Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/sh4/op_helper.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.25.1 diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c index c996dce7df..752669825f 100644 --- a/target/sh4/op_helper.c +++ b/target/sh4/op_helper.c @@ -29,6 +29,9 @@ void superh_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) { + CPUSH4State *env = cs->env_ptr; + + env->tea = addr; switch (access_type) { case MMU_INST_FETCH: case MMU_DATA_LOAD: @@ -37,6 +40,8 @@ void superh_cpu_do_unaligned_access(CPUState *cs, vaddr addr, case MMU_DATA_STORE: cs->exception_index = 0x100; break; + default: + g_assert_not_reached(); } cpu_loop_exit_restore(cs, retaddr); }