From patchwork Fri May 27 16:47:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 576520 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8607:0:0:0:0 with SMTP id bb7csp815983mab; Fri, 27 May 2022 10:04:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7enVJej7mNG249kwWYyxbpJtcnCimCMns6xVbj9Y7dgrqR2ylCwmZA29EqgSH3XjAppQl X-Received: by 2002:a05:620a:2412:b0:6a0:5f8e:c050 with SMTP id d18-20020a05620a241200b006a05f8ec050mr28628542qkn.462.1653671064698; Fri, 27 May 2022 10:04:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653671064; cv=none; d=google.com; s=arc-20160816; b=Jb3hURBfakNv2CO0Vt4NsD7aDYjhLoD3AfOJUbxZltm8PoHI3YYWvhIn+OL2IJGfa0 NF+wWgytHh26NxjA96HWseHuwQMzNskw+z4Z6KjNNChMWz7ku8VxUT1kl842F89IGcwV qZC1Z3vYOlzwN8UBG8ggqjGwYK+ZLapBOTTPU0liUx1+EhFxLw8dt6tRuHuY+m1gN56P ESI+7R6lU3tzwqge15TPikGegyWtJMa8xVE5GblPQNe8nn31msoca3f5Ig0CBb+sVL0k P6OAcVW3fRWVCq5W2swQ+fgUiOHecH+qdBFllcDRI06xWxpwOQcenOdEEqO9YFKUXpuz gjyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=CpiwNuN9uaF8J7CUE8swrx6xThfojHeB858pnr3+AiA=; b=wS+GcIwY8dr0YQHYNkmH+p2hgZo/hiYe50j0oSx73VkewJLfg6JY7WJn9AoBIc4xFA /jbA2mSVkK/5kIMgaQsSRjiZV6O6HsNkL68JP33mBo6pbdpGT3K0W6AF78BCNZ5QpviJ TMKvRs3RdDvJxprgpeEU1caCNw5dzk4Lb9+H0WDXOhtDMlYOAGs5c93TG7j/7hK7DmMw fUms9Zs2PID2Peap5BKZQxw3SH10UJ5+Rq/nYFLgCrLw+XqIomMxr5FltxaRExtWWJ9v hGBDydAmzTZborMQASFIZfgh/iUhmJzfgZ5XqIHdJcv4luy8fptbeiAp89W3qYyA8wZr L5bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rF8uUKHF; 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 6-20020a05621420c600b00461f287ed36si3472532qve.361.2022.05.27.10.04.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 May 2022 10:04:24 -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=rF8uUKHF; 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]:41454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nudNw-0006dK-9g for patch@linaro.org; Fri, 27 May 2022 13:04:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nud8O-0001Wz-Ks for qemu-devel@nongnu.org; Fri, 27 May 2022 12:48:20 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:43840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nud8N-0005Ow-37 for qemu-devel@nongnu.org; Fri, 27 May 2022 12:48:20 -0400 Received: by mail-pf1-x42d.google.com with SMTP id y189so4764241pfy.10 for ; Fri, 27 May 2022 09:48:18 -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=CpiwNuN9uaF8J7CUE8swrx6xThfojHeB858pnr3+AiA=; b=rF8uUKHFA/lwUj7qslXyRn0RJYth79NoaRGgpwwhDKdk4hhVDBPgesoN/f8peVeQat qx92CuaejyNgD7xS8X4sWR7WL4UJv6hlEjXWPN9dxQKCFPVUYF42oYXU9+onBcL0lKbC StYPZQ8M8k7XHMesKsSk4XoWTVwYH26g7h3AkXGEREM/AvBclw60rCrvioy6lHy0M9N2 b8P4ZANC8hQA+96xvl9KNuANr4l6RQhxkHxn1wH0mO7Yes+KxECCwa88EisoPhG+oZh9 QFoqZ/ZryVT1xnSGrprQQljyJ95z/3XCiXSEJl85KhBk2d8W74DfE3Gxrya2j3QiISDF j80w== 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=CpiwNuN9uaF8J7CUE8swrx6xThfojHeB858pnr3+AiA=; b=Bv7mxG37mxWmHZjipgx/5Xnn/EPCXLAN9QTPCohdNPyEhpSwe/HSy9uwtkvyokHHwC 3R7Nt2WG7SvAr/AcD4wXiYWDqUC9OchQifLs1iQvCRmF+LnpGHo0TjHMnlAlcRUJVbEB EkPtfq51bo1xxymGqKIF3gx/mFZDx3JQG02y3tex8Lhv+kWoteQauVyx2vbRLLLunpEE cYrbViYy9MQDYwKjNOHqKm5UTQQnMr6+UTN4dPLwTsjcWSDaAjZ4IWP03Hk4qxrJFDuu TJXi6136NGlEfYOjod6UmotHK5WJcKXzxU8ozixl7c5KzUcws24XzWCTDkAKY2DAki20 ZoyA== X-Gm-Message-State: AOAM5309BSe9gTnGprMwS2cyn1RUADKKXF+kOl98F3MyL2/G0pUFHAPU xU9UYnPVfXutqdpXMQMCd4r9DJjQmH5weA== X-Received: by 2002:a63:91ca:0:b0:3fa:e255:5beb with SMTP id l193-20020a6391ca000000b003fae2555bebmr11378454pge.70.1653670097786; Fri, 27 May 2022 09:48:17 -0700 (PDT) Received: from stoup.. (174-21-71-225.tukw.qwest.net. [174.21.71.225]) by smtp.gmail.com with ESMTPSA id j11-20020aa7928b000000b0050dc7628133sm3861420pfa.13.2022.05.27.09.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 09:48:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH v5 09/17] target/m68k: Fix stack frame for EXCP_ILLEGAL Date: Fri, 27 May 2022 09:47:59 -0700 Message-Id: <20220527164807.135038-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220527164807.135038-1-richard.henderson@linaro.org> References: <20220527164807.135038-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, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" According to the M68040 Users Manual, section 8.4.1, Four word stack frame (format 0), includes Illegal Instruction. Use the correct frame format, which does not use the ADDR argument. Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson --- target/m68k/op_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 3cb71c9140..aa62158eb9 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -391,11 +391,14 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) } break; + case EXCP_ILLEGAL: + do_stack_frame(env, &sp, 0, oldsr, 0, env->pc); + break; + case EXCP_ADDRESS: do_stack_frame(env, &sp, 2, oldsr, 0, env->pc); break; - case EXCP_ILLEGAL: case EXCP_TRAPCC: /* FIXME: addr is not only env->pc */ do_stack_frame(env, &sp, 2, oldsr, env->pc, env->pc);