From patchwork Thu Jan 11 05:51:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83826 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D2B873857BAE for ; Thu, 11 Jan 2024 05:52:01 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 4AEE73858D38 for ; Thu, 11 Jan 2024 05:51:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4AEE73858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4AEE73858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704952284; cv=none; b=k8XdxG5p1ZFsIvBZQdGFoEDGPD90omnNjKZp90t9yVrtdroDqqXb+8ier4Gu+yaloks+uwpxvONbe+dKmbRthiGe1BMINPZdRlM+dRw5lXJ0W2lL3zwS3xA4l8qZd/oHband6jl6nGCmwXh485P2UFEr6UfsYNWUd7RDGRR5ERQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704952284; c=relaxed/simple; bh=ViGPKQhGknmhbVFKx/lH+tiiuf32rmu8rBi3Z+ng1oY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Ze+DRPqrAzjLCppqlGP1bcXaKCpnchMaLuLCa8n6mxom9ZxyPez9v9sPaYV5FiH29tQm2lQoM2sZlSjhaQq6AR1Z6MdNIrSbM6glL21hm5DWQr0RvMg7+tq/VwDgKEpjOrJsiuZS7nzNbDKwSdTaMplKbyqr1axs7LRKDQ/BBB0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 5C8A734310F; Thu, 11 Jan 2024 05:51:18 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/2] sim: ppc: implement 128-bit register read/writes with sim-endian APIs Date: Thu, 11 Jan 2024 00:51:15 -0500 Message-ID: <20240111055116.29216-1-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org We have APIs in sim-endian for working with 128-bit values like this code is already doing for 8/16/32/64-bit values. Switch over to that to make it a bit simpler, and drop the WITH_ALTIVEC check. The code probably is only used when altivec is enabled, but it doesn't add much to always compile it in, and avoids #ifdef rot by not actually compiling it. --- sim/ppc/psim.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/sim/ppc/psim.c b/sim/ppc/psim.c index 2c900e64100a..88c485d695b2 100644 --- a/sim/ppc/psim.c +++ b/sim/ppc/psim.c @@ -796,6 +796,7 @@ psim_read_register(psim *system, unsigned_2 unsigned_2; unsigned_4 unsigned_4; unsigned_8 unsigned_8; + unsigned_16 unsigned_16; creg creg; fpreg fpreg; fpscreg fpscreg; @@ -922,21 +923,12 @@ psim_read_register(psim *system, case 8: *(unsigned_8*)buf = H2T_8(cooked_buf.unsigned_8); break; -#ifdef WITH_ALTIVEC case 16: - if (HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER) - { - union { vreg v; unsigned_8 d[2]; } h, t; - memcpy(&h.v/*dest*/, cooked_buf.bytes/*src*/, description.size); - { _SWAP_8(t.d[0] =, h.d[1]); } - { _SWAP_8(t.d[1] =, h.d[0]); } - memcpy(buf/*dest*/, &t/*src*/, description.size); - break; - } - else - memcpy(buf/*dest*/, cooked_buf.bytes/*src*/, description.size); + { + unsigned_16 v = H2T_16(cooked_buf.unsigned_16); + memcpy(buf/*dest*/, &v, description.size); + } break; -#endif } } else { @@ -965,6 +957,7 @@ psim_write_register(psim *system, unsigned_2 unsigned_2; unsigned_4 unsigned_4; unsigned_8 unsigned_8; + unsigned_16 unsigned_16; creg creg; fpreg fpreg; fpscreg fpscreg; @@ -1014,20 +1007,9 @@ psim_write_register(psim *system, case 8: cooked_buf.unsigned_8 = T2H_8(*(unsigned_8*)buf); break; -#ifdef WITH_ALTIVEC case 16: - if (HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER) - { - union { vreg v; unsigned_8 d[2]; } h, t; - memcpy(&t.v/*dest*/, buf/*src*/, description.size); - { _SWAP_8(h.d[0] =, t.d[1]); } - { _SWAP_8(h.d[1] =, t.d[0]); } - memcpy(cooked_buf.bytes/*dest*/, &h/*src*/, description.size); - break; - } - else - memcpy(cooked_buf.bytes/*dest*/, buf/*src*/, description.size); -#endif + cooked_buf.unsigned_16 = T2H_16(*(unsigned_16*)buf); + break; } } else { From patchwork Thu Jan 11 05:51:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83827 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DC0143857C73 for ; Thu, 11 Jan 2024 05:52:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id D21433858402 for ; Thu, 11 Jan 2024 05:51:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D21433858402 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D21433858402 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704952284; cv=none; b=IucPDLeOHcfC8J7NVn4jiQBngkHrFNv7SlVbxLx2aEchUZv8whY7OpsLZkXgd96xqw1KUH2x8DhjYBjXnyMj3fwquOZW6LldSCbmMXmlZYQIQQnSY9xTuHvtFWiQ8PudHpqGg3UpSq/uRwCC+tvMoOxg1CSeWP0vwHYgsJ05BRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704952284; c=relaxed/simple; bh=wXhFqkNDhkpudxp/nrI15YpR2lLaZ7ofG5V4KwS4Xic=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=GtcgUIeGgOIgRL7yyDwLMxnm1CYGjlAS57+Gn/Hj0o1FnKWdDCQ+vpcP7yp0msTXrv7uOKTa5JNWi26Xa2D6CSMkZzaVZyw8UIGws+29W/YviQfRD/drqk+DuTfaB66tXoZidazF2OlZCr48ed3hiyRhVQNFU5l+Wa6y/xsDUa4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 5CFEC343136; Thu, 11 Jan 2024 05:51:20 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/2] sim: endian: leverage __int128 when available Date: Thu, 11 Jan 2024 00:51:16 -0500 Message-ID: <20240111055116.29216-2-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240111055116.29216-1-vapier@gentoo.org> References: <20240111055116.29216-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Should be functionally the same, but the code is a little simpler. --- sim/common/sim-endian.c | 8 ++++++++ sim/common/sim-types.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/sim/common/sim-endian.c b/sim/common/sim-endian.c index 9b498fbf94e3..76735ea6cfd5 100644 --- a/sim/common/sim-endian.c +++ b/sim/common/sim-endian.c @@ -98,6 +98,9 @@ INLINE_SIM_ENDIAN\ (unsigned_8) sim_endian_split_16 (unsigned_16 word, int w) { +#ifdef HAVE___INT128 + return w == 0 ? word >> 64 : word; +#else if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) { return word.a[1 - w]; @@ -106,6 +109,7 @@ sim_endian_split_16 (unsigned_16 word, int w) { return word.a[w]; } +#endif } @@ -114,6 +118,9 @@ INLINE_SIM_ENDIAN\ sim_endian_join_16 (unsigned_8 h, unsigned_8 l) { +#ifdef HAVE___INT128 + return (unsigned_16)h << 64 | l; +#else unsigned_16 word; if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) { @@ -126,6 +133,7 @@ sim_endian_join_16 (unsigned_8 h, unsigned_8 l) word.a[1] = l; } return word; +#endif } diff --git a/sim/common/sim-types.h b/sim/common/sim-types.h index 182f0dbe1f38..f5f863c536e7 100644 --- a/sim/common/sim-types.h +++ b/sim/common/sim-types.h @@ -67,8 +67,13 @@ # define SIGNED64(X) ((int64_t) X##LL) #endif +#ifdef HAVE___INT128 +typedef unsigned __int128 unsigned128; +typedef __int128 signed128; +#else typedef struct { uint64_t a[2]; } unsigned128; typedef struct { int64_t a[2]; } signed128; +#endif /* byte based */