X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fword.c;h=3b309671470d78b0333ccaa4ed985808e7a67bb3;hp=83ae9bd52c75d2878901af4cf25bbc74db486ac8;hb=b0f981469cdea23225ca5c3ef0ca6759d6a92b43;hpb=8a76ef9abe62fac15c40aebb64fbb8a541b78075

diff --git a/src/word.c b/src/word.c
index 83ae9bd..3b30967 100644
--- a/src/word.c
+++ b/src/word.c
@@ -1,9 +1,21 @@
 #include "word.h"
 
+/* wordのエラー定義 */
+CERRARRAY cerr_word[] = {
+    { 114, "not integer" },
+    { 115, "not hex" },
+    { 116, "out of hex range" },
+};
+bool addcerrlist_word()
+{
+    return addcerrlist(ARRAYSIZE(cerr_word), cerr_word);
+}
+
 /* 10進数の文字列をWORD値に変換 */
 WORD n2word(const char *str)
 {
     assert(isdigit(*str) || *str == '-');
+
     char *check;
     int n;
     /* WORD値に変換 */
@@ -14,7 +26,7 @@ WORD n2word(const char *str)
     }
     /* nが-32768〜32767の範囲にないときは、その下位16ビットを格納 */
     if(n < -32768 || n > 32767) {
-        n = n % 0x10000;
+        n = n & 0xFFFF;
     }
     return (WORD)n;
 }
@@ -23,7 +35,8 @@ WORD n2word(const char *str)
 WORD h2word(const char *str)
 {
     assert(*str == '#');
-    WORD w = 0x0;
+
+    WORD word = 0x0;
     char *check;
     str++;
     if(*str == '-' || strlen(str) > 4) {
@@ -31,17 +44,18 @@ WORD h2word(const char *str)
         return 0;
     }
     /* WORD値に変換 */
-    w = (WORD)strtol(str, &check, 16);
+    word = (WORD)strtol(str, &check, 16);
     if(*check != '\0') {
         setcerr(115, str-1);    /* not hex */
         return 0x0;
     }
-    return w;
+    return word;
 }
 
 /* 10進数または16進数の文字列をWORD値に変換 */
 WORD nh2word(const char *str)
 {
+    addcerrlist_word();
     WORD word;
     if(!isdigit(*str) && *str != '-' && *str != '#') {
         setcerr(114, str);    /* not integer */
@@ -74,8 +88,7 @@ char *word2n(WORD word)
 char *word2bit(const WORD word)
 {
     WORD mask = 0x8000;
-    char *bit, *p;
-    bit = malloc(16 + 1);
+    char *bit = malloc(16 + 1), *p;
     p = bit;
     do {
         *p++ = (word & mask) ? '1' : '0';
@@ -83,3 +96,23 @@ char *word2bit(const WORD word)
     *p = '\0';
     return bit;
 }
+
+/* WORD値を解析して表示 */
+void print_dumpword(WORD word, bool logicalmode)
+{
+    if(logicalmode == true) {
+        fprintf(stdout, "%6d", word);
+    } else {
+        fprintf(stdout, "%6d", (signed short)word);
+    }
+    fprintf(stdout, " = #%04X = %s", word, word2bit(word));
+    /* 「文字の組」の符号表に記載された文字と、改行（CR）／タブを表示 */
+    if(word >= 0x20 && word <= 0x7E) {
+        fprintf(stdout, " = \'%c\'", word);
+    } else if(word == 0xA) {
+        fprintf(stdout, " = \'\\n\'");
+    } else if(word == '\t') {
+        fprintf(stdout, " = \'\\t\'");
+    }
+    fprintf(stdout, "\n");
+}