From patchwork Thu Apr 21 17:31:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564421 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp659056map; Thu, 21 Apr 2022 11:03:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRnL7KoZCQxnHqGYTD9+tfJY9Jj3lRcybqOPsNr19xSOb2K3t5HifToEKy11CfUjKY6Mck X-Received: by 2002:a25:ab33:0:b0:645:7995:86b6 with SMTP id u48-20020a25ab33000000b00645799586b6mr1002584ybi.60.1650564207303; Thu, 21 Apr 2022 11:03:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650564207; cv=none; d=google.com; s=arc-20160816; b=VKSFxwxPaSrhPklVyWzYEgJum1Xi0gkO5MO/gobS3EJbn3nTN88eYNyjfgP9w8PlG9 0sc9sWSEhmfAur3408GLcYxb/8aLI6/OLW3NLD6wD5xb4Tpsf1FxkL7YLyxlzLRdWyu9 4Bd+ft9lWEddwvEQtGi3emagMRZxqEHGCWLFhjRI1bdiOjRmPl6hTP6+TuSgLiWxH6qg VOZihq/8Etrs1KUCd5BdQMG78y8LY1lxcRJR+EJ1gMsO/7S6RMTwvEf8fofYWtvLiFXU 5FmjXJRM59ztvLtc1tCvsHNxnPk0YnItbdSVkwlK5PYEPpdfgCvaAq10Q3TdyhmUVpTh zn2A== 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=ezPeHZwRhMK3J/mr8sMEjy7zxNhMKWlBGFUNACOiAjs=; b=0TzI/o9ohXATzCgmK+fmrIfufWLOv5trTF3em2L+MrxwYKgvVK3cJdMNX8JieLrMHC dgs/yUFgRLapZDd2MEtInsRhhmntwvc9ItS4RZLTelhC5rfS+JARC2W9+UgFrjhQAWL4 ymogzJ6R1Di2f5+flhOpeElBEMyj2+6mHPg8AJEI5bEm62EldZRe79Nvq1p93m1ZAjTT BniAb6Flm/M36wq6hHrtm6SsV3/gtdwyGkloWjm/UIwBf03n9Z27rNVwQAu7yHTVwBwk UfJhnqJQ8hAbMf5yMFDKO394Uh+lxjWvNT9a0PkHgNmkGs7AX9zy++qbkA+a+DSltUzk zv1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XJsmN6C7; 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 g191-20020a81a9c8000000b002eb9c64ef93si3332516ywh.337.2022.04.21.11.03.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Apr 2022 11:03:27 -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=XJsmN6C7; 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]:40814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhb9K-0004Hw-QN for patch@linaro.org; Thu, 21 Apr 2022 14:03:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhaei-0000n4-82 for qemu-devel@nongnu.org; Thu, 21 Apr 2022 13:31:48 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:35676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhaeT-0002wm-QW for qemu-devel@nongnu.org; Thu, 21 Apr 2022 13:31:47 -0400 Received: by mail-pl1-x630.google.com with SMTP id b7so5524535plh.2 for ; Thu, 21 Apr 2022 10:31:33 -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=ezPeHZwRhMK3J/mr8sMEjy7zxNhMKWlBGFUNACOiAjs=; b=XJsmN6C758zstOfcrMcZXbV3mDOq/rKwctUmPPXaaqZMVUcM7weBAKUfaUKHuj8gUY IpfKk7rKJw9LizUHiKYNrrvDB6TSA8d2dlu+woyA+Y5y/l7pVxTJVx6eyFA0MKtn05tY BqpvTxHTqmGnpj8j6Jl30/vTqnqDOIcpXrWqkgILqyfIS7h27TpDqSAst0wjoN084F6y hB1cckGZ0I13W/S/cAvuTFHSi3PyZnfszbb23STVO4fl+Bqvd1NfY9ILkzHY1rs7U+ce YawxGyTtpajG6yoYBodghAHnYx8MD2gd8tw81FouKHLVET6qNYubEpgDeZN+51yX+FlC Ne4A== 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=ezPeHZwRhMK3J/mr8sMEjy7zxNhMKWlBGFUNACOiAjs=; b=0jwFghhE9dFSe/gbKTbvk+nsU/wxLpS9a2SpV+xyLTlTNCKtypgQ8RY/OqW+xQ0j0I HAO+KkWe0h8h3+tuwpLUX78JHRTWeg/kyFJcjZisU4986XnX3iffRS1ezWFYbP+z/ZoU MCbw1igYP7bVANEn/N+dAk+vGC3iZEzaPdE5SXnh+xGBYGzhN8nDZU/GyfbJnMuuBmsK YhM9TBbuHO0Ks+KaC6cT2Sp5+uFp9Kb+LRWZWWsqLwniZO/NavsNDQAUgMETT6jdXr1Z qLwWmXuhc2oNoAYiZubaN8HNUwqhS+7mxkJpPXhHdzF3x0DtD1W8P1OYj7J7qH8Lapap lyqg== X-Gm-Message-State: AOAM530FBMxMH4KmewzEVTlVzugjOpV2gtK2O5eaTHFtUe4qTb6Z6YzS fP28dUUFqhc8ncOBV58i6sgkkPzBO+NgspIj X-Received: by 2002:a17:902:aa06:b0:158:f13b:4859 with SMTP id be6-20020a170902aa0600b00158f13b4859mr454547plb.141.1650562292482; Thu, 21 Apr 2022 10:31:32 -0700 (PDT) Received: from stoup.. ([2607:fb90:80c1:f8a5:3d1f:84a9:7713:bf09]) by smtp.gmail.com with ESMTPSA id 204-20020a6302d5000000b00385f29b02b2sm23557644pgc.50.2022.04.21.10.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Apr 2022 10:31:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 7/7] target/rx: update PC correctly in wait instruction Date: Thu, 21 Apr 2022 10:31:14 -0700 Message-Id: <20220421173114.48357-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220421173114.48357-1-richard.henderson@linaro.org> References: <20220421173114.48357-1-richard.henderson@linaro.org> MIME-Version: 1.0 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: -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, 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: , Cc: Tomoaki Kawada , Yoshinori Sato Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Tomoaki Kawada `cpu_pc` at this point does not necessary point to the current instruction (i.e., the wait instruction being translated), so it's incorrect to calculate the new value of `cpu_pc` based on this. It must be updated with `ctx->base.pc_next`, which contains the correct address of the next instruction. This change fixes the wait instruction skipping the subsequent branch when used in an idle loop like this: 0: wait bra.b 0b brk // should be unreachable Signed-off-by: Tomoaki Kawada Reviewed-by: Yoshinori Sato Reviewed-by: Richard Henderson Message-Id: <20220417060224.2131788-1-i@yvt.jp> Signed-off-by: Richard Henderson --- target/rx/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/rx/translate.c b/target/rx/translate.c index 63c062993e..62aee66937 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -2285,7 +2285,7 @@ static bool trans_INT(DisasContext *ctx, arg_INT *a) static bool trans_WAIT(DisasContext *ctx, arg_WAIT *a) { if (is_privileged(ctx, 1)) { - tcg_gen_addi_i32(cpu_pc, cpu_pc, 2); + tcg_gen_movi_i32(cpu_pc, ctx->base.pc_next); gen_helper_wait(cpu_env); } return true;