From patchwork Tue Apr 30 16:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13649610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E9CA2C10F16 for ; Tue, 30 Apr 2024 16:32:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1qOg-0004EE-J0; Tue, 30 Apr 2024 12:32:03 -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 1s1qOL-0004B1-Q7 for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:31:43 -0400 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1qOJ-0001Ln-U5 for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:31:41 -0400 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2e01d666c88so30383541fa.2 for ; Tue, 30 Apr 2024 09:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714494698; x=1715099498; 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=MCNarZpX3uqPfQyzfPij83XtHCVdaS7zebbTvIEwqqw=; b=NjK/MZqhgi42Qtx1v78CB1t8qTJa7UAmM81YlzFYXxkfUXNQLQBOVT8IBDxqTWS7cV J+XXrOzSm/Dx9dyPCPkX4fHjo+YhQ09xkDM+kHQBNiFNb6Mv+jYoLmdkBnyGzhtXNWN6 hYR3OaiiAXdYiF8jR/KeFavghEocneaPRTr+S/akvKpZdKCgcPmNcqwiaik4WxRERRK2 Vlz0S5/CjMgJvKN7DAX1gOlWSBvS4+uCcOem/INYEWi4a+VoGHQdvi/R1QUIto7acpF/ gnmkV4hqnJWk9KcpVjzWxCd2o1F5IoFkDLDQ5qbU6Gc4o2+Hne/Zb2793ow2aoj7scKc iQRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714494698; x=1715099498; 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=MCNarZpX3uqPfQyzfPij83XtHCVdaS7zebbTvIEwqqw=; b=IO0/qmKhCqm35FqQSjFuN+P8X/HNX0J0Ly2gtbBjSDq2o6ZV+ol8pzItWM5DohGNbX CELUySMyCR/PNtpGQItdjGI5GUkfZ0HqiscZ3Hk6CwoZf3jWRqS3wkZznBRbheMTiuR8 OiYwPYDI+ADP3JmKRAkNGpB1Etiu5ZszXPcoJjtEXpzGWgM40eM8OvgDIiO3KjbrHJCZ SrsAE/dCTVtFpPCgxBNL71GimApWg7juRDTrAnOrVYKRjXvSlmq3jspY+gsvmCeoamDa f8SEb1TusjQxUQAI3lqLxpmpIVz2urQMqvIz7PNVrivUTgODekdMwP5m7l2ieKZlReUN 7xpg== X-Gm-Message-State: AOJu0YyTzV3zffGQ1Jq2ijwOT9rUCnsKTOgHajjskpyCk/THKL2VCDdW 5V3sz/2Er1yLUIjMKooZZnCgEbVKtd8gjAjY6X61YMW0LWJfwOboRsWh/ehVwta/7gCK9CKOpOn E X-Google-Smtp-Source: AGHT+IFI/gM2S3N9z/Ed86H1vf1JmATjfFI3XIwxI9mB2Zp+2MsK3hqGG77xK4aIhKkydKfM2lq9zw== X-Received: by 2002:a2e:aa98:0:b0:2d6:ff04:200f with SMTP id bj24-20020a2eaa98000000b002d6ff04200fmr105998ljb.33.1714494695717; Tue, 30 Apr 2024 09:31:35 -0700 (PDT) Received: from m1x-phil.lan (mab78-h01-176-184-55-179.dsl.sta.abo.bbox.fr. [176.184.55.179]) by smtp.gmail.com with ESMTPSA id je1-20020a05600c1f8100b0041adf358058sm25854005wmb.27.2024.04.30.09.31.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Apr 2024 09:31:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , John Paul Adrian Glaubitz , Paul Cercueil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Richard Henderson Subject: [PATCH v4 1/4] target/sh4: Fix ADDV opcode Date: Tue, 30 Apr 2024 18:31:22 +0200 Message-ID: <20240430163125.77430-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240430163125.77430-1-philmd@linaro.org> References: <20240430163125.77430-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22c; envelope-from=philmd@linaro.org; helo=mail-lj1-x22c.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The documentation says: ADDV Rm, Rn Rn + Rm -> Rn, overflow -> T But QEMU implementation was: ADDV Rm, Rn Rn + Rm -> Rm, overflow -> T Fix by filling the correct Rm register. Add tests provided by Paul Cercueil. Cc: qemu-stable@nongnu.org Fixes: ad8d25a11f ("target-sh4: implement addv and subv using TCG") Reported-by: Paul Cercueil Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2317 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yoshinori Sato --- target/sh4/translate.c | 2 +- tests/tcg/sh4/test-addv.c | 27 +++++++++++++++++++++++++++ tests/tcg/sh4/Makefile.target | 3 +++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/sh4/test-addv.c diff --git a/target/sh4/translate.c b/target/sh4/translate.c index ebb6c901bf..4a1dd0d1f4 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -714,7 +714,7 @@ static void _decode_opc(DisasContext * ctx) tcg_gen_xor_i32(t2, REG(B7_4), REG(B11_8)); tcg_gen_andc_i32(cpu_sr_t, t1, t2); tcg_gen_shri_i32(cpu_sr_t, cpu_sr_t, 31); - tcg_gen_mov_i32(REG(B7_4), t0); + tcg_gen_mov_i32(REG(B11_8), t0); } return; case 0x2009: /* and Rm,Rn */ diff --git a/tests/tcg/sh4/test-addv.c b/tests/tcg/sh4/test-addv.c new file mode 100644 index 0000000000..64f709161f --- /dev/null +++ b/tests/tcg/sh4/test-addv.c @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include +#include +#include + +static void addv(const int a, const int b, const int res, const int carry) +{ + int o = a, c; + + asm volatile("addv %2,%0\n" + "movt %1\n" + : "+r"(o), "=r"(c) : "r"(b) :); + + if (c != carry || aw != res) { + printf("ADDV %d, %d = %d/%d [T = %d/%d]\n", a, b, o, res, c, carry); + abort(); + } +} + +int main(void) +{ + addv(INT_MAX, 1, INT_MIN, 1); + addv(INT_MAX - 1, 1, INT_MAX, 0); + + return 0; +} diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 4d09291c0c..521b8b0a76 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -17,3 +17,6 @@ TESTS += test-macl test-macw: CFLAGS += -O -g TESTS += test-macw + +test-addv: CFLAGS += -O -g +TESTS += test-addv From patchwork Tue Apr 30 16:31:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13649613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 81363C4345F for ; Tue, 30 Apr 2024 16:33:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1qOs-0004HZ-Ee; Tue, 30 Apr 2024 12:32:14 -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 1s1qOa-0004D3-78 for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:31:57 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1qOQ-0001Ms-6w for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:31:52 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-41b782405d5so48497615e9.2 for ; Tue, 30 Apr 2024 09:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714494704; x=1715099504; 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=y3Dvy0wvVxKNBXh21IDmsrC5sWJZyoTg3iWrcJY72Ng=; b=kLr90zxLjOBy+I8pNRg+k+iYhUpFVWF5nvx+AI4r8SqYHk9l5mGNzoCXC9qziiMCxG RPcIGC7eVP4zgYbjLM751VcUQ/6g6fjTYVNt8EcFBNHOI5qyJZ1kv9fUsH9Y3vDcPrR1 ljuL3SoEPriv8sn40D8TuaDlpzNvwW1HDY8aKOFTU3KiA94mMVenzKr80qO8RHze4Tm+ BKE9cowxQ1Ev+fXigeHr9zW6ioIEp2Y7FgHNhVVNU8cWzyq2rUT72aSvuKsdLtQWy68S ME4irtvIqNbheMlUiUV4bmSWCmbVx9HTf6+FgzAy2wpPEQ9T+b07zR36uEO9sNuaKGX+ sEzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714494704; x=1715099504; 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=y3Dvy0wvVxKNBXh21IDmsrC5sWJZyoTg3iWrcJY72Ng=; b=uCWUlOjUOebcIQxGzBL173DtnZLZ0yJ1fPkNljGe22dqHjVhazush21HdXB2vouLcw cEJp73NpFkljotjE62G2lnlRyjlAATXJ43CdFRlrsnA4+jxZJcKA5LrNc3p083lENGbq rwXru3zGRDQShxtcp+rfOw2SsT2Bnaar+OPUdhM+qI4aubcYHNr8CTQabvuZQqWg3rKb IaOwowBb6yI3j/UQ4B8CEXACi+rDQQJOtIc6BRDKd7JsdDk15K++ctSrxYtvyfsja2cK IBsEKhc9ViUW+aCjoO+B4w9a4935sRjw6dSk6bHtliPtrv/tMIxdY/owIpdHTMMqy8UT BV4g== X-Gm-Message-State: AOJu0Yy4d+xkucjmvJFe5kLz8ahLZKBrrABtH2V3nukooFULtxRFBvz3 JLrGIFxjpoi6kfNYjxeAVh6E7AzzLnloVfJTpuwpqTkK+V0tbQfjHn/7fkxPJzfImmFY3lP21fV P X-Google-Smtp-Source: AGHT+IGhhXF0l5OMACQKTVhNESdbFWWNdjxBRaneM6YJOl8WeYVM3/XfHQT9LSLiWbU2n5VA5mD+UQ== X-Received: by 2002:a05:600c:4e11:b0:41c:8754:8793 with SMTP id b17-20020a05600c4e1100b0041c87548793mr21902wmq.41.1714494703775; Tue, 30 Apr 2024 09:31:43 -0700 (PDT) Received: from m1x-phil.lan (mab78-h01-176-184-55-179.dsl.sta.abo.bbox.fr. [176.184.55.179]) by smtp.gmail.com with ESMTPSA id n7-20020a05600c500700b0041bc412899fsm14286158wmr.42.2024.04.30.09.31.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Apr 2024 09:31:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , John Paul Adrian Glaubitz , Paul Cercueil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Richard Henderson Subject: [PATCH v4 2/4] target/sh4: Fix SUBV opcode Date: Tue, 30 Apr 2024 18:31:23 +0200 Message-ID: <20240430163125.77430-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240430163125.77430-1-philmd@linaro.org> References: <20240430163125.77430-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The documentation says: SUBV Rm, Rn Rn - Rm -> Rn, underflow -> T The overflow / underflow can be calculated as: T = ((Rn ^ Rm) & (Result ^ Rn)) >> 31 However we were using the incorrect: T = ((Rn ^ Rm) & (Result ^ Rm)) >> 31 Fix by using the Rn register instead of Rm. Add tests provided by Paul Cercueil. Cc: qemu-stable@nongnu.org Fixes: ad8d25a11f ("target-sh4: implement addv and subv using TCG") Reported-by: Paul Cercueil Suggested-by: Paul Cercueil Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2318 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yoshinori Sato --- target/sh4/translate.c | 2 +- tests/tcg/sh4/test-subv.c | 30 ++++++++++++++++++++++++++++++ tests/tcg/sh4/Makefile.target | 3 +++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/sh4/test-subv.c diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 4a1dd0d1f4..3e013b7c7c 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -933,7 +933,7 @@ static void _decode_opc(DisasContext * ctx) t0 = tcg_temp_new(); tcg_gen_sub_i32(t0, REG(B11_8), REG(B7_4)); t1 = tcg_temp_new(); - tcg_gen_xor_i32(t1, t0, REG(B7_4)); + tcg_gen_xor_i32(t1, t0, REG(B11_8)); t2 = tcg_temp_new(); tcg_gen_xor_i32(t2, REG(B11_8), REG(B7_4)); tcg_gen_and_i32(t1, t1, t2); diff --git a/tests/tcg/sh4/test-subv.c b/tests/tcg/sh4/test-subv.c new file mode 100644 index 0000000000..0dd8fcdaac --- /dev/null +++ b/tests/tcg/sh4/test-subv.c @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include +#include +#include + +static void subv(const int a, const int b, const int res, const int carry) +{ + int o = a, c; + + asm volatile("subv %2,%0\n" + "movt %1\n" + : "+r"(o), "=r"(c) : "r"(b) :); + + if (c != carry || o != res) { + printf("SUBV %d, %d = %d/%d [T = %d/%d]\n", a, b, o, res, c, carry); + abort(); + } +} + +int main(void) +{ + subv(INT_MIN, 1, INT_MAX, 1); + subv(INT_MAX, -1, INT_MIN, 1); + subv(INT_MAX, 1, INT_MAX - 1, 0); + subv(0, 1, -1, 0); + subv(-1, -1, 0, 0); + + return 0; +} diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 521b8b0a76..7852fa62d8 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -20,3 +20,6 @@ TESTS += test-macw test-addv: CFLAGS += -O -g TESTS += test-addv + +test-subv: CFLAGS += -O -g +TESTS += test-subv From patchwork Tue Apr 30 16:31:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13649612 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3CCBCC4345F for ; Tue, 30 Apr 2024 16:33:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1qOt-0004Hz-Q2; Tue, 30 Apr 2024 12:32:15 -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 1s1qOa-0004D4-8U for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:31:57 -0400 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1qOV-0001NM-Ng for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:31:54 -0400 Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2e0a2870bceso29308251fa.2 for ; Tue, 30 Apr 2024 09:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714494709; x=1715099509; 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=l1JlWQ74k3ew3dFGdGKr3ZG9/zjKJQNhOFPSYmWrnhM=; b=QLb4xMsMw9la+lrqaIRyF+K9B+Rox3OzS6TpPsucwOlb1HXqo8umdObT6f0OiIrAYr wxlrTLlcmGQ/ARTW5Qt56qpeFgg4oRl48Cbkp4T4giN5XnyvJwqZOmdNEiGjU6TctVGS rVfwgk0XXTcXIymPIVsnYM7VncfBcQRSW3pIbNHO8GkL+0wr6NgayXpm1hgvHD+KLOhN Ydpnpez0AL0DZyH0SI1/LaU54oVOnZtaGB+dIVQcRbKDEJl5Y1znDp3xqf00ChqAIjcK ETcYRcoplcA6OnklqjnY4LCnXgdna+fg1D8ev7/05Pf3KwKhD5ZwlMGC7txsFhc4iMKy k/ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714494709; x=1715099509; 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=l1JlWQ74k3ew3dFGdGKr3ZG9/zjKJQNhOFPSYmWrnhM=; b=QTYTalx8VMML1k9l5n/81h4/eac/s4ALaUqCPSUqIn4lIYlXDgGoefo2Z1Qc5uWzZL gHUMUMpSEM9D7qTxgnCgZ8m4mTdUMPHG/MVowDoDd0LUoThKNt+mvPhWUrjzZP0PQeAW YOe5bt5Yla6qGQf+FCi1ur+O8hos+MBciVFJWC1URU3NX5rh3Q7in+QhcqF3/JAWTv/F ba5MN2WSA1EWpKK+ADz4tiiHUUq2LCuyxalimO+8BjekihYvij79ThvwFtSEeky/sCTn Ir/Lqyr8S60J065sckpi45hPUaqr5K8wcfUSXMABHnJw/lEWI2y0vqVkC1vT6m1pIIq+ bBbA== X-Gm-Message-State: AOJu0Yzqo3opcKeW/jkOhWN99JzVqP4lM+AhhQB4G9Z0e51dcXUg7OZS hCJTohh1Fcn21P1hfdoaNIxTre9GXoN11UNyNRr6L9qua7InJ6Oh7/mV1bny6L//fTovAXR+BJg 6 X-Google-Smtp-Source: AGHT+IFHgTU6AU0ocYb+ZAK3qcdD36kLfwiCWLvOwMJFNFTYn8z5BAHFfpDInniHkXrMwzbqZfoUfQ== X-Received: by 2002:a2e:914b:0:b0:2dd:bd92:649 with SMTP id q11-20020a2e914b000000b002ddbd920649mr144940ljg.36.1714494709665; Tue, 30 Apr 2024 09:31:49 -0700 (PDT) Received: from m1x-phil.lan (mab78-h01-176-184-55-179.dsl.sta.abo.bbox.fr. [176.184.55.179]) by smtp.gmail.com with ESMTPSA id l16-20020a05600c4f1000b0041a1fee2854sm34744909wmq.17.2024.04.30.09.31.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Apr 2024 09:31:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , John Paul Adrian Glaubitz , Paul Cercueil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 3/4] target/sh4: Rename TCGv variables as manual for ADDV opcode Date: Tue, 30 Apr 2024 18:31:24 +0200 Message-ID: <20240430163125.77430-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240430163125.77430-1-philmd@linaro.org> References: <20240430163125.77430-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=philmd@linaro.org; helo=mail-lj1-x231.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To easily compare with the SH4 manual, rename: REG(B11_8) -> Rn REG(B7_4) -> Rm t0 -> result Mention how overflow is calculated. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Yoshinori Sato --- target/sh4/translate.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 3e013b7c7c..47c0f3404e 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -705,16 +705,20 @@ static void _decode_opc(DisasContext * ctx) return; case 0x300f: /* addv Rm,Rn */ { - TCGv t0, t1, t2; - t0 = tcg_temp_new(); - tcg_gen_add_i32(t0, REG(B7_4), REG(B11_8)); + TCGv Rn = REG(B11_8); + TCGv Rm = REG(B7_4); + TCGv result, t1, t2; + + result = tcg_temp_new(); t1 = tcg_temp_new(); - tcg_gen_xor_i32(t1, t0, REG(B11_8)); t2 = tcg_temp_new(); - tcg_gen_xor_i32(t2, REG(B7_4), REG(B11_8)); + tcg_gen_add_i32(result, Rm, Rn); + /* T = ((Rn ^ Rm) & (Result ^ Rn)) >> 31 */ + tcg_gen_xor_i32(t1, result, Rn); + tcg_gen_xor_i32(t2, Rm, Rn); tcg_gen_andc_i32(cpu_sr_t, t1, t2); tcg_gen_shri_i32(cpu_sr_t, cpu_sr_t, 31); - tcg_gen_mov_i32(REG(B11_8), t0); + tcg_gen_mov_i32(Rn, result); } return; case 0x2009: /* and Rm,Rn */ From patchwork Tue Apr 30 16:31:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13649611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 97800C4345F for ; Tue, 30 Apr 2024 16:32:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1qOw-0004K1-Sa; Tue, 30 Apr 2024 12:32:18 -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 1s1qOf-0004EP-Nl for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:32:03 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1qOc-0001Ph-62 for qemu-devel@nongnu.org; Tue, 30 Apr 2024 12:32:01 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-41b21ed19f5so41727105e9.2 for ; Tue, 30 Apr 2024 09:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714494715; x=1715099515; 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=TprQUrjgnD8N9rBUQzPSRwctmXsY08QQexwUVLZZZX4=; b=ZVK1Co475QKlNIztDm7mUM+oi9fXwnQf2xD+OWa0xb8pEBG7x5CAWSUn1L3qXy0ruk 83y9OLx0YJe8LzHjaMzM4SGQsHz98S0BrzgW4RznGiLFkVfLPFGHE4jFijNQMaa8C/cl l0vLcHufAogTf0Rg031+zpYgiVClGiP1hIXYcVu5EBqSJgSQUAPD2Mb8y1F+kxcme5rN acggEPPVg39mOxenXD6Sb49lOwE7vBYgQ24Amg7a8fzAHNwijXzsCalpjnLvwQpwTHru BV9x3p/thT6cZM8O8V0cmYdpWBKm+pYPCj+LEuYBN2OvMg6O+VAD3saS8vySTuRag8AR Bf9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714494715; x=1715099515; 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=TprQUrjgnD8N9rBUQzPSRwctmXsY08QQexwUVLZZZX4=; b=bis1+dMIxuhYPDJv6duooF4Ryqxbrx5gCc6DGgInN+4ut/mNgjAQsT45+cKexHQ5lJ 8ONUOgGXN/qyhJoz1652vEnJrlgHo+YIkXPMetyS8GfjEbteLD01fYaUDIe/7F4038Js UpaDIwQtv2GUESCHaz7A7rh/diy0ORVJdqjUsxgT3fVOKiN83zJD4uB9zQ3KtCe6tQZf eWvPZwq8BHfH08k9KiKpHpSldEJjsVtOuQv8nFl/oIpuFw5fiB97Mn2h9FwGKata+qgA SI3x0vp/n78nyl6Gf5JAsMUaclOoMrqNpdbgM/bmW2sBIBCO5r7jj4ZwSi9EUFvnT7X5 x5Ww== X-Gm-Message-State: AOJu0YwRWsoOb61KoiBrPm5CuGUhtHUvq1g+EqwWvRcm1PD/0Vza5cr4 m4LAvGCizjGRO5ZbHewLVCvq5tBAAn3OjipN65745fln1f4xB0/R6fmcr8/3HuWtSbleaqu400Q Z X-Google-Smtp-Source: AGHT+IEMNS4YajCJsNALoNCqdY8zaWToNhwu1CQNxluvzB4TQX1VBjvxvLWsSKVOgQMQ/DkUyrRrjw== X-Received: by 2002:a05:600c:46ca:b0:41b:f30a:41f1 with SMTP id q10-20020a05600c46ca00b0041bf30a41f1mr48497wmo.7.1714494715673; Tue, 30 Apr 2024 09:31:55 -0700 (PDT) Received: from m1x-phil.lan (mab78-h01-176-184-55-179.dsl.sta.abo.bbox.fr. [176.184.55.179]) by smtp.gmail.com with ESMTPSA id l2-20020a05600c4f0200b0041be78ae1f0sm12665835wmq.2.2024.04.30.09.31.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Apr 2024 09:31:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , John Paul Adrian Glaubitz , Paul Cercueil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 4/4] target/sh4: Rename TCGv variables as manual for SUBV opcode Date: Tue, 30 Apr 2024 18:31:25 +0200 Message-ID: <20240430163125.77430-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240430163125.77430-1-philmd@linaro.org> References: <20240430163125.77430-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To easily compare with the SH4 manual, rename: REG(B11_8) -> Rn REG(B7_4) -> Rm t0 -> result Mention how underflow is calculated. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yoshinori Sato --- target/sh4/translate.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 47c0f3404e..e599ab9d1a 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -933,16 +933,20 @@ static void _decode_opc(DisasContext * ctx) return; case 0x300b: /* subv Rm,Rn */ { - TCGv t0, t1, t2; - t0 = tcg_temp_new(); - tcg_gen_sub_i32(t0, REG(B11_8), REG(B7_4)); + TCGv Rn = REG(B11_8); + TCGv Rm = REG(B7_4); + TCGv result, t1, t2; + + result = tcg_temp_new(); t1 = tcg_temp_new(); - tcg_gen_xor_i32(t1, t0, REG(B11_8)); t2 = tcg_temp_new(); - tcg_gen_xor_i32(t2, REG(B11_8), REG(B7_4)); + tcg_gen_sub_i32(result, Rn, Rm); + /* T = ((Rn ^ Rm) & (Result ^ Rn)) >> 31 */ + tcg_gen_xor_i32(t1, result, Rn); + tcg_gen_xor_i32(t2, Rn, Rm); tcg_gen_and_i32(t1, t1, t2); tcg_gen_shri_i32(cpu_sr_t, t1, 31); - tcg_gen_mov_i32(REG(B11_8), t0); + tcg_gen_mov_i32(Rn, result); } return; case 0x2008: /* tst Rm,Rn */