From patchwork Tue Jun 29 18:54:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 468347 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5258870jao; Tue, 29 Jun 2021 12:39:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4OtQ92JwspU5QgBll2YG+8ShphU/67rNV3hQv+AK0d3r8GgSkedOZZP5RlAMpr3sIq4+g X-Received: by 2002:a25:b3c8:: with SMTP id x8mr42914897ybf.466.1624995546740; Tue, 29 Jun 2021 12:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624995546; cv=none; d=google.com; s=arc-20160816; b=HSQxiCvb2pVnj+f56NhRLuryWm/bxkfHh5jZmKsSBhSG0fjb1nOy7DeirINLd1ktYc DWmnhRDl7A5QRi9IG/Sxu5K1ih4c0Hmmb9WIySh5Nwj4mKyAo2MsgcDV6w/CMJy8RkSx c7hNzgVcsrIbvOdIPeSCxzeQYSO+K9izaST0zliqQRc6RJaCLt9ndHwN9Fc9Vy/rXl+W fgFAMQwuzNiz64JcLuk5/9BDEqdsIkkd1e8pCS1Z10aUWWie7iwtiy0yHwXUN/qmXaZx iSPSHdpH3TnQpCYqYE22SbS1CimwBLdD9HrV3/PMTQ1eOPahv1sVS0v02GGIkXaRimK2 6nlA== 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=aUaGX+sm0NS0DUU+29DBSLSesa8Faq3SdPEvW0Ohij4=; b=CbHD0BrgG/WBiO6vbaD6lbAfPhZA+XepuO5jBShm6I6V/5V4EJXMeI4nA6PwytzzaG qyROTmMWYHXCcR1hVMsA8oOoLhbOs/c1YkoHvOLBE2WLV4pF7SeeB06/R3p/CPW8+5wG i7YwfzoLs23fowC5D0FaPxFET9rBseL+nOuGa5EvM9ivxaQQN73UPIRWOt7Iw4fyytJC AfA5qfuXORia6I4yvOxkXxRW1zPOibqjAdWGs2j90qC+qtiQUnv7lJf1MfuEl89ycXAN Dq/ZkfBtr6bwS9ZXlVrEbuH4UCuY35EzjUEd6+159Pm0t+gcJTECwcj635xN1uZZAs6j MSFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UHS4IsIJ; 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 f126si11995651ybb.255.2021.06.29.12.39.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Jun 2021 12:39:06 -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=UHS4IsIJ; 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]:51194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyJZZ-0004Eh-QA for patch@linaro.org; Tue, 29 Jun 2021 15:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyItD-00085V-4t for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:55:19 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:42858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyIt0-0000t6-8l for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:55:18 -0400 Received: by mail-pj1-x102a.google.com with SMTP id ce18-20020a17090aff12b0290170a3e3eb07so3087872pjb.1 for ; Tue, 29 Jun 2021 11:55:05 -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=aUaGX+sm0NS0DUU+29DBSLSesa8Faq3SdPEvW0Ohij4=; b=UHS4IsIJwBOUMmFaHdgAnBQ9+WynlInRgIkYMA9Kq6IbBzQgL0KVV5ytjjUy3bzu61 9s52GhpUh23Wgdh+KZopwOE4ksqvOI+rD0st6i3wWUo1MyppWkHOz5HTjQ0TaDvPkOOt MrC0Ol/Uv9OwdvFO8YhQKzCND98sB1OjXdDgCNKuB2507WGpg13Db+Qs1ciOOtf1C/RD QqvM+ffdOXGscd3JN7/goq4inwHT0VBDw9fNoHXvEfM0nilKQSUYcFIOohNsB6FUCWNX O948KPm/UIVRo+L9PeOcF3qCe+BTSbmn8bE3PqGyS3nPok3C07dnUjaK/x60/HgZXGG1 TKXw== 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=aUaGX+sm0NS0DUU+29DBSLSesa8Faq3SdPEvW0Ohij4=; b=NaRWir5fopaIj4B/V1MbbCN8PO9oM66hY98aWLp8LcYyt5it46SZHdYpS5M/jdEa0V IXyyh0tlHn8g3LJbyuSiUwLm3y85RiTCYmwHv0+8UiZ2+Ia9C5dMpTHeVt+GniM+4bhu uRLgVpCAL5by2PQzvxQ8PR3Ee4yRASaArCJTFUlfEyzZCfpR4D7I8bGNVVyNiMKtlCrF yweYi2xCxZBfy5qvylmYgTGjBV6hasqLiIHmuocANmVRoNjd4y3J5gZFuPl/8OvDrLjV VMt0U8Vnk2Xamzy4UPVAIoieH1b6/dWBwAgGidOwGUZSejjaN+ASLkiME3v8GyR00InA Gncw== X-Gm-Message-State: AOAM533muIkwdaBahp2y66hS0i0YZhIEEjqUgps8CisyWMddCRpOeWMP Td5MNJWolMQtMuPQIyYvPyEAs80ZC6UvdQ== X-Received: by 2002:a17:902:da84:b029:129:fdf:f929 with SMTP id j4-20020a170902da84b02901290fdff929mr1123503plx.53.1624992904677; Tue, 29 Jun 2021 11:55:04 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id j2sm18811253pfb.53.2021.06.29.11.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 11:55:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 15/63] target/cris: Replace DISAS_TB_JUMP with DISAS_NORETURN Date: Tue, 29 Jun 2021 11:54:07 -0700 Message-Id: <20210629185455.3131172-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629185455.3131172-1-richard.henderson@linaro.org> References: <20210629185455.3131172-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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: "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The only semantic of DISAS_TB_JUMP is that we've done goto_tb, which is the same as DISAS_NORETURN -- we've exited the tb. Reviewed-by: Edgar E. Iglesias Tested-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/cris/translate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/target/cris/translate.c b/target/cris/translate.c index 8c1bad9564..e086ff9131 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -55,7 +55,6 @@ /* is_jmp field values */ #define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */ #define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */ -#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */ /* Used by the decoder. */ #define EXTRACT_FIELD(src, start, end) \ @@ -3242,12 +3241,12 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) gen_goto_tb(dc, 1, dc->jmp_pc); gen_set_label(l1); gen_goto_tb(dc, 0, dc->pc); - dc->base.is_jmp = DISAS_TB_JUMP; + dc->base.is_jmp = DISAS_NORETURN; dc->jmp = JMP_NOJMP; } else if (dc->jmp == JMP_DIRECT) { cris_evaluate_flags(dc); gen_goto_tb(dc, 0, dc->jmp_pc); - dc->base.is_jmp = DISAS_TB_JUMP; + dc->base.is_jmp = DISAS_NORETURN; dc->jmp = JMP_NOJMP; } else { TCGv c = tcg_const_tl(dc->pc); @@ -3309,7 +3308,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) to find the next TB */ tcg_gen_exit_tb(NULL, 0); break; - case DISAS_TB_JUMP: + case DISAS_NORETURN: /* nothing more to generate */ break; }