From nobody Sat May 11 14:20:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1627685715; cv=none; d=zohomail.com; s=zohoarc; b=iT3Pqz5IJznFemQ5roGmh5VnWuhT9dPvUrILJLOlY1B71YMvISf9uVphEN4zAJ88WwCYCL21OoXuv14EY5SDryhMioTM0oniouF8hmSeIPXI8UQqCrvPeZjd3B0Dnac0evu6heK+F2bgp53rJMn2gRk1zT4uo4yvaEHcKCJQoI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627685715; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=K1Lp6dR6470DOf4IKPk+V0JlPZFU/7h3vubagA5N4f4=; b=gefWSRvWhiXQ/yZzORlLVif7g7PcAueQscqVuMLNYUN4XZeQyfpwUfnb59+QKIh8W9YF3t8oQumhtByZ/vwdiqReK0Q1xpNCYAIwaMIbsWYjIbwzWfntGlVBeNQNq5sRqz3UYkKw8t/AuRdP7aKBclsXLo0IMbI81o0UyToQPAw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1627685715032516.7526512454784; Fri, 30 Jul 2021 15:55:15 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id k4so6863570wms.3 for ; Fri, 30 Jul 2021 15:55:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id c10sm3004683wmb.40.2021.07.30.15.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 15:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K1Lp6dR6470DOf4IKPk+V0JlPZFU/7h3vubagA5N4f4=; b=TquC3Mkl7nu6P6JvACZO2deXWHrQT24YHqLgXuP4TNgrTfxXxeMa9LiGIyykpJcGbW pncs1eSLlRoqoeCf4IsFmU2F7zyilZQYqyniHFIYpOYaVvtdptAfb+awJ30wwCiJLP2a /NyVOw2eE8Alo9fS87tOsfRFRYeB3mTApmolVbMivlUngLk//11WlB0593qDipLlCkQl sLimvRp9KXVGL8WypJ43x/ZhQ5P5NRq9tmjUI5akSzr6Y+sYPwxYNNiGhHPRB5vUdFAB rsYF9ASqOvjIRZScTZ+seTjNsS51ZBQaaswdHWf/OYsoBOdoUViMpHjuhxsEz+jRTPZP 6wsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=K1Lp6dR6470DOf4IKPk+V0JlPZFU/7h3vubagA5N4f4=; b=L+3XotLKvEDLE3mNj+TLrQXOo/h8hVbxSaltiagr0nduv5Gqun6+3y0CJHjGedGDet DwKzed3mNT7XpYefNOUUkQveLPJPk2z9O2+CT8x0E7nXECb1wRxKMcq6i9xCjU93kB84 VjqM0YRnrQEPvfhAQz8gEOvmwXWhwfM+3hAEXrc57jk0R7lrHKxyeV1DV0Wt4vdTVuYP hacuitcTV9HcUNP/9AhnEAlmrKu9HIfQ178bFpjdDgV3yvB2adUUqPWyVjdKz7zRkZMY WV0SD2rVpcpBx+dWFjs38EfMv83SrFc40WmmApjhp7Ee8bgRhioKiyc7xZ0RWygJ4lJW Ktag== X-Gm-Message-State: AOAM531WqrQ0cJ5pBHjCZm9ONwmxRllX5DRGuq9m5kidw2ho9dvJVl7y hJOYDyxMXO78B/KoECko+w8= X-Google-Smtp-Source: ABdhPJwjpQi2QIjWsH4oZv2KJo8gTwBWCxTVYy3fHmcftHyywTUb8x41wq0Ln2H3aNuz+bL7zECqfw== X-Received: by 2002:a05:600c:322a:: with SMTP id r42mr5706498wmp.153.1627685713094; Fri, 30 Jul 2021 15:55:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Aurelien Jarno , Richard Henderson , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] target/mips: Remove JR opcode unused arguments Date: Sat, 31 Jul 2021 00:55:07 +0200 Message-Id: <20210730225507.2642827-1-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1627685716238100001 JR opcode (Jump Register) only takes 1 argument, $rs. JALR (Jump And Link Register) takes 3: $rs, $rd and $hint. Commit 6af0bf9c7c3 added their processing into decode_opc() as: case 0x08 ... 0x09: /* Jumps */ gen_compute_branch(ctx, op1 | EXT_SPECIAL, rs, rd, sa); having both opcodes handled in the same function: gen_compute_branch. Per JR encoding, both $rd and $hint ('sa') are decoded as zero. Later this code got extracted to decode_opc_special(), commit 7a387fffce5 used definitions instead of magic values: case OPC_JR ... OPC_JALR: gen_compute_branch(ctx, op1, rs, rd, sa); Finally commit 0aefa33318b moved OPC_JR out of decode_opc_special, to a new 'decode_opc_special_legacy' function: @@ -15851,6 +15851,9 @@ static void decode_opc_special_legacy(CPUMIPSStat= e *env, DisasContext *ctx) + case OPC_JR: + gen_compute_branch(ctx, op1, 4, rs, rd, sa); + break; @@ -15933,7 +15936,7 @@ static void decode_opc_special(CPUMIPSState *env,= DisasContext *ctx) - case OPC_JR ... OPC_JALR: + case OPC_JALR: gen_compute_branch(ctx, op1, 4, rs, rd, sa); break; Since JR is now handled individually, it is pointless to decode and pass it unused arguments. Replace them by simple zero value to avoid confusion with this opcode. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 5b03545f099..bf71724f3f0 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -14203,7 +14203,7 @@ static void decode_opc_special_legacy(CPUMIPSState = *env, DisasContext *ctx) break; #endif case OPC_JR: - gen_compute_branch(ctx, op1, 4, rs, rd, sa, 4); + gen_compute_branch(ctx, op1, 4, rs, 0, 0, 4); break; case OPC_SPIM: #ifdef MIPS_STRICT_STANDARD --=20 2.31.1