From patchwork Wed Mar 6 16:12:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 1908912 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=aUiz9l8X; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TqctN0QNQz1yWw for ; Thu, 7 Mar 2024 03:13:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ED0103857C62 for ; Wed, 6 Mar 2024 16:13:27 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id B0CB63858D34 for ; Wed, 6 Mar 2024 16:13:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B0CB63858D34 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B0CB63858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::12e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709741584; cv=none; b=fZpP6VjP5FIMP7FQWvWJEFerKYkXhxq3ZcKUGCu87JXMnq/nFDhgSxQ9rdHopRsyNEyVAs8gv737TwIiFPzdaBGqkr9ax25GQVcTNsCc68YxECMAcCJR4CV4P1+7sq3u78YzUDUUXMHh6BmvoXF2aVzxMGwcd5B8NY3om/eIkqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709741584; c=relaxed/simple; bh=91To6YXFTleiL7Cj0e4upnyFhBTqA9ClbD3w9NG+LVM=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=UNWr2C9ySOyuAMloJ1BpskBx/4YtolzxmagrJHrSK4Ml6GKMSPIG0os9weRx5IfRrHrryq/C0KRqnYi8ma3SIbD8Kirj29PgGG2TanZIBNGRtEQw37mfoYRROzTgz8UKcziOuQNRLiHFHDCEHhEjCcoNEh5dgqKmcT88xn9afB0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-5134d7e16a8so1482332e87.3 for ; Wed, 06 Mar 2024 08:13:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709741580; x=1710346380; darn=gcc.gnu.org; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=vfrwK54Wj0ragdVyulHMJGKfhyYtJi9AwZUciK9MnW8=; b=aUiz9l8XRgLRMdFdg1LIuaGSC6p/BV77uYMNV1XpqgsK+S3dlDqb+W7tlkJ5W6kU/Q 114ccs36j7lBKfYRddvXfeCBdrG9jDBZ71V0w57qLGA9dMeCRQ2pfHjo/gy6nRc2ANyi ol+zETgGD6BEKvwtDPjV7vvng6zCq+iEsphHrxMUFAjTRsEYb09fE4jePeJceO9KTLUo tBvOhwcwE9f5lhlYogoAQZ6+4kuqNxjWuy4IubmGPmV61eFOIR5Bq264LhabzpCbc+SJ 5Ql/HgGmmU5FMAFvuUGlScrXhVGw1ZD5ME8lvbrDa3/K9VSxLhmmRxzKGjLiXr5pOyGs kehw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709741580; x=1710346380; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vfrwK54Wj0ragdVyulHMJGKfhyYtJi9AwZUciK9MnW8=; b=VYUdtCcfPK2ZY30YcvGk4dQkuPV18hzKZ1dr3aKdNqsP7Y0DLROHDIAFOsyzwEagLO ERAczSrGS3X8G/uDSWxlWgrIMIuHUkbx4XMwMGXGKUsL02GyNnuzTk0KDppYJrwVRSbo LgOSXY1NeQnsrIPKGUGQov5OYhbq4fmqfORu+6zNX9yMf7eO4YgDsbVAbcSY24Uuf8+7 bkellB8EY6qBontHe3Us9i1CqyTjEBk2I2Jd376XLnTm4XTMlR7UaTi6MDgZ9j6ou0iB DuNnRIBxXvi16yCd2448plvShPhUu4WV5h7mAp7mpVgKKsOXsBik1Yi5DNNWGzFS23pv S2Gw== X-Gm-Message-State: AOJu0Yye6/Dm/efCMh0URU0JFWa/qLB3VZjC+lDkNdGmiRuPX8z+J0fP nvsmnMzXpfRiuQBDsspmTEF8vXjTfREnqdv5vXBgWmM0UGY8DoqK5eso9b557hgg+ghIXuJ8uqy TVWWO7uG5ebbh1crP4sGwHUViKuDq80PpnCw= X-Google-Smtp-Source: AGHT+IFCrSD+u7RVE9rtNELm9cF2OohbjygsqATwyQi7nekvVpNXBFtvGUJlh4wXXBJzT7ME00mpxzqtuSkzbNi0v0E= X-Received: by 2002:a2e:9c8e:0:b0:2d3:a45c:439d with SMTP id x14-20020a2e9c8e000000b002d3a45c439dmr3731000lji.7.1709741579551; Wed, 06 Mar 2024 08:12:59 -0800 (PST) MIME-Version: 1.0 From: Uros Bizjak Date: Wed, 6 Mar 2024 17:12:47 +0100 Message-ID: Subject: [committed] i386: Eliminate common code from x86_32 TARGET_MACHO part in ix86_expand_move To: "gcc-patches@gcc.gnu.org" Cc: Iain Sandoe X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Eliminate common code from x86_32 TARGET_MACHO part in ix86_expand_move and use generic code instead. No functional changes. gcc/ChangeLog: * config/i386/i386-expand.cc (ix86_expand_move) [TARGET_MACHO]: Eliminate common code and use generic code instead. Bootstrapped and regression tested on x86_64-linux-gnu {,-m32} and by Iain on i686-darwin9, i686 and x86_64-darwin17, x86_64-darwin19, 21, 23. Uros. diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc index 3b1685ae448..2210e6f7cc8 100644 --- a/gcc/config/i386/i386-expand.cc +++ b/gcc/config/i386/i386-expand.cc @@ -471,9 +471,9 @@ ix86_expand_move (machine_mode mode, rtx operands[]) if ((flag_pic || MACHOPIC_INDIRECT) && symbolic_operand (op1, mode)) { +#if TARGET_MACHO if (TARGET_MACHO && !TARGET_64BIT) { -#if TARGET_MACHO /* dynamic-no-pic */ if (MACHOPIC_INDIRECT) { @@ -490,33 +490,18 @@ ix86_expand_move (machine_mode mode, rtx operands[]) emit_insn (insn); return; } - if (GET_CODE (op0) == MEM) - op1 = force_reg (Pmode, op1); - else - { - rtx temp = op0; - if (GET_CODE (temp) != REG) - temp = gen_reg_rtx (Pmode); - temp = legitimize_pic_address (op1, temp); - if (temp == op0) - return; - op1 = temp; - } - /* dynamic-no-pic */ -#endif } - else +#endif + + if (MEM_P (op0)) + op1 = force_reg (mode, op1); + else if (!(TARGET_64BIT && x86_64_movabs_operand (op1, DImode))) { - if (MEM_P (op0)) - op1 = force_reg (mode, op1); - else if (!(TARGET_64BIT && x86_64_movabs_operand (op1, DImode))) - { - rtx reg = can_create_pseudo_p () ? NULL_RTX : op0; - op1 = legitimize_pic_address (op1, reg); - if (op0 == op1) - return; - op1 = convert_to_mode (mode, op1, 1); - } + rtx reg = can_create_pseudo_p () ? NULL_RTX : op0; + op1 = legitimize_pic_address (op1, reg); + if (op0 == op1) + return; + op1 = convert_to_mode (mode, op1, 1); } } else