From patchwork Wed Jan 3 07:19:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83216 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 679EB385DC26 for ; Wed, 3 Jan 2024 07:22:07 +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 8A0B53857C51 for ; Wed, 3 Jan 2024 07:19:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A0B53857C51 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 8A0B53857C51 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=1704266376; cv=none; b=TBMZyzP/HotFNVAG5ih34LqPNhIE8bUn8TItfxNS4U8puxIk5G3DH9wbpfLD5bVDUioOOUYXXQe1JlFbbIHacrwTWvIDk7XXEm6lAhf26ANB3c0GagNAN5yZ0mfQiX+M73ZxQK12iCe+VFwuW62uFCbu8j84hW3+3uFxXLDFafM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704266376; c=relaxed/simple; bh=wjx8dk29N28NYtP8RKVVgZGOOqDpC6sh2xjQ4pL42Y4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=KMeYZWMxOqIEUNIVloRC30zumQBxFPovAfbOPOgBbmDgALpA0U9+fObpngyDKBiSwikEpNyzADmToXb2LNbeiejfa8ZmqimmamQpuCE6URVjmFwt2iFT4ZrzTpgoFY5QGZfMQRYYdx9tuOugyXAm1BAwYkN6G3drIpc6xyglpmg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id D9441341E1C; Wed, 3 Jan 2024 07:19:32 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed 2/4] sim: ppc: rename local ALU SIGNED64 macros Date: Wed, 3 Jan 2024 02:19:26 -0500 Message-ID: <20240103071928.26550-2-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240103071928.26550-1-vapier@gentoo.org> References: <20240103071928.26550-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 The common/ code has macros with the same name but different behavior: it's for declaring integer constants as 64-bit, not for casting them. Rename ppc's local variant since it's only used in this file in order to avoid conflicts. --- sim/ppc/idecode_expression.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sim/ppc/idecode_expression.h b/sim/ppc/idecode_expression.h index 9c4cb7a55a98..86b33945b77c 100644 --- a/sim/ppc/idecode_expression.h +++ b/sim/ppc/idecode_expression.h @@ -57,8 +57,8 @@ /* Macro's to type cast 32bit constants to 64bits */ -#define SIGNED64(val) ((int64_t)(int32_t)(val)) -#define UNSIGNED64(val) ((uint64_t)(uint32_t)(val)) +#define ALU_SIGNED64(val) ((int64_t)(int32_t)(val)) +#define ALU_UNSIGNED64(val) ((uint64_t)(uint32_t)(val)) /* Start a section of ALU code */ @@ -134,14 +134,14 @@ do { \ #if (WITH_TARGET_WORD_BITSIZE == 64) #define ALU_ADD(val) \ do { \ - uint64_t alu_lo = (UNSIGNED64(alu_val) \ - + UNSIGNED64(val)); \ + uint64_t alu_lo = (ALU_UNSIGNED64(alu_val) \ + + ALU_UNSIGNED64(val)); \ signed alu_carry = ((alu_lo & BIT(31)) != 0); \ alu_carry_val = (alu_carry_val \ - + UNSIGNED64(EXTRACTED(val, 0, 31)) \ + + ALU_UNSIGNED64(EXTRACTED(val, 0, 31)) \ + alu_carry); \ alu_overflow_val = (alu_overflow_val \ - + SIGNED64(EXTRACTED(val, 0, 31)) \ + + ALU_SIGNED64(EXTRACTED(val, 0, 31)) \ + alu_carry); \ alu_val = alu_val + val; \ } while (0)