From patchwork Wed Nov 1 04:11:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 740053 Delivered-To: patch@linaro.org Received: by 2002:a5d:538f:0:b0:32d:baff:b0ca with SMTP id d15csp97550wrv; Tue, 31 Oct 2023 21:16:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNj+8yG55Sxwi5+f/27qu//LumO5Oen9dQTnawZRz/dafg6QMpt5LLAenVnVsFPGenTcLk X-Received: by 2002:a05:620a:14a7:b0:767:2076:5bee with SMTP id x7-20020a05620a14a700b0076720765beemr15101498qkj.9.1698812169025; Tue, 31 Oct 2023 21:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698812168; cv=none; d=google.com; s=arc-20160816; b=kWgTJJaUu12EUQL9KzW4CpU2+KtcRE2c/9+BvU3VA68q8iBxHGSMakmOsyFMR10b5F 29Hv9/4qAgFC7OS1aBa4qWTMkxJyY4X8W9MJXvbMdggk6FNBBVuHUGcJGEBapvrngqXA QiPzZsOq6mIy5lJrNcIKJasMW+TKQVc/tx3FbTAZjHvAq0Zi1N8pFMXjwrYWB1Gp4bb7 eRSSzjgqDG0VJp4QIUCjAPcy/6j0C18RBthDBC9E8TYmsDotxEtp608eQyesj09FldWD YR4LoTIk2WizccUnqaJMaYDaU/HY83NBzmb0aGWFtGQ5Bdl2mdRNwt3y768RGq0oKxmt ZdAw== 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=c7kpY1PECNyEhx9ZhSr9SclPou5q1iimRjB/rHnoAhI=; fh=TYrED6TOMxGX0VC4GtjviASLbYyJe19+7/tKWjN44KQ=; b=woiqPUARXN3Ho2VqJGRGGrcTuk8N0jP6NfBEV6j3xdGz5ekAPOjWy1f/01j5u5pqeR tyV40d5PXNFPucy7Ju1KOCmGC0KYa08Qix1qMI7Z5Jv29rOOn3GekBKG2s/LmdK5GQo9 fn+eiL7ukvxad7V9y7P/jwZMbfvl4jTbqfntzuMhUyek4+Rv2HyXuE9xqsmip6YGKMaE 1o6/3Hia3wS+v344lMkESqV9Oz2dvfSt6+WO5W4tJnjfSXT4l3xC2tSNXe1i1NlyVOqr j8iDHPbd89qiAi8TnsVDldWkQwDdnRQMx7vgVlvmp9J4/7xQs5J892nKsPIq/uvcPLpS a2/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J06fwaBC; 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 l5-20020a37f505000000b0076dad7ca4e9si2124037qkk.745.2023.10.31.21.16.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 21:16:08 -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=J06fwaBC; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy2aC-0005yb-Dh; Wed, 01 Nov 2023 00:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qy2a6-0005xH-8f for qemu-devel@nongnu.org; Wed, 01 Nov 2023 00:11:50 -0400 Received: from mail-ua1-x92c.google.com ([2607:f8b0:4864:20::92c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qy2a4-0007Zl-Qb for qemu-devel@nongnu.org; Wed, 01 Nov 2023 00:11:50 -0400 Received: by mail-ua1-x92c.google.com with SMTP id a1e0cc1a2514c-7b9ff2b6f9bso1967212241.3 for ; Tue, 31 Oct 2023 21:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698811907; x=1699416707; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c7kpY1PECNyEhx9ZhSr9SclPou5q1iimRjB/rHnoAhI=; b=J06fwaBC58NO5eKfj9Pb6z7BHvh9Ukib4kEanhno5urXOcmzcxYFUOxiaRZLYOXUkU MGMEhVcRsfzx9DLgPUqXTGEMZAcUqkjPwYUsUyv/F4kyxr0cTWCTtpHHNd2/Uh0a0D1N ndPaokUoKoB7UtKarLmbx+KQVji2N/2Q3qYdUy0NrEdx53bjxCyc+zZ3y4X8kV5tsNQ0 PpHOLOIEO8s8+LziDg0MqWmrwRB9JOuwgQKG+zw+ObfrJk61csfJaN17dAmn+rwuorkL YrrNBX6CnuJik4NddtFF5lOaHE6aURUhbXmp53IxhWu5/wp4mCssRiKiHV91mk07pKW9 G0Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698811907; x=1699416707; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c7kpY1PECNyEhx9ZhSr9SclPou5q1iimRjB/rHnoAhI=; b=mAeu2gKDDIAZT3vMsapBSnwBWrVwkkdI8rDUzzlA0zAkiqElvqAbOG518ITFuYZFCI JhRtAB0cDQDGq8nrJJ348pflNXEMKTosSA9Gg2sHXU5yy6covLNNRw7Wd0wVxTsIlY5r xAXC3hRt//VO5XNlDO7ZQ8WEahRXkKuXKnv6aV1dJPYtDPHASpUJhmfGzFdUxaMybm+q g+vZKg2Yn4jxFChqVb4nBr5Yv6hZOrjZDzWzCso0e47MEq+B48lVa5Kr67Aa3tbESRi5 4W/qWVg5SljIzgbrlVqIguVrnxPh6C1O3F4K2yJptW5Hf4aIkA0+vGuHiYjZo7dlI3e1 UtZA== X-Gm-Message-State: AOJu0YyMLcs/SgS7i2OSWlTFN0H6v1jkQ5UryzeTGbMZAHkxxrCPQbvz RF+x8RXWaZTYeRlIMOSYAa/TDto33qMSNJHRvDA= X-Received: by 2002:a67:c29c:0:b0:457:fbe2:b8f with SMTP id k28-20020a67c29c000000b00457fbe20b8fmr13478681vsj.10.1698811907736; Tue, 31 Oct 2023 21:11:47 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id k8-20020aa79728000000b006875df4773fsm359576pfg.163.2023.10.31.21.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 21:11:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 16/21] target/sparc: Merge gen_op_next_insn into only caller Date: Tue, 31 Oct 2023 21:11:27 -0700 Message-Id: <20231101041132.174501-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231101041132.174501-1-richard.henderson@linaro.org> References: <20231101041132.174501-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::92c; envelope-from=richard.henderson@linaro.org; helo=mail-ua1-x92c.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-bounces+patch=linaro.org@nongnu.org Signed-off-by: Richard Henderson --- target/sparc/translate.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 1233911b69..0bbe4cff3b 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1015,12 +1015,6 @@ static void gen_mov_pc_npc(DisasContext *dc) } } -static void gen_op_next_insn(void) -{ - tcg_gen_mov_tl(cpu_pc, cpu_npc); - tcg_gen_addi_tl(cpu_npc, cpu_npc, 4); -} - static void gen_compare(DisasCompare *cmp, bool xcc, unsigned int cond, DisasContext *dc) { @@ -2346,7 +2340,8 @@ static bool advance_pc(DisasContext *dc) case DYNAMIC_PC: case DYNAMIC_PC_LOOKUP: dc->pc = dc->npc; - gen_op_next_insn(); + tcg_gen_mov_tl(cpu_pc, cpu_npc); + tcg_gen_addi_tl(cpu_npc, cpu_npc, 4); break; case JUMP_PC: