c-common.c (c_common_init): Set CPP arithmetic precision.

	* c-common.c (c_common_init): Set CPP arithmetic precision.
	* cppexp.c (cpp_num_part): Move typedef ...
	* cpphash.h: ...here; make unsigned HOST_WIDE_INT.
	* cppinit.c (cpp_create_reader): Default to host long arithmetic.
	(sanity_checks): Update.
testsuite:
	* gcc.dg/cpp/arith-2.c, gcc.dg/cpp/arith-3.c: New tests.
	* gcc.dg/cpp/if-3.c: Remove.

From-SVN: r53911

gcc/ChangeLog

+2002-05-27  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* c-common.c (c_common_init): Set CPP arithmetic precision.
+	* cppexp.c (cpp_num_part): Move typedef ...
+	* cpphash.h: ...here; make unsigned HOST_WIDE_INT.
+	* cppinit.c (cpp_create_reader): Default to host long arithmetic.
+	(sanity_checks): Update.
+
 2002-05-26  Geoffrey Keating  <geoffk@redhat.com>
 
 	* Makefile.in (INSTALL_HEADERS): Add 'install-mkheaders'.

gcc/c-common.c

@@ -4488,6 +4488,10 @@ c_common_init (filename)
 
   /* Set up preprocessor arithmetic.  Must be done after call to
      c_common_nodes_and_builtins for wchar_type_node to be good.  */
+  if (flag_isoc99)
+    options->precision = TYPE_PRECISION (intmax_type_node);
+  else
+    options->precision = TYPE_PRECISION (long_integer_type_node);
   options->char_precision = TYPE_PRECISION (char_type_node);
   options->int_precision = TYPE_PRECISION (integer_type_node);
   options->wchar_precision = TYPE_PRECISION (wchar_type_node);

gcc/cppexp.c

@@ -23,7 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #include "cpplib.h"
 #include "cpphash.h"
 
-typedef unsigned long cpp_num_part;
 typedef struct cpp_num cpp_num;
 
 #define PART_PRECISION (sizeof (cpp_num_part) * CHAR_BIT)

gcc/cpphash.h

@@ -29,6 +29,7 @@ struct directive;		/* Deliberately incomplete.  */
 struct pending_option;
 struct op;
 
+typedef unsigned HOST_WIDE_INT cpp_num_part;
 typedef unsigned char uchar;
 #define U (const uchar *)  /* Intended use: U"string" */
 

gcc/cppinit.c

@@ -496,8 +496,7 @@ cpp_create_reader (lang)
 
   /* Default CPP arithmetic to something sensible for the host for the
      benefit of dumb users like fix-header.  */
-#define BITS_PER_HOST_WIDEST_INT (CHAR_BIT * sizeof (HOST_WIDEST_INT))
-  CPP_OPTION (pfile, precision) = BITS_PER_HOST_WIDEST_INT;
+  CPP_OPTION (pfile, precision) = CHAR_BIT * sizeof (long);
   CPP_OPTION (pfile, char_precision) = CHAR_BIT;
   CPP_OPTION (pfile, wchar_precision) = CHAR_BIT * sizeof (int);
   CPP_OPTION (pfile, int_precision) = CHAR_BIT * sizeof (int);
@@ -848,6 +847,7 @@ static void sanity_checks (pfile)
      cpp_reader *pfile;
 {
   cppchar_t test = 0;
+  size_t max_precision = 2 * CHAR_BIT * sizeof (cpp_num_part);
 
   /* Sanity checks for assumptions about CPP arithmetic and target
      type precisions made by cpplib.  */
@@ -855,11 +855,11 @@ static void sanity_checks (pfile)
   if (test < 1)
     cpp_error (pfile, DL_ICE, "cppchar_t must be an unsigned type");
 
-  if (CPP_OPTION (pfile, precision) > BITS_PER_HOST_WIDEST_INT)
+  if (CPP_OPTION (pfile, precision) > max_precision)
     cpp_error (pfile, DL_ICE,
 	       "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits",
-	       (unsigned long)BITS_PER_HOST_WIDEST_INT,
-	       (unsigned long)CPP_OPTION (pfile, precision));
+	       (unsigned long) max_precision,
+	       (unsigned long) CPP_OPTION (pfile, precision));
 
   if (CPP_OPTION (pfile, precision) < CPP_OPTION (pfile, int_precision))
     cpp_error (pfile, DL_ICE,
@@ -876,11 +876,15 @@ static void sanity_checks (pfile)
     cpp_error (pfile, DL_ICE,
 	       "target int is narrower than target char");
 
+  /* This is assumed in eval_token() and could be fixed if necessary.  */
+  if (sizeof (cppchar_t) > sizeof (cpp_num_part))
+    cpp_error (pfile, DL_ICE, "CPP half-integer narrower than CPP character");
+
   if (CPP_OPTION (pfile, wchar_precision) > BITS_PER_CPPCHAR_T)
     cpp_error (pfile, DL_ICE,
 	       "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits",
-	       (unsigned long)BITS_PER_CPPCHAR_T,
-	       (unsigned long)CPP_OPTION (pfile, wchar_precision));
+	       (unsigned long) BITS_PER_CPPCHAR_T,
+	       (unsigned long) CPP_OPTION (pfile, wchar_precision));
 }
 #else
 # define sanity_checks(PFILE)

gcc/testsuite/ChangeLog

+2002-05-27  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* gcc.dg/cpp/arith-2.c, gcc.dg/cpp/arith-3.c: New tests.
+	* gcc.dg/cpp/if-3.c: Remove.
+
 2002-05-26  Jakub Jelinek  <jakub@redhat.com>
 
 	* g++.dg/opt/cse2.C: New test.