From e23c5ac057d83e7a93c3a740f0319fe086e44e9c Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 17 Aug 2009 09:09:04 +0000 Subject: [PATCH] * config/tc-microblaze.c: Include safe-ctype.h instad of ctype.h. (parse_reg): Use safe-ctype.h macros. (parse_exp): Likewise. (md_assemble): Likewise. --- gas/ChangeLog | 9 ++++++++- gas/config/tc-microblaze.c | 26 +++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 345a9e8db4..282995bfcc 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2009-08-17 Nick Clifton + + * config/tc-microblaze.c: Include safe-ctype.h instad of ctype.h. + (parse_reg): Use safe-ctype.h macros. + (parse_exp): Likewise. + (md_assemble): Likewise. + 2009-08-11 DJ Delorie * config/tc-mep.c (md_estimate_size_before_relax): Handle weak @@ -5,7 +12,7 @@ (md_convert_frag): Likewise. (md_pcrel_from_section): Likewise. (mep_force_relocation): Likewise. - + 2009-08-11 Bernd Schmidt * config/bfin-parse.y (gen_multi_instr_1): New function. diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c index 476e408b49..37b481b45f 100644 --- a/gas/config/tc-microblaze.c +++ b/gas/config/tc-microblaze.c @@ -26,7 +26,7 @@ #define DEFINE_TABLE #include "../opcodes/microblaze-opc.h" #include "../opcodes/microblaze-opcm.h" -#include +#include "safe-ctype.h" #include #include #include "aout/stab_gnu.h" @@ -409,7 +409,7 @@ parse_reg (char * s, unsigned * reg) unsigned tmpreg = 0; /* Strip leading whitespace. */ - while (isspace (* s)) + while (ISSPACE (* s)) ++ s; if (strncasecmp (s, "rpc", 3) == 0) @@ -481,13 +481,13 @@ parse_reg (char * s, unsigned * reg) /* MMU registers end. */ else if (strncasecmp (s, "rpvr", 4) == 0) { - if (isdigit (s[4]) && isdigit (s[5])) + if (ISDIGIT (s[4]) && ISDIGIT (s[5])) { tmpreg = (s[4]-'0')*10 + s[5] - '0'; s += 6; } - else if (isdigit (s[4])) + else if (ISDIGIT (s[4])) { tmpreg = s[4] - '0'; s += 5; @@ -510,12 +510,12 @@ parse_reg (char * s, unsigned * reg) } else if (strncasecmp (s, "rfsl", 4) == 0) { - if (isdigit (s[4]) && isdigit (s[5])) + if (ISDIGIT (s[4]) && ISDIGIT (s[5])) { tmpreg = (s[4] - '0') * 10 + s[5] - '0'; s += 6; } - else if (isdigit (s[4])) + else if (ISDIGIT (s[4])) { tmpreg = s[4] - '0'; s += 5; @@ -523,7 +523,7 @@ parse_reg (char * s, unsigned * reg) else as_bad (_("register expected, but saw '%.6s'"), s); - if ((int)tmpreg >= MIN_REGNUM && tmpreg <= MAX_REGNUM) + if ((int) tmpreg >= MIN_REGNUM && tmpreg <= MAX_REGNUM) *reg = tmpreg; else { @@ -534,14 +534,14 @@ parse_reg (char * s, unsigned * reg) } else { - if (tolower (s[0]) == 'r') + if (TOLOWER (s[0]) == 'r') { - if (isdigit (s[1]) && isdigit (s[2])) + if (ISDIGIT (s[1]) && ISDIGIT (s[2])) { tmpreg = (s[1] - '0') * 10 + s[2] - '0'; s += 3; } - else if (isdigit (s[1])) + else if (ISDIGIT (s[1])) { tmpreg = s[1] - '0'; s += 2; @@ -571,7 +571,7 @@ parse_exp (char *s, expressionS *e) char *new; /* Skip whitespace. */ - while (isspace (* s)) + while (ISSPACE (* s)) ++ s; save = input_line_pointer; @@ -806,7 +806,7 @@ md_assemble (char * str) char name[20]; /* Drop leading whitespace. */ - while (isspace (* str)) + while (ISSPACE (* str)) str ++; /* Find the op code end. */ @@ -1612,7 +1612,7 @@ md_assemble (char * str) } /* Drop whitespace after all the operands have been parsed. */ - while (isspace (* op_end)) + while (ISSPACE (* op_end)) op_end ++; /* Give warning message if the insn has more operands than required. */ -- 2.34.1