projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comet2コマンドに、エラーテストを追加
[YACASL2.git]
/
src
/
dumpword.c
diff --git
a/src/dumpword.c
b/src/dumpword.c
index
081ee44
..
a3c6a36
100644
(file)
--- a/
src/dumpword.c
+++ b/
src/dumpword.c
@@
-6,17
+6,23
@@
static struct option longopts[] = {
{"arithmetic", no_argument, NULL, 'a'},
{"logical", no_argument, NULL, 'l'},
{"help", no_argument, NULL, 'h'},
{"arithmetic", no_argument, NULL, 'a'},
{"logical", no_argument, NULL, 'l'},
{"help", no_argument, NULL, 'h'},
- {0, 0, 0, 0}
+ {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[])
{
};
int main(int argc, char *argv[])
{
+ bool logicalmode = false; /* レジストリの内容を論理値(0〜65535)で表示する場合はtrue */
int opt;
int opt;
- WORD w;
- char *check;
+ WORD word;
const char *usage = "Usage: %s [-alh] WORD\n";
const char *usage = "Usage: %s [-alh] WORD\n";
- logicalmode = false;
while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
switch(opt) {
case 'l':
while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
switch(opt) {
case 'l':
@@
-24,7
+30,7
@@
int main(int argc, char *argv[])
break;
case 'h':
fprintf(stdout, usage, argv[0]);
break;
case 'h':
fprintf(stdout, usage, argv[0]);
-
exit(-1)
;
+
return 0
;
case '?':
fprintf(stderr, usage, argv[0]);
exit(-1);
case '?':
fprintf(stderr, usage, argv[0]);
exit(-1);
@@
-35,22
+41,13
@@
int main(int argc, char *argv[])
fprintf(stderr, usage, argv[0]);
exit(-1);
}
fprintf(stderr, usage, argv[0]);
exit(-1);
}
- if(*argv[optind] == '-' || strlen(argv[optind]) > 4) {
- setcerr(116, argv[optind]); /* out of hex range */
- }
/* WORD値に変換 */
/* WORD値に変換 */
- w = (WORD)strtol(argv[optind], &check, 16);
- if(*check != '\0') {
- setcerr(115, argv[optind]); /* not hex */
- }
+ word = nh2word(argv[optind]);
if(cerrno > 0) {
fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
exit(-1);
}
if(cerrno > 0) {
fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
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;
}
return 0;
}