xcoff slurp_armap bounds checking

[deliverable/binutils-gdb.git] / sim / ppc / options.c

diff --git a/sim/ppc/options.c b/sim/ppc/options.c
index 2d31124752aa7254e44f04b075009b9606391df0..ddb492f54fb7095ef2d1952da56a700e9f76de39 100644 (file)
--- a/sim/ppc/options.c
+++ b/sim/ppc/options.c
@@ -4,7 +4,7 @@
 
     This program 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 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
 
     */
 
@@ -99,9 +98,9 @@ options_inline (int in)
   case /*1*/ REVEAL_MODULE:                    return "REVEAL_MODULE";
   case /*2*/ INLINE_MODULE:                    return "INLINE_MODULE";
   case /*3*/ REVEAL_MODULE|INLINE_MODULE:      return "REVEAL_MODULE|INLINE_MODULE";
-  case /*4*/ INLINE_LOCALS:                    return "LOCALS_INLINE";
-  case /*5*/ INLINE_LOCALS|REVEAL_MODULE:      return "INLINE_LOCALS|REVEAL_MODULE";
-  case /*6*/ INLINE_LOCALS|INLINE_MODULE:      return "INLINE_LOCALS|INLINE_MODULE";
+  case /*4*/ PSIM_INLINE_LOCALS:               return "PSIM_LOCALS_INLINE";
+  case /*5*/ PSIM_INLINE_LOCALS|REVEAL_MODULE: return "PSIM_INLINE_LOCALS|REVEAL_MODULE";
+  case /*6*/ PSIM_INLINE_LOCALS|INLINE_MODULE: return "PSIM_INLINE_LOCALS|INLINE_MODULE";
   case /*7*/ ALL_INLINE:                       return "ALL_INLINE";
   }
   return "0";
@@ -121,7 +120,6 @@ print_options (void)
   printf_filtered ("WITH_HOST_BYTE_ORDER     = %s\n", options_byte_order (WITH_HOST_BYTE_ORDER));
   printf_filtered ("WITH_TARGET_BYTE_ORDER   = %s\n", options_byte_order (WITH_TARGET_BYTE_ORDER));
   printf_filtered ("WITH_XOR_ENDIAN          = %d\n", WITH_XOR_ENDIAN);
-  printf_filtered ("WITH_BSWAP               = %d\n", WITH_BSWAP);
   printf_filtered ("WITH_SMP                 = %d\n", WITH_SMP);
   printf_filtered ("WITH_HOST_WORD_BITSIZE   = %d\n", WITH_HOST_WORD_BITSIZE);
   printf_filtered ("WITH_TARGET_WORD_BITSIZE = %d\n", WITH_TARGET_WORD_BITSIZE);
@@ -139,8 +137,6 @@ print_options (void)
   printf_filtered ("WITH_MODEL_ISSUE         = %d\n", WITH_MODEL_ISSUE);
   printf_filtered ("WITH_RESERVED_BITS       = %d\n", WITH_RESERVED_BITS);
   printf_filtered ("WITH_STDIO               = %d\n", WITH_STDIO);
-  printf_filtered ("WITH_REGPARM             = %d\n", WITH_REGPARM);
-  printf_filtered ("WITH_STDCALL             = %d\n", WITH_STDCALL);
   printf_filtered ("DEFAULT_INLINE           = %s\n", options_inline (DEFAULT_INLINE));
   printf_filtered ("SIM_ENDIAN_INLINE        = %s\n", options_inline (SIM_ENDIAN_INLINE));
   printf_filtered ("BITS_INLINE              = %s\n", options_inline (BITS_INLINE));
@@ -220,7 +216,7 @@ print_options (void)
     int max_len = 0;
     int cols;
 
-    for (i = 0; i < sizeof (defines) / sizeof (defines[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE (defines); i++) {
       int len = strlen (defines[i]);
       if (len > max_len)
        max_len = len;
@@ -231,10 +227,10 @@ print_options (void)
       cols = 1;
 
     printf_filtered ("\n#defines:");
-    for (i = 0; i < sizeof (defines) / sizeof (defines[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE (defines); i++) {
       const char *const prefix = ((i % cols) == 0) ? "\n" : "";
       printf_filtered ("%s  %s%*s", prefix, defines[i],
-                      (((i == (sizeof (defines) / sizeof (defines[0])) - 1)
+                      (((i == ARRAY_SIZE (defines) - 1)
                         || (((i + 1) % cols) == 0))
                        ? 0
                        : max_len + 4 - strlen (defines[i])),