X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fdumpword.c;h=0bc9a472c93344720e5833628cf37db3be2f7896;hp=081ee441773cf8c667b73a2f26d5bae4b20b85e1;hb=7f7bde5dd1305cfc598fe09030c69aad0dc01368;hpb=fb54b1c9d2fbc3d4a62c6b4d38ff68e9d3b25c26

diff --git a/src/dumpword.c b/src/dumpword.c
index 081ee44..0bc9a47 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,22 +1,31 @@
-#include "casl2.h"
 #define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
+#include "word.h"
+#include "cerr.h"
 
+/**
+ * dumpwordコマンドのオプション
+ */
 static struct option longopts[] = {
-    {"arithmetic", no_argument, NULL, 'a'},
-    {"logical", no_argument, NULL, 'l'},
-    {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0}
+    { "arithmetic", no_argument, NULL, 'a' },
+    { "logical", no_argument, NULL, 'l' },
+    { "help", no_argument, NULL, 'h' },
+    { 0, 0, 0, 0 },
 };
 
+/**
+ * dumpwordコマンドのメイン
+ */
 int main(int argc, char *argv[])
 {
+    bool logicalmode = false;    /* レジストリの内容を論理値（0から65535）で表示する場合はtrue */
     int opt;
-    WORD w;
-    char *check;
+    WORD word;
     const char *usage = "Usage: %s [-alh] WORD\n";
 
-    logicalmode = false;
+    cerr_init();
     while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -24,7 +33,7 @@ int main(int argc, char *argv[])
             break;
         case 'h':
             fprintf(stdout, usage, argv[0]);
-            exit(-1);
+            return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
             exit(-1);
@@ -35,22 +44,13 @@ int main(int argc, char *argv[])
         fprintf(stderr, usage, argv[0]);
         exit(-1);
     }
-    if(*argv[optind] == '-' || strlen(argv[optind]) > 4) {
-        setcerr(116, argv[optind]);    /* out of hex range */
-    }
     /* WORD値に変換 */
-    w = (WORD)strtol(argv[optind], &check, 16);
-    if(*check != '\0') {
-        setcerr(115, argv[optind]);    /* not hex */
-    }
-    if(cerrno > 0) {
-        fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
+    word = nh2word(argv[optind]);
+    if(cerr->num > 0) {
+        fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
         exit(-1);
     }
-    if(logicalmode == true) {
-        fprintf(stdout, "%4s: %6d = #%04X = %s\n", argv[optind], w, w, word2bit(w));
-    } else {
-        fprintf(stdout, "%4s: %6d = #%04X = %s\n", argv[optind], (short)w, w, word2bit(w));
-    }
+    fprintf(stdout, "%6s: ", argv[optind]);
+    print_dumpword(word, logicalmode);
     return 0;
 }