dumpwordコマンド実行時やレジスタの内容を表示するときに、対応する文字を表示するよう仕様変更

[YACASL2.git] / src / dumpword.c

diff --git a/src/dumpword.c b/src/dumpword.c
index e78b108..a3c6a36 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -9,13 +9,20 @@ static struct option longopts[] = {
     {0, 0, 0, 0},
 };
 
+CERRARRAY cerr[] = {
+    { 114, "not integer" },
+    { 115, "not hex" },
+    { 116, "out of hex range" },
+    { 0, NULL },
+};
+
 int main(int argc, char *argv[])
 {
+    bool logicalmode = false;    /* レジストリの内容を論理値（0〜65535）で表示する場合はtrue */
     int opt;
     WORD word;
     const char *usage = "Usage: %s [-alh] WORD\n";
 
-    logicalmode = false;
     while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -40,10 +47,7 @@ int main(int argc, char *argv[])
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
         exit(-1);
     }
-    if(logicalmode == true) {
-        fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], word, word, word2bit(word));
-    } else {
-        fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], (short)word, word, word2bit(word));
-    }
+    fprintf(stdout, "%6s: ", argv[optind]);
+    print_dumpword(word, logicalmode);
     return 0;
 }