WORD n2word(const char *str)
{
- assert(isdigit(*str) || *str == '-');
+ assert(isdigit(str[0]) || str[0] == '-');
char *check;
int n;
/* WORD値に変換 */
n = strtol(str, &check, 10);
- if(*check != '\0') {
+ if(check[0]) {
setcerr(114, str); /* not integer */
return 0x0;
}
/* nが-32768から32767の範囲にないときは、その下位16ビットを格納 */
if(n < -32768 || n > 32767) {
- n = n & 0xFFFF;
+ n &= 0xFFFF;
}
return (WORD)n;
}
WORD h2word(const char *str)
{
- assert(*str == '#');
+ assert(str[0] == '#');
WORD w = 0x0;
char *check;
str++;
if(*str == '-' || strlen(str) > 4) {
setcerr(116, str-1); /* out of hex range */
- return 0;
+ return 0x0;
}
/* WORD値に変換 */
w = (WORD)strtol(str, &check, 16);
- if(*check != '\0') {
+ if(check[0]) {
setcerr(115, str-1); /* not hex */
return 0x0;
}
WORD w;
assert(sizeof(WORD) * 8 == 16); /* WORD型のサイズが16ビットであることを確認 */
+ if(str == NULL) {
+ return 0x0;
+ }
if(!isdigit(*str) && *str != '-' && *str != '#') {
setcerr(114, str); /* not integer */
return 0x0;
enum {
MAXLEN = 5, /* WORD値を10進数で表したときの最大桁数 */
};
- char *p = malloc_chk(MAXLEN + 1, "word2n.p"), *digit = malloc_chk(MAXLEN + 1, "word2n.digit");
+ char *n = malloc_chk(MAXLEN + 1, "word2n.n"), tmp;
int i = 0, j;
do{
- *(p + i++) = word % 10 + '0';
+ n[i++] = word % 10 + '0';
} while((word /= 10) > 0);
for(j = 0; j < i; j++) {
- *(digit + j) = *(p + (i - 1) - j);
+ tmp = n[j];
+ n[j] = n[(i-1)-j];
+ n[(i-1)-j] = tmp;
}
- *(digit + j + 1) = '\0';
- FREE(p);
- return digit;
+ n[j] = '\0';
+ return n;
}
char *word2bit(const WORD word)
MAXLEN = 16, /* WORD値を2進数で表したときの最大桁数 */
};
WORD mask = 0x8000;
- char *bit, *p;
+ char *bit = malloc_chk(MAXLEN + 1, "word2bit.bit");
+ int i = 0;
- bit = p = malloc_chk(MAXLEN + 1, "word2bit.bit");
do {
- *p++ = (word & mask) ? '1' : '0';
+ bit[i++] = (word & mask) ? '1' : '0';
} while((mask >>= 1) > 0);
- *p = '\0';
+ bit[i] = '\0';
return bit;
}
void print_dumpword(WORD word, bool logicalmode)
{
- char *b;
+ char *bit = NULL;
if(logicalmode == true) {
fprintf(stdout, "%6d", word);
} else {
fprintf(stdout, "%6d", (signed short)word);
}
- fprintf(stdout, " = #%04X = %s", word, (b = word2bit(word)));
+ fprintf(stdout, " = #%04X = %s", word, (bit = word2bit(word)));
/* 「文字の組」の符号表に記載された文字と、改行(CR)/タブを表示 */
if(word >= 0x20 && word <= 0x7E) {
fprintf(stdout, " = \'%c\'", word);
} else if(word == '\t') {
fprintf(stdout, " = \'\\t\'");
}
- FREE(b);
+ FREE(bit);
}