From patchwork Mon Mar 19 13:09:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 147505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id C85FFB6EF4 for ; Tue, 20 Mar 2012 00:09:35 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1332767378; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=dlFQ7nI aBovazEfdFk7dg0uG82w=; b=fvv3WfYGng5jQMtQGQ7xE7KlMnrw8p0r6wAa9Kt Uj5yWo5G5SE6zaY1HBSQ4JKWZPhybN7vyRS/BQlWNEXJ9gvKogWnxstFSM5kEg2y ZTYSoexko8SQuM+dLwZY7xi34Nkeq2+FEyGPB6SHQgJEp5Y2+wVfY+/M4udPBnHf bSVk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=fErxkOPXTgNsCu0i/OFEVH3cZLTAnSkKDZhWGNgWuLumrBeTPwuIPum4egxyIf A4d7J1KeBNjrHVWEFrUKokUFX8w8xBYtzb6vnyIMLMOGxtFisF0EhZRv1PsU1Vug c707d8yZR+gJCWh+OBj/hzbn0iNqHaiEylvisDl5/UsAE=; Received: (qmail 19256 invoked by alias); 19 Mar 2012 13:09:31 -0000 Received: (qmail 19020 invoked by uid 22791); 19 Mar 2012 13:09:30 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, TW_ZJ X-Spam-Check-By: sourceware.org Received: from mail-gy0-f175.google.com (HELO mail-gy0-f175.google.com) (209.85.160.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 19 Mar 2012 13:09:06 +0000 Received: by ghbz2 with SMTP id z2so5646616ghb.20 for ; Mon, 19 Mar 2012 06:09:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.236.46.232 with SMTP id r68mr12363750yhb.80.1332162546280; Mon, 19 Mar 2012 06:09:06 -0700 (PDT) Received: by 10.146.241.18 with HTTP; Mon, 19 Mar 2012 06:09:06 -0700 (PDT) Date: Mon, 19 Mar 2012 14:09:06 +0100 Message-ID: Subject: [PATCH, i386]: Consistently use Pmode From: Uros Bizjak To: gcc-patches@gcc.gnu.org Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hello! This patch uses Pmode consistently for some remaining cases. No functional change. 2012-03-19 Uros Bizjak * config/i386/i386.c (ix86_expand_prologue) : Use Pmode mode consistently. Use ix86_gen_add3. Assert that Pmode == DImode. (ix86_expand_split_stack_prologue): Use ix86_gen_add3. (ix86_split_long_move): Ditto. (legitimize_tls_address): Use ix86_gen_sub3. (construct_plt_address): Assert that Pmode == DImode. Tested on x86_64-pc-linux-gnu {,-m32}, committed to mainline. Uros. Index: i386.c =================================================================== --- i386.c (revision 185515) +++ i386.c (working copy) @@ -10458,15 +10458,19 @@ ix86_expand_prologue (void) { if (ix86_cmodel == CM_LARGE_PIC) { - rtx tmp_reg = gen_rtx_REG (DImode, R11_REG); - rtx label = gen_label_rtx (); + rtx label, tmp_reg; + + gcc_assert (Pmode == DImode); + label = gen_label_rtx (); emit_label (label); LABEL_PRESERVE_P (label) = 1; + tmp_reg = gen_rtx_REG (Pmode, R11_REG); gcc_assert (REGNO (pic_offset_table_rtx) != REGNO (tmp_reg)); - insn = emit_insn (gen_set_rip_rex64 (pic_offset_table_rtx, label)); + insn = emit_insn (gen_set_rip_rex64 (pic_offset_table_rtx, + label)); insn = emit_insn (gen_set_got_offset_rex64 (tmp_reg, label)); - insn = emit_insn (gen_adddi3 (pic_offset_table_rtx, - pic_offset_table_rtx, tmp_reg)); + insn = emit_insn (ix86_gen_add3 (pic_offset_table_rtx, + pic_offset_table_rtx, tmp_reg)); } else insn = emit_insn (gen_set_got_rex64 (pic_offset_table_rtx)); @@ -11196,8 +11200,8 @@ ix86_expand_split_stack_prologue (void) else { emit_move_insn (scratch_reg, offset); - emit_insn (gen_adddi3 (scratch_reg, scratch_reg, - stack_pointer_rtx)); + emit_insn (ix86_gen_add3 (scratch_reg, scratch_reg, + stack_pointer_rtx)); } current = scratch_reg; } @@ -11244,6 +11248,7 @@ ix86_expand_split_stack_prologue (void) { HOST_WIDE_INT argval; + gcc_assert (Pmode == DImode); /* When using the large model we need to load the address into a register, and we've run out of registers. So we switch to a different calling convention, and we call a @@ -11266,7 +11271,7 @@ ix86_expand_split_stack_prologue (void) LABEL_PRESERVE_P (label) = 1; emit_insn (gen_set_rip_rex64 (reg10, label)); emit_insn (gen_set_got_offset_rex64 (reg11, label)); - emit_insn (gen_adddi3 (reg10, reg10, reg11)); + emit_insn (ix86_gen_add3 (reg10, reg10, reg11)); x = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, split_stack_fn_large), UNSPEC_GOT); x = gen_rtx_CONST (Pmode, x); @@ -12722,7 +12727,7 @@ legitimize_tls_address (rtx x, enum tls_model mode { base = get_thread_pointer (true); dest = gen_reg_rtx (Pmode); - emit_insn (gen_subsi3 (dest, base, off)); + emit_insn (ix86_gen_sub3 (dest, base, off)); } break; @@ -12743,7 +12748,7 @@ legitimize_tls_address (rtx x, enum tls_model mode { base = get_thread_pointer (true); dest = gen_reg_rtx (Pmode); - emit_insn (gen_subsi3 (dest, base, off)); + emit_insn (ix86_gen_sub3 (dest, base, off)); } break; @@ -20626,8 +20631,8 @@ ix86_split_long_move (rtx operands[]) if (nparts == 3) { if (TARGET_128BIT_LONG_DOUBLE && mode == XFmode) - emit_insn (gen_addsi3 (stack_pointer_rtx, - stack_pointer_rtx, GEN_INT (-4))); + emit_insn (ix86_gen_add3 (stack_pointer_rtx, + stack_pointer_rtx, GEN_INT (-4))); emit_move_insn (part[0][2], part[1][2]); } else if (nparts == 4) @@ -22975,14 +22980,17 @@ ix86_expand_strlen (rtx out, rtx src, rtx eoschar, rtx construct_plt_address (rtx symbol) { - rtx tmp = gen_reg_rtx (Pmode); - rtx unspec = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, symbol), UNSPEC_PLTOFF); + rtx tmp, unspec; gcc_assert (GET_CODE (symbol) == SYMBOL_REF); gcc_assert (ix86_cmodel == CM_LARGE_PIC); + gcc_assert (Pmode == DImode); + tmp = gen_reg_rtx (Pmode); + unspec = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, symbol), UNSPEC_PLTOFF); + emit_move_insn (tmp, gen_rtx_CONST (Pmode, unspec)); - emit_insn (gen_adddi3 (tmp, tmp, pic_offset_table_rtx)); + emit_insn (ix86_gen_add3 (tmp, tmp, pic_offset_table_rtx)); return tmp; }