2001-12-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+ * clipper/clix.h (ASM_OUTPUT_ASCII): Avoid signed/unsigned
+ warnings.
+ * convex.h (ASM_OUTPUT_ASCII): Likewise.
+ * i370.h (ASM_OUTPUT_ASCII): Likewise.
+ * i386/att.h (ASM_OUTPUT_ASCII): Likewise.
+ * i386/i386-interix.h (ASM_OUTPUT_ASCII): Likewise.
+ * i386/i386elf.h (ASM_OUTPUT_ASCII): Likewise.
+ * i386/ptx4-i.h (ASM_OUTPUT_ASCII): Likewise.
+ * i386/sco5.h (ASM_OUTPUT_ASCII): Likewise.
+ * i386/sun386.h (ASM_OUTPUT_ASCII): Likewise.
+ * i386/sysv4.h (ASM_OUTPUT_ASCII): Likewise.
+ * i860/bsd.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/3b1.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/amix.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/atari.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/crds.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/hp320.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/m68kv4.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/mot3300.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/sgs.h (ASM_OUTPUT_ASCII): Likewise.
+ * m68k/tower-as.h (ASM_OUTPUT_ASCII): Likewise.
+ * mips/bsd-5.h (ASM_OUTPUT_ASCII): Likewise.
+ * mips/mips-5.h (ASM_OUTPUT_ASCII): Likewise.
+ * mips/svr3-5.h (ASM_OUTPUT_ASCII): Likewise.
+ * mips/svr4-5.h (ASM_OUTPUT_ASCII): Likewise.
+ * ns32k/encore.h (ASM_OUTPUT_ASCII): Likewise.
+ * vax/vaxv.h (ASM_OUTPUT_ASCII): Likewise.
+ * we32k/we32k.h (ASM_OUTPUT_ASCII): Likewise.
+
* i386/uwin.h (MD_STARTFILE_PREFIX): Avoid redefinition warnings.
* interix.h (TARGET_MEM_FUNCTIONS): Likewise.
* psos.h (CPP_PREDEFINES): Likewise.
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
- const unsigned char *s; \
- int i; \
- for (i = 0, s = (const unsigned char *)(PTR); i < (LEN); s++, i++) \
+ const unsigned char *s = (const unsigned char *)(PTR);\
+ size_t i, limit = (LEN); \
+ for (i = 0; i < limit; s++, i++) \
{ \
if ((i % 8) == 0) \
fputs ("\n\t.byte\t", (FILE)); \
/* This is how to output a string */
#define ASM_OUTPUT_ASCII(FILE,STR,SIZE) do { \
- int i; \
+ size_t i, limit = (SIZE); \
fprintf ((FILE), "\tds.b \""); \
- for (i = 0; i < (SIZE); i++) { \
+ for (i = 0; i < limit; i++) { \
register int c = (STR)[i] & 0377; \
if (c >= ' ' && c < 0177 && c != '\\' && c != '"') \
putc (c, (FILE)); \
#define ASM_OUTPUT_ASCII(FILE, PTR, LEN) \
{ \
- int i, j; \
- int c; \
- for (j = 0, i = 0; i < LEN; j++, i++) \
+ size_t i, limit = (LEN); \
+ int j; \
+ for (j = 0, i = 0; i < limit; j++, i++) \
{ \
- c = PTR[i]; \
+ int c = (PTR)[i]; \
if (ISCNTRL (c) || c == '&') \
{ \
if (j % MVS_ASCII_TEXT_LENGTH != 0 ) \
/* How to output an ASCII string constant. */
-#define ASM_OUTPUT_ASCII(FILE, p, size) \
+#define ASM_OUTPUT_ASCII(FILE, PTR, SIZE) \
do \
-{ int i = 0; \
- while (i < (size)) \
+{ size_t i = 0, limit = (SIZE); \
+ while (i < limit) \
{ if (i%10 == 0) { if (i!=0) fprintf ((FILE), "\n"); \
fprintf ((FILE), "%s", ASM_BYTE_OP); } \
else fprintf ((FILE), ","); \
- fprintf ((FILE), "0x%x", ((p)[i++] & 0377)) ;} \
+ fprintf ((FILE), "0x%x", ((PTR)[i++] & 0377)) ;} \
fprintf ((FILE), "\n"); \
} while (0)
} \
for (p = _ascii_bytes; p < limit && *p != '\0'; p++) \
continue; \
- if (p < limit && (p - _ascii_bytes) <= STRING_LIMIT) \
+ if (p < limit && (p - _ascii_bytes) <= (long) STRING_LIMIT) \
{ \
if (bytes_in_chunk > 0) \
{ \
} \
for (p = _ascii_bytes; p < limit && *p != '\0'; p++) \
continue; \
- if (p < limit && (p - _ascii_bytes) <= STRING_LIMIT) \
+ if (p < limit && (p - _ascii_bytes) <= (long) STRING_LIMIT) \
{ \
if (bytes_in_chunk > 0) \
{ \
} \
for (p = _ascii_bytes; p < limit && *p != '\0'; p++) \
continue; \
- if (p < limit && (p - _ascii_bytes) <= STRING_LIMIT) \
+ if (p < limit && (p - _ascii_bytes) <= (long) STRING_LIMIT) \
{ \
if (bytes_in_chunk > 0) \
{ \
} \
for (p = _ascii_bytes; p < limit && *p != '\0'; p++) \
continue; \
- if (p < limit && (p - _ascii_bytes) <= STRING_LIMIT) \
+ if (p < limit && (p - _ascii_bytes) <= (long) STRING_LIMIT) \
{ \
if (bytes_in_chunk > 0) \
{ \
/* How to output an ASCII string constant. */
-#define ASM_OUTPUT_ASCII(FILE, p, size) \
+#define ASM_OUTPUT_ASCII(FILE, PTR, SIZE) \
do \
-{ int i = 0; \
- while (i < (size)) \
+{ size_t i = 0, limit = (SIZE); \
+ while (i < limit) \
{ if (i%10 == 0) { if (i!=0) fprintf ((FILE), "\n"); \
fprintf ((FILE), "%s", ASM_BYTE_OP); } \
else fprintf ((FILE), ","); \
- fprintf ((FILE), "0x%x", ((p)[i++] & 0377)) ;} \
+ fprintf ((FILE), "0x%x", ((PTR)[i++] & 0377)) ;} \
fprintf ((FILE), "\n"); \
} while (0)
} \
for (p = _ascii_bytes; p < limit && *p != '\0'; p++) \
continue; \
- if (p < limit && (p - _ascii_bytes) <= STRING_LIMIT) \
+ if (p < limit && (p - _ascii_bytes) <= (long) STRING_LIMIT) \
{ \
if (bytes_in_chunk > 0) \
{ \
#define ASCII_DATA_ASM_OP "\t.byte\t"
#define ASM_OUTPUT_ASCII(f, p, size) \
-do { register unsigned i; \
+do { register size_t i, limit = (size); \
int inside; \
inside = FALSE; \
- for (i = 0; i < (size); i++) { \
+ for (i = 0; i < limit; i++) { \
if (i % 64 == 0) { \
if (i != 0) { \
if (inside) \
/* Yet another null terminated string format. */
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
- do { register int sp = 0, lp = 0; \
+ do { register size_t sp = 0, lp = 0, limit = (LEN); \
fprintf ((FILE), "\tbyte\t"); \
loop: \
if ((PTR)[sp] > ' ' && ! ((PTR)[sp] & 0x80) && (PTR)[sp] != '\\') \
else \
{ lp += 5; \
fprintf ((FILE), "0x%x", (PTR)[sp]); } \
- if (++sp < (LEN)) \
+ if (++sp < limit) \
{ if (lp > 60) \
{ lp = 0; \
fprintf ((FILE), "\n%s", ASCII_DATA_ASM_OP); } \
#undef ASM_OUTPUT_ASCII
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
- register int sp = 0, ch; \
+ register size_t sp = 0, limit = (LEN); \
fprintf ((FILE), "%s", BYTE_ASM_OP); \
do { \
- ch = (PTR)[sp]; \
+ int ch = (PTR)[sp]; \
if (ch > ' ' && ! (ch & 0x80) && ch != '\\') \
{ \
fprintf ((FILE), "'%c", ch); \
{ \
fprintf ((FILE), "0x%x", ch); \
} \
- if (++sp < (LEN)) \
+ if (++sp < limit) \
{ \
if ((sp % 10) == 0) \
{ \
putc (',', (FILE)); \
} \
} \
- } while (sp < (LEN)); \
+ } while (sp < limit); \
putc ('\n', (FILE)); \
} while (0)
\f
#undef ASM_OUTPUT_ASCII
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
{ \
- register int sp = 0, ch; \
+ register size_t sp = 0, limit = (LEN); \
fprintf ((FILE), "%s", BYTE_ASM_OP); \
do { \
- ch = (PTR)[sp]; \
+ int ch = (PTR)[sp]; \
if (ch > ' ' && ! (ch & 0x80) && ch != '\\') \
{ \
fprintf ((FILE), "'%c", ch); \
{ \
fprintf ((FILE), "0x%x", ch); \
} \
- if (++sp < (LEN)) \
+ if (++sp < limit) \
{ \
if ((sp % 10) == 0) \
{ \
putc (',', (FILE)); \
} \
} \
- } while (sp < (LEN)); \
+ } while (sp < limit); \
putc ('\n', (FILE)); \
}
#undef ASM_OUTPUT_ASCII
#define ASM_OUTPUT_ASCII(FILE, P , SIZE) \
-do { int i; \
+do { size_t i, limit = (SIZE); \
fprintf ((FILE), "\t.ascii \""); \
- for (i = 0; i < (SIZE); i++) \
+ for (i = 0; i < limit; i++) \
{ \
register int c = (P)[i]; \
if (i != 0 && (i / 200) * 200 == i) \
output_addr_const (FILE, addr); \
}}
-#define ASM_OUTPUT_ASCII(f, p, size) \
-do { register int i; \
+#define ASM_OUTPUT_ASCII(f, p, SIZE) \
+do { size_t i, limit = (SIZE); \
int inside; \
inside = FALSE; \
- for (i = 0; i < (size); i++) { \
+ for (i = 0; i < limit; i++) { \
if (i % 8 == 0) { \
if (i != 0) { \
if (inside) \
#undef ASM_OUTPUT_ASCII
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
- register int sp = 0, ch; \
+ register size_t sp = 0, limit = (LEN); \
fprintf ((FILE), "%s", BYTE_ASM_OP); \
do { \
- ch = (PTR)[sp]; \
+ int ch = (PTR)[sp]; \
if (ch > ' ' && ! (ch & 0x80) && ch != '\\') \
{ \
fprintf ((FILE), "'%c", ch); \
{ \
fprintf ((FILE), "0x%x", ch); \
} \
- if (++sp < (LEN)) \
+ if (++sp < limit) \
{ \
if ((sp % 10) == 0) \
{ \
putc (',', (FILE)); \
} \
} \
- } while (sp < (LEN)); \
+ } while (sp < limit); \
putc ('\n', (FILE)); \
} while (0)
#undef ASM_OUTPUT_ASCII
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
- do { register int sp = 0, lp = 0; \
+ do { register size_t sp = 0, lp = 0, limit = (LEN); \
fprintf ((FILE), "%s", ASM_BYTE_OP); \
loop: \
if ((PTR)[sp] > ' ' && ! ((PTR)[sp] & 0x80) && (PTR)[sp] != '\\') \
else \
{ lp += 5; \
fprintf ((FILE), "0x%x", (PTR)[sp]); } \
- if (++sp < (LEN)) \
+ if (++sp < limit) \
{ if (lp > 60) \
{ lp = 0; \
fprintf ((FILE), "\n%s", ASCII_DATA_ASM_OP); } \
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
- register int sp = 0, ch; \
+ register size_t sp = 0, limit = (LEN); \
fprintf ((FILE), "%s", BYTE_ASM_OP); \
do { \
- ch = (PTR)[sp]; \
+ int ch = (PTR)[sp]; \
if (ch > ' ' && ! (ch & 0x80) && ch != '\\') \
{ \
fprintf ((FILE), "'%c", ch); \
{ \
fprintf ((FILE), "0x%x", ch); \
} \
- if (++sp < (LEN)) \
+ if (++sp < limit) \
{ \
if ((sp % 10) == 0) \
{ \
putc (',', (FILE)); \
} \
} \
- } while (sp < (LEN)); \
+ } while (sp < limit); \
putc ('\n', (FILE)); \
} while (0)
fprintf (FILE, "\tident\t\"%s\" \n", NAME)
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
- do { register int sp = 0, lp = 0; \
+ do { register size_t sp = 0, lp = 0, limit = (LEN); \
fprintf ((FILE), "\tbyte\t"); \
loop: \
if ((PTR)[sp] > ' ' && ! ((PTR)[sp] & 0x80) && (PTR)[sp] != '\\') \
else \
{ lp += 5; \
fprintf ((FILE), "0x%x", (PTR)[sp]); } \
- if (++sp < (LEN)) \
+ if (++sp < limit) \
{ if (lp > 60) \
{ lp = 0; \
fprintf ((FILE), "\n\tbyte\t"); } \
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
const unsigned char *s; \
- int i; \
- for (i = 0, s = (const unsigned char *)(PTR); i < (LEN); s++, i++) \
+ size_t i, limit = (LEN); \
+ for (i = 0, s = (const unsigned char *)(PTR); i < limit; s++, i++) \
{ \
if ((i % 8) == 0) \
fputs ("\n\t.byte\t", (FILE)); \
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
const unsigned char *s; \
- int i; \
- for (i = 0, s = (const unsigned char *)(PTR); i < (LEN); s++, i++) \
+ size_t i, limit = (LEN); \
+ for (i = 0, s = (const unsigned char *)(PTR); i < limit; s++, i++) \
{ \
if ((i % 8) == 0) \
fputs ("\n\t.byte\t", (FILE)); \
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
const unsigned char *s; \
- int i; \
- for (i = 0, s = (const unsigned char *)(PTR); i < (LEN); s++, i++) \
+ size_t i, limit = (LEN); \
+ for (i = 0, s = (const unsigned char *)(PTR); i < limit; s++, i++) \
{ \
if ((i % 8) == 0) \
fputs ("\n\t.byte\t", (FILE)); \
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
const unsigned char *s; \
- int i; \
- for (i = 0, s = (const unsigned char *)(PTR); i < (LEN); s++, i++) \
+ size_t i, limit = (LEN); \
+ for (i = 0, s = (const unsigned char *)(PTR); i < limit; s++, i++) \
{ \
if ((i % 8) == 0) \
fputs ("\n\t.byte\t", (FILE)); \
#define ASM_OUTPUT_ASCII(file, p, size) \
do { \
- int i; \
- for (i = 0; i < (size); i++) \
+ size_t i, limit = (size); \
+ for (i = 0; i < limit; i++) \
{ \
register int c = (p)[i]; \
if ((i / 40) * 40 == i) \
- if (i == 0) \
- fprintf ((file), "\t.ascii \""); \
- else \
- fprintf ((file), "\"\n\t.ascii \""); \
+ { \
+ if (i == 0) \
+ fprintf ((file), "\t.ascii \""); \
+ else \
+ fprintf ((file), "\"\n\t.ascii \""); \
+ } \
if (c == '\"' || c == '\\') \
putc ('\\', (file)); \
if (c >= ' ' && c < 0177) \
else \
{ \
fprintf ((file), "\\%o", c); \
- if (i < (size) - 1 && ISDIGIT ((p)[i + 1])) \
+ if (i < limit - 1 && ISDIGIT ((p)[i + 1])) \
fprintf ((file), "\"\n\t.ascii \""); \
} \
} \
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
- const unsigned char *s; \
- int i; \
- for (i = 0, s = (PTR); i < (LEN); s++, i++) \
+ const unsigned char *s = (const unsigned char *)(PTR);\
+ size_t i, limit = (LEN); \
+ for (i = 0; i < limit; s++, i++) \
{ \
if ((i % 8) == 0) \
fputs ("\n\t.byte\t", (FILE)); \
#define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
do { \
const unsigned char *s; \
- int i; \
- for (i = 0, s = (const unsigned char *)(PTR); i < (LEN); s++, i++) \
+ size_t i, limit = (LEN); \
+ for (i = 0, s = (const unsigned char *)(PTR); i < limit; s++, i++) \
{ \
if ((i % 8) == 0) \
fprintf ((FILE),"%s\t.byte\t",(i?"\n":"")); \