From patchwork Wed Mar 16 05:58:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 551819 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp1281mag; Tue, 15 Mar 2022 22:59:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx81Xvz0FA2dkiHchohuyMbYukOf8vq9w+2imoJ6nT7UXgaVeqBSLdh+tPUMCLzfnCo+cwW X-Received: by 2002:a81:3492:0:b0:2e5:ab19:1e75 with SMTP id b140-20020a813492000000b002e5ab191e75mr367831ywa.513.1647410376798; Tue, 15 Mar 2022 22:59:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647410376; cv=none; d=google.com; s=arc-20160816; b=dnQaREP1T106ysIMhIPhmEDfjSqpSZIb2uBFZB7wnFiyoN3lqlHiQ9KipUQRFpAT0h qytUrZ1fvQgL5PD9+LlPe0tXvvX3LPqfIF4InTGm9T65AwEmF7AQwPtmmcyN2+pCTVxq VHXnJTbknnbitylvD0CXf6sxtAl2obhjCPNXWhlm+9fuK8eqznB03ciahygiXUEodfE+ GGVbWTfK35CV2KdtP4StiGEHNFZOCQDePjpAqJuZr69Z0VImXPVCXq26x1STJkjd+NoR mtNyYkSTi2K1AUQ8R8k9KZKmu2hDMS5ITWC0CT+tMdfgfy59Cjua1jX0AFJFkGJbFchE gIaQ== 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=rvV4NjaUkhI/j5swYe2ptLLF6nfhOIUNvVwyxn8c7gs=; b=ewcHovDujzzf/pFs89PIE4OPq/cAq6Jvut5dV+qE7/uPU0xGVJr/Oa6/q7krtU85x2 24mdgmsKx5ebS/k+F5Kfl0l+5HxRUwT8AL6fBoK9Y+NzxjaGa8cUPBOKnZDzSdrvb7O3 rSJhHrE+4d2nddngnQqZLsDCqqczArpdbRk/O4SXZOVwsxTx/LD1dPhNYfGgaYKfRy7+ nXlp/qVJalDfxYdj/WlbYX4LliA+otPeKQsf3JwiKZDsmrdny7K+3mSTMW7gleP9qBYc eb/ZtGu+KesMmwPgk+9u4leIZnLSD3j4LMBXt+MamMOQ+uD8U8GPF3dtxW6B0OUX5Vn5 8Hng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xeinbUzs; 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 l30-20020a25b31e000000b006289e832c4dsi1105932ybj.370.2022.03.15.22.59.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Mar 2022 22:59:36 -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=xeinbUzs; 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]:48730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUMh6-0002Yn-6t for patch@linaro.org; Wed, 16 Mar 2022 01:59:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUMgP-0002RI-RK for qemu-devel@nongnu.org; Wed, 16 Mar 2022 01:58:53 -0400 Received: from [2607:f8b0:4864:20::630] (port=44675 helo=mail-pl1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUMgN-0006Sf-PM for qemu-devel@nongnu.org; Wed, 16 Mar 2022 01:58:53 -0400 Received: by mail-pl1-x630.google.com with SMTP id q11so944582pln.11 for ; Tue, 15 Mar 2022 22:58:51 -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=rvV4NjaUkhI/j5swYe2ptLLF6nfhOIUNvVwyxn8c7gs=; b=xeinbUzsIGya5s+DnNSUN6n3gnZy9sttP4EPAEYzMb3ZyJKp4C9js/7hV39SWyvQql HazjuZ+vOuSnDckRGgmV1pND3NyLdIY5ddo+dCizmTua+yn9f9CiUBOh6ZqOMv0Lm7Kv cOAgxm+zQ40KoFQ7R6bT73onj3BdcZwauNCQVVHfHPaio7uRje635qT4lMxHGe8B9u7y UFwrOX8z1rygBo8DT3uYsoMnccMxp+bd7JBVY1btQ4ttacjt9Hb6yFptXxViy/eBF5TV C9XFG83/EQI8TqeeCx3N5PwQJE4TXy6JdzVcOj5fsmxqoUhnVKHFoB6Smy09kQjJZ47A /6Mg== 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=rvV4NjaUkhI/j5swYe2ptLLF6nfhOIUNvVwyxn8c7gs=; b=0kPUaks9gL1CttJTbENdteJAbhafnZcSv1CBA0ovZZWQ1L6T4t3tY0/IvxfwLaBQEd vg6jAnapCk6/IfyI0oQZx44pM30fqrcBwYfy0sJ7hPRVQyCMrnjSXjtilpc3F2z+0RrC n0tCOpWcKpG7Ti5bLXr1pg3hGMUiGcGM5FThvqKi8Cmw+pC0A+++zyZy6ENqr/sqUH+3 xakT9vVFM2mGup7d4+DIXJpQq2qJ3NYU8fd6cSJ8vjfgISjKThwfWbqJi4CZA97nMWTU JGZ+nf1uD4n49Ke9eaQ+VC2arFzbozqmhqGZOsqIhVJC+cfj9MiI1+9iXOdxTIfZtaMu isZw== X-Gm-Message-State: AOAM533ALwWZyDg/YD44+hMvltK6DhL4JnyujwHhLN5qO1OHsLfTmRCd /+10A5mYzKhsjGoJA5reFpa8m9TKLiRjtA== X-Received: by 2002:a17:902:f684:b0:151:93ab:3483 with SMTP id l4-20020a170902f68400b0015193ab3483mr31759845plg.4.1647410330533; Tue, 15 Mar 2022 22:58:50 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id i24-20020a056a00225800b004f6edabc9f4sm1236290pfu.72.2022.03.15.22.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 22:58:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 09/17] target/m68k: Fix stack frame for EXCP_ILLEGAL Date: Tue, 15 Mar 2022 22:58:32 -0700 Message-Id: <20220316055840.727571-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220316055840.727571-1-richard.henderson@linaro.org> References: <20220316055840.727571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::630 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" According to the M68040 Users Manual, section 8.4.3, Four word stack frame (format 0), includes Illegal Instruction. Use the correct frame format, which does not use the ADDR argument. 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 4140f65422..6aebf9d737 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);