X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fword.c;h=bb564cfd8b0f10dce4c35a7a98b7f9ed0fdb1d05;hp=64e9f55607aba5dae75ca5614287c180dc6f4a6b;hb=86e559d164166966a797a1e5855871d48e087ddd;hpb=ae04e48ee62a95f6f77794d5611db189a19e70de

diff --git a/src/word.c b/src/word.c
index 64e9f55..bb564cf 100644
--- a/src/word.c
+++ b/src/word.c
@@ -25,55 +25,70 @@ WORD n2word(const char *str);
  */
 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);
-    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;
+    WORD w = 0;
+    char *check = NULL;
     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;
     }
     return w;
 }
 
+/**
+ * @brief wordのエラー定義
+ */
+static CERR cerr_word[] = {
+    { 114, "not integer" },
+    { 115, "not hex" },
+    { 116, "out of hex range" },
+};
+
+/**
+ * @brief ファイル読み込みのエラー定義
+ */
+static CERR cerr_load[] = {
+    { 210, "load - memory overflow" },
+    { 211, "object file not specified" },
+    { 212, "invalid option" },
+    { 213, "invalid argument" },
+};
+
 /* word.hで定義された関数群 */
+void addcerrlist_load()
+{
+    addcerrlist(ARRAYSIZE(cerr_load), cerr_load);
+}
+
 void addcerrlist_word()
 {
     addcerrlist(ARRAYSIZE(cerr_word), cerr_word);
@@ -84,6 +99,9 @@ WORD nh2word(const char *str)
     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;
@@ -101,18 +119,19 @@ char *word2n(WORD word)
     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)
@@ -121,26 +140,27 @@ char *word2bit(const WORD word)
         MAXLEN = 16,        /* WORD値を2進数で表したときの最大桁数 */
     };
     WORD mask = 0x8000;
-    char *bit, *p;
+    char *bit = NULL;
+    int i = 0;
 
-    bit = p = malloc_chk(MAXLEN + 1, "word2bit.bit");
+    bit = 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);
@@ -149,5 +169,5 @@ void print_dumpword(WORD word, bool logicalmode)
     } else if(word == '\t') {
         fprintf(stdout, " = \'\\t\'");
     }
-    FREE(b);
+    FREE(bit);
 }