From patchwork Tue Jun 29 18:53:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 12350647 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5AF9C11F67 for ; Tue, 29 Jun 2021 19:23:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95BEB61DE3 for ; Tue, 29 Jun 2021 19:23:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95BEB61DE3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyJKn-000367-Qc for qemu-devel@archiver.kernel.org; Tue, 29 Jun 2021 15:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyIsu-0007sS-FB for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:55:01 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:43858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyIss-0000q7-5T for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:54:59 -0400 Received: by mail-pl1-x630.google.com with SMTP id v12so25493plo.10 for ; Tue, 29 Jun 2021 11:54:57 -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=FBvB7U/HcEMO5AJVKY9MEDQbcWzedaB5pCNHh5Z+IcE=; b=zYlpJtTRdoBPO+R0OZUhw4uQAe2Qyyjq7aUAdMQOsKE74Yxoy5kplilLW+wDcBBeog KtjM4pSS6bPRzJAmNsVliFqrdB5FGK+4mEpolFmH/k5+DVjMVqL1tTYNuy/CyuTg0gPh 3Bj9JBBH3XoI0IHhDED4xfDTzr+MZYdIXZXpr4MTVGyXFFJ8JkhDt0MVdb4QAd5dm4A6 +KgBTo/i95IAGMzJUfdIS+YCQD0QwAZ8btcrMYd/fsf4K4jz0s8bauBJuXrWKC1fBnDw ICY++l/JHNj0aeBXrUl5zvLNZ2rUW3qgYoeH+2PlYN5B7+zAXwwOP+FOTZgmV88hLN76 Mm6A== 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=FBvB7U/HcEMO5AJVKY9MEDQbcWzedaB5pCNHh5Z+IcE=; b=MQtjQQj5nxVAOZfYW/rgdgJ0pjRBfpxTge/df+anM/dxnYOnQkrBpNa2HaYckPYtX5 gSoK4GkkNO7jIrBIPhzCnZFGQKwYC4FgWruR0nDd2agn4C6oz2hno3gVrV0JzHE00Thn tzauMznF/OL8CC69v4PFMmsJvm7R31rYBPm0GD79SIeWK2J4d2EZfIFFY6tZaL7elBmI SAhUpq1q2naJpR+zTQIJwU3x2spd+V/ecb/SL0tJf85/kK/ivFKoP85KNBB0TKWGfHq0 FN8jRUbhlRFdOcUFrN92TRjqP0W0+sBcyb/fZwIrNlB6duAxOklvxVUM/g6NI1eEmLiw xdnQ== X-Gm-Message-State: AOAM530A7Ah7yQ34I3D65VyO3a4Fbri/VWMGL4Uvoj1aJKcGZm7dBdVm xd8cOFpQ1CxEgdff5YMEhCZ1rCX8tLJO3w== X-Google-Smtp-Source: ABdhPJxrcU5ggjSvHy9QfqeU/2crQoX7k0eE98y1oez6j8XGC+6mM97iUPv+QFr+YvY7/AC6/ahNgQ== X-Received: by 2002:a17:90a:8588:: with SMTP id m8mr315362pjn.160.1624992896720; Tue, 29 Jun 2021 11:54:56 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id j2sm18811253pfb.53.2021.06.29.11.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 11:54:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 01/63] target/nios2: Replace DISAS_TB_JUMP with DISAS_NORETURN Date: Tue, 29 Jun 2021 11:53:53 -0700 Message-Id: <20210629185455.3131172-2-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::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, 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: Peter Maydell Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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: Peter Maydell Signed-off-by: Richard Henderson --- target/nios2/translate.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 399f22d938..388fae93a2 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -37,7 +37,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 */ #define INSTRUCTION_FLG(func, flags) { (func), (flags) } #define INSTRUCTION(func) \ @@ -209,7 +208,7 @@ static void jmpi(DisasContext *dc, uint32_t code, uint32_t flags) { J_TYPE(instr, code); gen_goto_tb(dc, 0, (dc->pc & 0xF0000000) | (instr.imm26 << 2)); - dc->is_jmp = DISAS_TB_JUMP; + dc->is_jmp = DISAS_NORETURN; } static void call(DisasContext *dc, uint32_t code, uint32_t flags) @@ -269,7 +268,7 @@ static void br(DisasContext *dc, uint32_t code, uint32_t flags) I_TYPE(instr, code); gen_goto_tb(dc, 0, dc->pc + 4 + (instr.imm16.s & -4)); - dc->is_jmp = DISAS_TB_JUMP; + dc->is_jmp = DISAS_NORETURN; } static void gen_bxx(DisasContext *dc, uint32_t code, uint32_t flags) @@ -281,7 +280,7 @@ static void gen_bxx(DisasContext *dc, uint32_t code, uint32_t flags) gen_goto_tb(dc, 0, dc->pc + 4); gen_set_label(l1); gen_goto_tb(dc, 1, dc->pc + 4 + (instr.imm16.s & -4)); - dc->is_jmp = DISAS_TB_JUMP; + dc->is_jmp = DISAS_NORETURN; } /* Comparison instructions */ @@ -883,7 +882,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) break; case DISAS_NORETURN: - case DISAS_TB_JUMP: /* nothing more to generate */ break; }