From patchwork Sun Oct 22 23:28:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 737029 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1282420wrl; Sun, 22 Oct 2023 16:32:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHs7YxBAgPldSNpgy5XRUxoaRBUELmxoozdHqbCrQq1W6Korek7BZRJNls/EzdilOd8brRj X-Received: by 2002:a05:620a:2451:b0:779:d1a6:ee76 with SMTP id h17-20020a05620a245100b00779d1a6ee76mr3117212qkn.37.1698017527377; Sun, 22 Oct 2023 16:32:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698017527; cv=none; d=google.com; s=arc-20160816; b=tLadpQjlS4CXToS1yJ9ebDm3GqKUtWuEu0Sa6ukW7bxTt5FwCOXyVIgXXJ5p+ZP6GN A6/hz0pbGeJsOM03wg3YozRX8tSBD2ncOKP2OfFyM3q00YcoaXuj/eAnt0joQ2/dyRMA fdGspziBCg7zxZharNC8+oFN5wNJnKmSGgks1XzZwreHsuufdoSs65LIaptAN6ppTnWq 47vF1gdsUujxMMYfsv04IzWm6dBHl05/87z4b7fZ4qK+Dl40vLVRMzHUw50zwSQfZh/Y PU1NWizvgRcLMPsE1FmCH4PLmJHJg1O+xMEX8gTJ+uU9uLouGB5sOaOtWQwwY0SagjYt Gyzg== 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=D3CDbvxaTN0BxklWFCzrNGwroWfsphJJp/UH4zaunfY=; fh=TYrED6TOMxGX0VC4GtjviASLbYyJe19+7/tKWjN44KQ=; b=zz/79V58630olt8oXLdMgVL/dGDn5NIL3xi6ydnvJBQ2QSN3Yp3P5ipXm+anU/wdA9 88UnV6Q2W4qf9pwLDofDVlZ2kdm5FdIA2UzgZaJ9J2edQVo9a+bT7MQc16+/tsIyibfZ +mb4h9MMQsLlSNma4YOXaXkrQ8p4M7BKgZsfqzWZIsNYdZbg/Lmd2k6dWQOsAILI5JVj cA1MSDV9HUuixFjf9a8CPVVpsLqf7RaZVu/4LfrG1cKy6l8yKkXTzxoiK8RXpi6CeOyy EaxyYPDu8fz8N9hzqds37OAVQxmZjAwDYC6cMKPiAMPy2dhr4Wdhc+KusYl3eFHDogN2 U5BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rUZl48b3; 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 m7-20020a05620a24c700b00777279e49cbsi3281705qkn.165.2023.10.22.16.32.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Oct 2023 16:32:07 -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=rUZl48b3; 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 1quhtQ-0007AL-TU; Sun, 22 Oct 2023 19:30:00 -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 1quhtL-00077s-Ma for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:29:56 -0400 Received: from mail-oa1-x2f.google.com ([2001:4860:4864:20::2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quhtH-0006lZ-7G for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:29:55 -0400 Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-1dd1714b9b6so2101393fac.0 for ; Sun, 22 Oct 2023 16:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698017389; x=1698622189; 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=D3CDbvxaTN0BxklWFCzrNGwroWfsphJJp/UH4zaunfY=; b=rUZl48b3aYN+GjuV4LXkWJeCZgiqfV4rlj/d+6RGg3f/63ZUZ1nyQzGNwRye9RijXy zzU2iY/5HwDK36kQ+z/rjPT2ky9Ro9vKVf7MNBhRddIh9bIO+VcozXzC2aI1jFrxzDnv kEc3kCLOhYYN+3XyywMz0lDKPHVN6vxZE3ADcvKEvl1miMDd5R3cNrvBV8OMFC95tB/X ySfafV1i4NU4A/HItD6/+A3SxVvxAYCX6oDAH0Lg7KDFZew112rp0ISukRz7wcKyZnpL rKHTAObatJ1+Xoh+uSUZ08UNzNrjyvVXV+VEzWkH2mWgGEGr5gRjoIN92ZcJWqbA5Vc5 mBzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698017389; x=1698622189; 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=D3CDbvxaTN0BxklWFCzrNGwroWfsphJJp/UH4zaunfY=; b=k/+lZWDdlE9mCpjAPQcv1LZG2VYbIiJv5qCTiA1uCKpB02Dwqiz4OMuKXXeoACd3PI 8zq2ymbAhjB2BBCyiX0JSwpyU7440lFxPmYs9fNz8zD0f1ttBPqZ3gfkMzm4rdEQDjiZ 138GVZegN6Ynkg8/hXZATHj5NjjHBphjiT60VZ6IZTy6SmjwIdDNU/w9+G75RixFNBE3 YymQlhQBsj/K9iwDS9bktt6+5h82DpJZwpyUhFsXhEAbxHI6a8jDfroZNarcuJbc9M11 +a3hzWiw6W1pvhhGYY2t5xWUGuEfVgRyOUBW/5xD7AP1WaMhH24cIdqxQa/Wu3XKWW3c Llkg== X-Gm-Message-State: AOJu0Yxc6/58sXidjOjXVc/s3iPxfcCYgB/tQ7PXKvyhWrxXZkEgYdpi 2ZeTQJRZMOqbjtU/8nsk7zoIO/6o7NY3rqGhTTw= X-Received: by 2002:a05:6358:e49b:b0:168:9fac:441f with SMTP id by27-20020a056358e49b00b001689fac441fmr10101950rwb.2.1698017389658; Sun, 22 Oct 2023 16:29:49 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id k26-20020a63ba1a000000b005b25a04cf8bsm4023772pgf.12.2023.10.22.16.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 16:29:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v5 18/94] target/sparc: Merge gen_branch_[an] with only caller Date: Sun, 22 Oct 2023 16:28:16 -0700 Message-Id: <20231022232932.80507-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231022232932.80507-1-richard.henderson@linaro.org> References: <20231022232932.80507-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::2f; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2f.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.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 Tested-by: Mark Cave-Ayland Acked-by: Mark Cave-Ayland Signed-off-by: Richard Henderson --- target/sparc/translate.c | 73 +++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index b8d51d6d64..503598ed93 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -900,47 +900,6 @@ static void gen_branch2(DisasContext *dc, target_ulong pc1, gen_goto_tb(dc, 1, pc2, pc2 + 4); } -static void gen_branch_a(DisasContext *dc, target_ulong pc1) -{ - TCGLabel *l1 = gen_new_label(); - target_ulong npc = dc->npc; - - tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_cond, 0, l1); - - gen_goto_tb(dc, 0, npc, pc1); - - gen_set_label(l1); - gen_goto_tb(dc, 1, npc + 4, npc + 8); - - dc->base.is_jmp = DISAS_NORETURN; -} - -static void gen_branch_n(DisasContext *dc, target_ulong pc1) -{ - target_ulong npc = dc->npc; - - if (npc & 3) { - switch (npc) { - case DYNAMIC_PC: - case DYNAMIC_PC_LOOKUP: - tcg_gen_mov_tl(cpu_pc, cpu_npc); - tcg_gen_addi_tl(cpu_npc, cpu_npc, 4); - tcg_gen_movcond_tl(TCG_COND_NE, cpu_npc, - cpu_cond, tcg_constant_tl(0), - tcg_constant_tl(pc1), cpu_npc); - dc->pc = npc; - break; - default: - g_assert_not_reached(); - } - } else { - dc->pc = npc; - dc->jump_pc[0] = pc1; - dc->jump_pc[1] = npc + 4; - dc->npc = JUMP_PC; - } -} - static void gen_generic_branch(DisasContext *dc) { TCGv npc0 = tcg_constant_tl(dc->jump_pc[0]); @@ -2942,10 +2901,38 @@ static bool advance_jump_uncond_always(DisasContext *dc, bool annul, static bool advance_jump_cond(DisasContext *dc, bool annul, target_ulong dest) { + target_ulong npc = dc->npc; + if (annul) { - gen_branch_a(dc, dest); + TCGLabel *l1 = gen_new_label(); + + tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_cond, 0, l1); + gen_goto_tb(dc, 0, npc, dest); + gen_set_label(l1); + gen_goto_tb(dc, 1, npc + 4, npc + 8); + + dc->base.is_jmp = DISAS_NORETURN; } else { - gen_branch_n(dc, dest); + if (npc & 3) { + switch (npc) { + case DYNAMIC_PC: + case DYNAMIC_PC_LOOKUP: + tcg_gen_mov_tl(cpu_pc, cpu_npc); + tcg_gen_addi_tl(cpu_npc, cpu_npc, 4); + tcg_gen_movcond_tl(TCG_COND_NE, cpu_npc, + cpu_cond, tcg_constant_tl(0), + tcg_constant_tl(dest), cpu_npc); + dc->pc = npc; + break; + default: + g_assert_not_reached(); + } + } else { + dc->pc = npc; + dc->jump_pc[0] = dest; + dc->jump_pc[1] = npc + 4; + dc->npc = JUMP_PC; + } } return true; }