Restore original scattering when the transform is not legal.

[pf3gnuchains/gcc-fork.git] / gcc / params.c

diff --git a/gcc/params.c b/gcc/params.c
index 72c67be..d7179c0 100644 (file)
--- a/gcc/params.c
+++ b/gcc/params.c
@@ -1,12 +1,13 @@
 /* params.c - Run-time parameters.
 /* params.c - Run-time parameters.

-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.

    Written by Mark Mitchell <mark@codesourcery.com>.
 
 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
    Written by Mark Mitchell <mark@codesourcery.com>.
 
 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 2, or (at your option) any later
+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
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,14 +16,13 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-
-*/
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"

+#include "coretypes.h"
+#include "tm.h"

 #include "params.h"
 #include "toplev.h"
 
 #include "params.h"
 #include "toplev.h"
 


@@ -38,15 +38,11 @@ static size_t num_compiler_params;
 /* Add the N PARAMS to the current list of compiler parameters.  */
 
 void
 /* Add the N PARAMS to the current list of compiler parameters.  */
 
 void

-add_params (params, n)
-     const param_info params[];
-     size_t n;
+add_params (const param_info params[], size_t n)

 {
   /* Allocate enough space for the new parameters.  */
 {
   /* Allocate enough space for the new parameters.  */

-  compiler_params =
-    ((param_info *)
-     xrealloc (compiler_params,
-              (num_compiler_params + n) * sizeof (param_info)));
+  compiler_params = XRESIZEVEC (param_info, compiler_params,
+                               num_compiler_params + n);

   /* Copy them into the table.  */
   memcpy (compiler_params + num_compiler_params,
          params,
   /* Copy them into the table.  */
   memcpy (compiler_params + num_compiler_params,
          params,


@@ -58,24 +54,34 @@ add_params (params, n)
 /* Set the VALUE associated with the parameter given by NAME.  */
 
 void
 /* Set the VALUE associated with the parameter given by NAME.  */
 
 void

-set_param_value (name, value)
-     const char *name;
-     int value;
+set_param_value (const char *name, int value)

 {
   size_t i;
 
   /* Make sure nobody tries to set a parameter to an invalid value.  */
 {
   size_t i;
 
   /* Make sure nobody tries to set a parameter to an invalid value.  */

-  if (value == INVALID_PARAM_VAL)
-    abort ();
+  gcc_assert (value != INVALID_PARAM_VAL);

 
   /* Scan the parameter table to find a matching entry.  */
   for (i = 0; i < num_compiler_params; ++i)
     if (strcmp (compiler_params[i].option, name) == 0)
       {
 
   /* Scan the parameter table to find a matching entry.  */
   for (i = 0; i < num_compiler_params; ++i)
     if (strcmp (compiler_params[i].option, name) == 0)
       {

-       compiler_params[i].value = value;
+       if (value < compiler_params[i].min_value)
+         error ("minimum value of parameter %qs is %u",
+                compiler_params[i].option,
+                compiler_params[i].min_value);
+       else if (compiler_params[i].max_value > compiler_params[i].min_value
+                && value > compiler_params[i].max_value)
+         error ("maximum value of parameter %qs is %u",
+                compiler_params[i].option,
+                compiler_params[i].max_value);
+       else
+         {
+           compiler_params[i].value = value;
+           compiler_params[i].set = true;
+         }

        return;
       }
 
   /* If we didn't find this parameter, issue an error message.  */
        return;
       }
 
   /* If we didn't find this parameter, issue an error message.  */

-  error ("invalid parameter `%s'", name);
+  error ("invalid parameter %qs", name);

 }
 }