From patchwork Wed Jul 7 21:25:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 58188 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 E1F8CB6EF3 for ; Thu, 8 Jul 2010 07:26:10 +1000 (EST) Received: (qmail 24471 invoked by alias); 7 Jul 2010 21:26:08 -0000 Received: (qmail 24459 invoked by uid 22791); 7 Jul 2010 21:26:06 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, TW_CF, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-wy0-f175.google.com (HELO mail-wy0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 07 Jul 2010 21:26:00 +0000 Received: by wye20 with SMTP id 20so103151wye.20 for ; Wed, 07 Jul 2010 14:25:57 -0700 (PDT) Received: by 10.227.135.75 with SMTP id m11mr5709772wbt.96.1278537957770; Wed, 07 Jul 2010 14:25:57 -0700 (PDT) Received: from localhost (rsandifo.gotadsl.co.uk [82.133.89.107]) by mx.google.com with ESMTPS id e31sm45668918wbe.23.2010.07.07.14.25.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 07 Jul 2010 14:25:57 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [21/27] Add apply_args_{mode,result} to the target structure References: <87d3v2oqyt.fsf@firetop.home> Date: Wed, 07 Jul 2010 22:25:55 +0100 In-Reply-To: <87d3v2oqyt.fsf@firetop.home> (Richard Sandiford's message of "Sun, 04 Jul 2010 22:51:54 +0100") Message-ID: <87k4p7rnks.fsf@firetop.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 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 This patch continues adding extra stuff to the target globals structures. This time it's apply_args_mode and apply_args_result. Admittedly they are border-line cases, since subtargets would usually be ABI-compatible with each other. The contents are fundamentally target-dependent though, so it seems better to add them to the target globals than not. Richard gcc/ * Makefile.in (target-globals.o): Depend on builtins.h. * builtins.h: New file. * builtins.c: Include builtins.h. (default_target_builtins): New variable. (this_target_builtins): New conditional variable. (apply_args_mode, apply_result_mode): Redefine as macros. * target-globals.h (this_target_builtins): Declare. (target_globals): Add a builtins field. (restore_target_globals): Copy the builtins field to this_target_builtins. * target-globals.c: Include builtins.h. (default_target_globals): Initialize the builtins field. (save_target_globals): Likewise. Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in 2010-07-07 22:17:34.000000000 +0100 +++ gcc/Makefile.in 2010-07-07 22:21:40.000000000 +0100 @@ -3479,7 +3479,7 @@ lower-subreg.o : lower-subreg.c $(CONFIG target-globals.o : target-globals.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) insn-config.h $(MACHMODE_H) $(GGC_H) $(TOPLEV_H) target-globals.h \ $(FLAGS_H) $(REGS_H) $(RTL_H) reload.h expmed.h $(EXPR_H) $(OPTABS_H) \ - $(LIBFUNCS_H) $(CFGLOOP_H) $(IRA_INT_H) + $(LIBFUNCS_H) $(CFGLOOP_H) $(IRA_INT_H) builtins.h $(out_object_file): $(out_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) \ $(RTL_H) $(REGS_H) hard-reg-set.h insn-config.h conditions.h \ Index: gcc/builtins.h =================================================================== --- /dev/null 2010-07-07 22:25:18.139280603 +0100 +++ gcc/builtins.h 2010-07-07 22:21:40.000000000 +0100 @@ -0,0 +1,49 @@ +/* Expand builtin functions. + Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +. */ + +#ifndef GCC_BUILTINS_H +#define GCC_BUILTINS_H + +/* Target-dependent globals. */ +struct target_builtins { + /* For each register that may be used for calling a function, this + gives a mode used to copy the register's value. VOIDmode indicates + the register is not used for calling a function. If the machine + has register windows, this gives only the outbound registers. + INCOMING_REGNO gives the corresponding inbound register. */ + enum machine_mode x_apply_args_mode[FIRST_PSEUDO_REGISTER]; + + /* For each register that may be used for returning values, this gives + a mode used to copy the register's value. VOIDmode indicates the + register is not used for returning values. If the machine has + register windows, this gives only the outbound registers. + INCOMING_REGNO gives the corresponding inbound register. */ + enum machine_mode x_apply_result_mode[FIRST_PSEUDO_REGISTER]; +}; + +extern GTY(()) struct target_builtins default_target_builtins; +#if SWITCHABLE_TARGET +extern struct target_builtins *this_target_builtins; +#else +#define this_target_builtins (&default_target_builtins) +#endif + +#endif Index: gcc/builtins.c =================================================================== --- gcc/builtins.c 2010-07-07 21:30:42.000000000 +0100 +++ gcc/builtins.c 2010-07-07 22:21:40.000000000 +0100 @@ -50,6 +50,7 @@ Software Foundation; either version 3, o #include "tree-flow.h" #include "value-prof.h" #include "diagnostic-core.h" +#include "builtins.h" #ifndef SLOW_UNALIGNED_ACCESS #define SLOW_UNALIGNED_ACCESS(MODE, ALIGN) STRICT_ALIGNMENT @@ -60,6 +61,11 @@ #define PAD_VARARGS_DOWN BYTES_BIG_ENDIA #endif static tree do_mpc_arg1 (tree, tree, int (*)(mpc_ptr, mpc_srcptr, mpc_rnd_t)); +struct target_builtins default_target_builtins; +#if SWITCHABLE_TARGET +struct target_builtins *this_target_builtins = &default_target_builtins; +#endif + /* Define the names of the builtin function types and codes. */ const char *const built_in_class_names[4] = {"NOT_BUILT_IN", "BUILT_IN_FRONTEND", "BUILT_IN_MD", "BUILT_IN_NORMAL"}; @@ -1249,19 +1255,10 @@ get_memory_rtx (tree exp, tree len) /* Built-in functions to perform an untyped call and return. */ -/* For each register that may be used for calling a function, this - gives a mode used to copy the register's value. VOIDmode indicates - the register is not used for calling a function. If the machine - has register windows, this gives only the outbound registers. - INCOMING_REGNO gives the corresponding inbound register. */ -static enum machine_mode apply_args_mode[FIRST_PSEUDO_REGISTER]; - -/* For each register that may be used for returning values, this gives - a mode used to copy the register's value. VOIDmode indicates the - register is not used for returning values. If the machine has - register windows, this gives only the outbound registers. - INCOMING_REGNO gives the corresponding inbound register. */ -static enum machine_mode apply_result_mode[FIRST_PSEUDO_REGISTER]; +#define apply_args_mode \ + (this_target_builtins->x_apply_args_mode) +#define apply_result_mode \ + (this_target_builtins->x_apply_result_mode) /* Return the size required for the block returned by __builtin_apply_args, and initialize apply_args_mode. */ Index: gcc/target-globals.h =================================================================== --- gcc/target-globals.h 2010-07-07 22:17:34.000000000 +0100 +++ gcc/target-globals.h 2010-07-07 22:21:40.000000000 +0100 @@ -32,6 +32,7 @@ #define TARGET_GLOBALS_H 1 extern struct target_cfgloop *this_target_cfgloop; extern struct target_ira *this_target_ira; extern struct target_ira_int *this_target_ira_int; +extern struct target_builtins *this_target_builtins; struct GTY(()) target_globals { struct target_flag_state *GTY((skip)) flag_state; @@ -45,6 +46,7 @@ struct GTY(()) target_globals { struct target_cfgloop *GTY((skip)) cfgloop; struct target_ira *GTY((skip)) ira; struct target_ira_int *GTY((skip)) ira_int; + struct target_builtins *GTY((skip)) builtins; }; extern struct target_globals default_target_globals; @@ -65,6 +67,7 @@ restore_target_globals (struct target_gl this_target_cfgloop = g->cfgloop; this_target_ira = g->ira; this_target_ira_int = g->ira_int; + this_target_builtins = g->builtins; } #endif Index: gcc/target-globals.c =================================================================== --- gcc/target-globals.c 2010-07-07 22:17:34.000000000 +0100 +++ gcc/target-globals.c 2010-07-07 22:21:40.000000000 +0100 @@ -37,6 +37,7 @@ Software Foundation; either version 3, o #include "libfuncs.h" #include "cfgloop.h" #include "ira-int.h" +#include "builtins.h" #if SWITCHABLE_TARGET struct target_globals default_target_globals = { @@ -50,7 +51,8 @@ struct target_globals default_target_glo &default_target_libfuncs, &default_target_cfgloop, &default_target_ira, - &default_target_ira_int + &default_target_ira_int, + &default_target_builtins }; struct target_globals * @@ -70,6 +72,7 @@ save_target_globals (void) g->cfgloop = XCNEW (struct target_cfgloop); g->ira = XCNEW (struct target_ira); g->ira_int = XCNEW (struct target_ira_int); + g->builtins = XCNEW (struct target_builtins); restore_target_globals (g); target_reinit (); return g;