*/
WORD h2word(const char *str);
-/**
- * @brief wordのエラー定義
- */
-static CERR cerr_word[] = {
- { 114, "not integer" },
- { 115, "not hex" },
- { 116, "out of hex range" },
-};
-
WORD n2word(const char *str)
{
- assert(isdigit(*str) || *str == '-');
+ assert(isdigit(str[0]) || str[0] == '-');
- char *check;
+ char *check = NULL;
int n;
/* WORD値に変換 */
n = strtol(str, &check, 10);
WORD h2word(const char *str)
{
- assert(*str == '#');
+ assert(str[0] == '#');
- WORD w = 0x0;
- char *check;
+ WORD w = 0;
+ char *check = NULL;
str++;
if(*str == '-' || strlen(str) > 4) {
setcerr(116, str-1); /* out of hex range */
return w;
}
+/**
+ * @brief wordのエラー定義
+ */
+static CERR cerr_word[] = {
+ { 114, "not integer" },
+ { 115, "not hex" },
+ { 116, "out of hex range" },
+};
+
/* word.hで定義された関数群 */
void addcerrlist_word()
{
char *word2n(WORD word)
{
enum {
- MAXLEN = 5, /* WORD値を10進数で表したときの最大桁数 */
+ MAXLEN = 5, /* WORD値を10進数で表したときの最大けた数 */
};
- char *p = malloc_chk(MAXLEN + 1, "word2n.p"), *digit = malloc_chk(MAXLEN + 1, "word2n.digit");
- int i = 0, j;
+ char *s = malloc_chk(MAXLEN + 1, "word2n.n");
+ char *t = NULL;
+ int d = 0; /* けた数 */
do{
- p[i++] = word % 10 + '0';
+ s[d++] = word % 10 + '0';
} while((word /= 10) > 0);
- for(j = 0; j < i; j++) {
- digit[j] = p[(i-1)-j];
- }
- digit[j] = '\0';
- FREE(p);
- return digit;
+ s[d] = '\0';
+ t = strrev(s);
+ FREE(s);
+ return t;
}
char *word2bit(const WORD word)
MAXLEN = 16, /* WORD値を2進数で表したときの最大桁数 */
};
WORD mask = 0x8000;
- char *bit = malloc_chk(MAXLEN + 1, "word2bit.bit");
+ char *bit = NULL;
int i = 0;
+ bit = malloc_chk(MAXLEN + 1, "word2bit.bit");
do {
bit[i++] = (word & mask) ? '1' : '0';
} while((mask >>= 1) > 0);
char *bit = word2bit(word);
if(logicalmode == true) {
- fprintf(stdout, "%6d", word);
+ fprintf(stdout, "%6u", word);
} else {
fprintf(stdout, "%6d", (signed short)word);
}