of the operation.
* cpphash.h: Move static declaration of hashtab[]...
* cpphash.c: ...here.
* cpplib.c: Cast difference of two pointers to size_t before
comparing it to size_t. Cast signed to unsigned
before comparing to size_t. (FIXME: struct argdata should use
unsigned buffer sizes.)
* cpplib.h (struct cpp_reader): Declare token_buffer_size as
unsigned int. (CPP_WRITTEN): Cast return value to size_t.
(CPP_RESERVE): Parenthesize N for evaluation order, cast to
size_t before comparison.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22980
138bc75d-0d04-0410-961f-
82ee72b054a4
+Sun Oct 11 01:03:05 1998 Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+ * cppexp.c: When forcing unsigned comparisons, cast both sides
+ of the operation.
+
+ * cpphash.h: Move static declaration of hashtab[]...
+ * cpphash.c: ...here.
+
+ * cpplib.c: Cast difference of two pointers to size_t before
+ comparing it to size_t. Cast signed to unsigned
+ before comparing to size_t. (FIXME: struct argdata should use
+ unsigned buffer sizes.)
+ * cpplib.h (struct cpp_reader): Declare token_buffer_size as
+ unsigned int. (CPP_WRITTEN): Cast return value to size_t.
+ (CPP_RESERVE): Parenthesize N for evaluation order, cast to
+ size_t before comparison.
+
Sun Oct 11 00:15:29 1998 Jeffrey A Law (law@cygnus.com)
* flow.c (find_basic_blocks): Delte "live_reachable_p" argument.
{
c = cpp_parse_escape (pfile, (char **) &ptr);
if (width < HOST_BITS_PER_INT
- && (unsigned) c >= (1 << width))
+ && (unsigned) c >= (unsigned)(1 << width))
cpp_pedwarn (pfile,
"escape sequence out of range for character");
}
#define COMPARE(OP) \
top->unsignedp = 0;\
- top->value = (unsigned1 || unsigned2) ? (unsigned long) v1 OP v2 : (v1 OP v2)
+ top->value = (unsigned1 || unsigned2) \
+ ? (unsigned long) v1 OP (unsigned long) v2 : (v1 OP v2)
/* Parse and evaluate a C expression, reading from PFILE.
Returns the value of the expression. */
extern char *xmalloc PARAMS ((unsigned));
+static HASHNODE *hashtab[HASHSIZE];
+
/* Return hash function on name. must be compatible with the one
computed a step at a time, elsewhere */
politeness, for use when speed isn't so important. */
#define HASHSIZE 1403
-static HASHNODE *hashtab[HASHSIZE];
#define HASHSTEP(old, c) ((old << 2) + c)
#define MAKE_POS(v) (v & 0x7fffffff) /* make number positive */
while (is_idchar[*bp]) {
bp++;
/* do we have a "special" rest-args extension here? */
- if (limit - bp > REST_EXTENSION_LENGTH
+ if ((size_t)(limit - bp) > REST_EXTENSION_LENGTH
&& strncmp (rest_extension, bp, REST_EXTENSION_LENGTH) == 0) {
rest_args = 1;
temp->rest_args = 1;
one space except within an string or char token.*/
if (is_space[c])
{
- if (CPP_WRITTEN (pfile) > arg->stringified
+ if (CPP_WRITTEN (pfile) > (unsigned)arg->stringified
&& (CPP_PWRITTEN (pfile))[-1] == '@')
{
/* "@ " escape markers are removed */
p = filename;
if (searchptr
&& searchptr->fname
- && strlen (searchptr->fname) == p - filename
+ && strlen (searchptr->fname) == (size_t) (p - filename)
&& ! strncmp (searchptr->fname, filename, p - filename))
{
/* FILENAME is in SEARCHPTR, which we've already checked. */
/* A buffer used for both for cpp_get_token's output, and also internally. */
unsigned char *token_buffer;
/* Allocated size of token_buffer. CPP_RESERVE allocates space. */
- int token_buffer_size;
+ unsigned int token_buffer_size;
/* End of the written part of token_buffer. */
unsigned char *limit;
#define CPP_OUT_BUFFER(PFILE) ((PFILE)->token_buffer)
/* Number of characters currently in PFILE's output buffer. */
-#define CPP_WRITTEN(PFILE) ((PFILE)->limit - (PFILE)->token_buffer)
+#define CPP_WRITTEN(PFILE) ((size_t)((PFILE)->limit - (PFILE)->token_buffer))
#define CPP_PWRITTEN(PFILE) ((PFILE)->limit)
/* Make sure PFILE->token_buffer has space for at least N more characters. */
#define CPP_RESERVE(PFILE, N) \
- (CPP_WRITTEN (PFILE) + N > (PFILE)->token_buffer_size \
+ (CPP_WRITTEN (PFILE) + (size_t)(N) > (PFILE)->token_buffer_size \
&& (cpp_grow_buffer (PFILE, N), 0))
/* Append string STR (of length N) to PFILE's output buffer.