Use safe-ctype.h not ctype.h

This commit is contained in:
Nick Clifton
2001-10-13 09:38:04 +00:00
parent 03dd63aa03
commit 37111cc728
13 changed files with 117 additions and 116 deletions

View File

@@ -26,7 +26,6 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
Keep that in mind. */
#include "sysdep.h"
#include <ctype.h>
#include <stdio.h>
#include "ansidecl.h"
#include "bfd.h"
@@ -36,16 +35,17 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
#include "opintl.h"
#include "xregex.h"
#include "libiberty.h"
#include "safe-ctype.h"
#undef min
#undef min
#define min(a,b) ((a) < (b) ? (a) : (b))
#undef max
#undef max
#define max(a,b) ((a) > (b) ? (a) : (b))
static const char * parse_insn_normal
PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *, const char **, CGEN_FIELDS *));
/* -- assembler routines inserted here */
/* -- assembler routines inserted here. */
/* -- asm.c */
@@ -266,17 +266,16 @@ openrisc_cgen_init_asm (cd)
/*
Regex construction routine.
/* Regex construction routine.
This translates an opcode syntax string into a regex string,
by replacing any non-character syntax element (such as an
opcode) with the pattern '.*'
This translates an opcode syntax string into a regex string,
by replacing any non-character syntax element (such as an
opcode) with the pattern '.*'
It then compiles the regex and stores it in the opcode, for
later use by openrisc_cgen_assemble_insn
It then compiles the regex and stores it in the opcode, for
later use by openrisc_cgen_assemble_insn
Returns NULL for success, an error message for failure. */
Returns NULL for success, an error message for failure. */
char *
openrisc_cgen_build_insn_regex (insn)
@@ -284,7 +283,6 @@ openrisc_cgen_build_insn_regex (insn)
{
CGEN_OPCODE *opc = (CGEN_OPCODE *) CGEN_INSN_OPCODE (insn);
const char *mnem = CGEN_INSN_MNEMONIC (insn);
int mnem_len;
char rxbuf[CGEN_MAX_RX_ELEMENTS];
char *rx = rxbuf;
const CGEN_SYNTAX_CHAR_TYPE *syn;
@@ -352,9 +350,6 @@ openrisc_cgen_build_insn_regex (insn)
*rx++ = c;
break;
}
/* Insert syntax char into rx. */
*rx++ = c;
}
else
{
@@ -388,7 +383,7 @@ openrisc_cgen_build_insn_regex (insn)
regfree ((regex_t *) CGEN_INSN_RX (insn));
free (CGEN_INSN_RX (insn));
(CGEN_INSN_RX (insn)) = NULL;
return msg;
return msg;
}
}
@@ -429,14 +424,14 @@ parse_insn_normal (cd, insn, strp, fields)
GAS's input scrubber will ensure mnemonics are lowercase, but we may
not be called from GAS. */
p = CGEN_INSN_MNEMONIC (insn);
while (*p && tolower (*p) == tolower (*str))
while (*p && TOLOWER (*p) == TOLOWER (*str))
++p, ++str;
if (* p)
return _("unrecognized instruction");
#ifndef CGEN_MNEMONIC_OPERANDS
if (* str && !isspace (* str))
if (* str && ! ISSPACE (* str))
return _("unrecognized instruction");
#endif
@@ -465,7 +460,7 @@ parse_insn_normal (cd, insn, strp, fields)
first char after the mnemonic part is a space. */
/* FIXME: We also take inappropriate advantage of the fact that
GAS's input scrubber will remove extraneous blanks. */
if (tolower (*str) == tolower (CGEN_SYNTAX_CHAR (* syn)))
if (TOLOWER (*str) == TOLOWER (CGEN_SYNTAX_CHAR (* syn)))
{
#ifdef CGEN_MNEMONIC_OPERANDS
if (CGEN_SYNTAX_CHAR(* syn) == ' ')
@@ -514,7 +509,7 @@ parse_insn_normal (cd, insn, strp, fields)
blanks now. IE: We needn't try again with a longer version of
the insn and it is assumed that longer versions of insns appear
before shorter ones (eg: lsr r2,r3,1 vs lsr r2,r3). */
while (isspace (* str))
while (ISSPACE (* str))
++ str;
if (* str != '\0')
@@ -563,7 +558,7 @@ openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
int recognized_mnemonic = 0;
/* Skip leading white space. */
while (isspace (* str))
while (ISSPACE (* str))
++ str;
/* The instructions are stored in hashed lists.