From patchwork Wed Aug 18 19:18:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 498922 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp965910jab; Wed, 18 Aug 2021 12:23:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJy4+wsZoD7iPeCz/2WNuIfxWenAI2w96crSmF7IfvN7m7muoQRR0o8YdiMUXhz56TJUEx X-Received: by 2002:a6b:490d:: with SMTP id u13mr8393064iob.176.1629314632780; Wed, 18 Aug 2021 12:23:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629314632; cv=none; d=google.com; s=arc-20160816; b=k5GBHhZNjdHfm/Bl849G8BvrMePaoD3WPdpLNg5M2uLv9wNB7/J/KrRESnTGQ54slJ LLI/e+9C9wpamP9ZHVSJBJIiXlEpt85e31PwFVWiliYciGAIn92Zd3x/wbO5fLLgthBU Gr1ZTXh3ATlR49TQtGzgvwlpTPskBob4j36o17ojO6XmVf3wE8wqYl6iaU5TW5O8AH1Y 9U9rhfWC9j47Am80VXd9hzqCVhzi1Q+HWLBb8PEtNoIfkzidGI8WTvJlfRbHT50sC3aD hMoz6QxZnwkOz/n16s1SZ1Xk7uBBf8oeagISI0aEm8WbYEiGbob5VpErpy4VBBZmKmE6 yApw== 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=KU5GqqnHBwJE2oQY4NvVS8KLTvZHsylgeTI1DbvIUb8=; b=z78wxXchOUkZg6Mk3TU5YlQB4xD83cv0p6IecwY6/LfoVPAAPGw5sZiIbl9D0oyo9d sg/6J/rI7IztduvvoV+i9GoYlYCUQLu0QUdTl7o6h0o7mdlzQCGyDlQAqjHhxpBFn+BD p9DMRAwnWA+ii5H9oCbU2LdIEjL0qqx+yv5jwP8NRm1AQuelxkQLEzI1kJbDJ9qoboDp IMVaNtGhvQ/lDetyi1BCIe+N6b++Cy38xCwf/mKkloMH4WA9ajAIcjZlR2QMHk3EUL/g FhtRBYSU7jyaCS9MFiSFkfG5U12SJoRDlmy9qqEDEQ2hCGi/rBW11kQ19B1J9BoHa2XO eZAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XJzJOJ5i; 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 i13si843391ilm.90.2021.08.18.12.23.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Aug 2021 12:23:52 -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=XJzJOJ5i; 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]:44042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGRAG-0006Nt-82 for patch@linaro.org; Wed, 18 Aug 2021 15:23:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGR6E-0000PH-MY for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:19:42 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:40677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGR6D-0008Ul-Av for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:19:42 -0400 Received: by mail-pg1-x532.google.com with SMTP id y23so3299733pgi.7 for ; Wed, 18 Aug 2021 12:19:40 -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=KU5GqqnHBwJE2oQY4NvVS8KLTvZHsylgeTI1DbvIUb8=; b=XJzJOJ5i7POCCWnTghvc7n/d1yACvi25Qm5k5YHF8sypTt3SPFKxocr0MO9H6Fx6lA JD8njcXcvG1lSQ4Lg4hCAjA/lEkerpAbgpP4QpYuNeDjQI1vmTQEc0pvpGeRTlsdZvTg 01huFulTTPPriyR7vAYc9JTqf92/iWawrvPybR7az7KRtQ9f9BJQhZxby1cfIvTdRl52 Ntg3su7zFHwHIooIWowgEihtoPXKtWE3tydxXBPRIP7FWG06spofs6ZeyvyvH6bfodX8 oAq2W+Vk4RrhmC5nbCL0mf6XlQktyFiJ//BMNwBrh9qhQHU6bSjX626wq+x6MmmPgWXw +vDw== 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=KU5GqqnHBwJE2oQY4NvVS8KLTvZHsylgeTI1DbvIUb8=; b=dCHNAsl2IFHGAmCqbuzlLF5AR8gL05PLE1Fmr6JE/l3XvcrxVgamnyOpsc9gvcKxLE PEttG7u9yLHOepfWrPyafPTQsnUQmT5iC/4Oahk99KoOoYTX1LSg7UF6UGcwem9JkL4P iRejC1cxRD8I+yuwbeAUJBVTzYT7NjawABeT79h16jkI17LHcPSrPtCusGJn5Ks24P62 oSg+mInI9O0MBUS20Sr0YbeW5hg2cLbkJhplIVZBQRy52Aarx/T0salu+J/PzioziqiH PNFAvO12k+EHPvq0M01VGUGCKnPTfjpFZQcRtHecd593EuGIPw0gJohAi2JKctqd6xjM UJlA== X-Gm-Message-State: AOAM531e5ESnrQNcQtnnuXIkRJuRTTKkLlnzxIdSZuWrOdY/ZAuXx4qz fekLsKv4ChKFgjOrCnBRvpwIcNa/RDNisw== X-Received: by 2002:a05:6a00:805:b0:3e2:f682:1b32 with SMTP id m5-20020a056a00080500b003e2f6821b32mr3655916pfk.60.1629314380126; Wed, 18 Aug 2021 12:19:40 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id a6sm524108pjs.40.2021.08.18.12.19.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 12:19:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 14/66] target/sh4: Set fault address in superh_cpu_do_unaligned_access Date: Wed, 18 Aug 2021 09:18:28 -1000 Message-Id: <20210818191920.390759-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210818191920.390759-1-richard.henderson@linaro.org> References: <20210818191920.390759-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x532.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: =?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 c0cbb95382..d6d70c339f 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); }