projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
最新版Autotest.mkを反映
[YACASL2.git]
/
src
/
comet2.c
diff --git
a/src/comet2.c
b/src/comet2.c
index
8d07715
..
42ba4ba
100644
(file)
--- a/
src/comet2.c
+++ b/
src/comet2.c
@@
-6,6
+6,7
@@
#include "exec.h"
#include "cmem.h"
#include "cerr.h"
#include "exec.h"
#include "cmem.h"
#include "cerr.h"
+#include "package.h"
/**
* comet2コマンドのオプション
/**
* comet2コマンドのオプション
@@
-17,25
+18,32
@@
static struct option longopts[] = {
{"dump", no_argument, NULL, 'd'},
{"memorysize", required_argument, NULL, 'M'},
{"clocks", required_argument, NULL, 'C'},
{"dump", no_argument, NULL, 'd'},
{"memorysize", required_argument, NULL, 'M'},
{"clocks", required_argument, NULL, 'C'},
+ { "version", no_argument, NULL, 'v' },
{"help", no_argument, NULL, 'h'},
{0, 0, 0, 0},
};
/**
{"help", no_argument, NULL, 'h'},
{0, 0, 0, 0},
};
/**
- * comet2コマンドのメイン
+ * @brief comet2コマンドのメイン
+ *
+ * @return 正常終了時は0、異常終了時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *argv[] コマンドライン引数の配列
*/
int main(int argc, char *argv[])
{
int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
int opt, stat = 0;
*/
int main(int argc, char *argv[])
{
int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
int opt, stat = 0;
- const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
+ const char *version = PACKAGE_VERSION, *cmdversion = "comet2 of YACASL2 version %s\n";
+ const char *usage = "Usage: %s [-tTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
cerr_init();
addcerrlist_load();
addcerrlist_exec();
/* オプションの処理 */
cerr_init();
addcerrlist_load();
addcerrlist_exec();
/* オプションの処理 */
- while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
+ while((opt = getopt_long(argc, argv, "tTdM:C:
v
h", longopts, NULL)) != -1) {
switch(opt) {
case 't':
execmode.trace = true;
switch(opt) {
case 't':
execmode.trace = true;
@@
-53,18
+61,21
@@
int main(int argc, char *argv[])
case 'C':
clocks = atoi(optarg);
break;
case 'C':
clocks = atoi(optarg);
break;
+ case 'v':
+ fprintf(stdout, cmdversion, version);
+ return 0;
case 'h':
fprintf(stdout, usage, argv[0]);
return 0;
case '?':
fprintf(stderr, usage, argv[0]);
case 'h':
fprintf(stdout, usage, argv[0]);
return 0;
case '?':
fprintf(stderr, usage, argv[0]);
- exit(
-
1);
+ exit(1);
}
}
if(argv[optind] == NULL) {
}
}
if(argv[optind] == NULL) {
- setcerr(211,
NULL
); /* object file not specified */
+ setcerr(211,
""
); /* object file not specified */
fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
- exit(
-
1);
+ exit(1);
}
/* COMET II仮想マシンのリセット */
reset(memsize, clocks);
}
/* COMET II仮想マシンのリセット */
reset(memsize, clocks);
@@
-74,7
+85,7
@@
int main(int argc, char *argv[])
}
/* COMET II仮想マシンのシャットダウン */
shutdown();
}
/* COMET II仮想マシンのシャットダウン */
shutdown();
- stat = (cerr->num == 0) ? 0 :
-
1;
+ stat = (cerr->num == 0) ? 0 : 1;
/* エラーの解放 */
freecerr();
return stat;
/* エラーの解放 */
freecerr();
return stat;