projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefileの修正
[YACASL2.git]
/
src
/
comet2.c
diff --git
a/src/comet2.c
b/src/comet2.c
index
be09f10
..
42ba4ba
100644
(file)
--- a/
src/comet2.c
+++ b/
src/comet2.c
@@
-1,9
+1,16
@@
-#include
"casl2.h"
-#include
"exec.h"
+#include
<stdio.h>
+#include
<stdlib.h>
#define _GNU_SOURCE
#include <getopt.h>
#define _GNU_SOURCE
#include <getopt.h>
-/* comet2コマンドのオプション */
+#include "exec.h"
+#include "cmem.h"
+#include "cerr.h"
+#include "package.h"
+
+/**
+ * comet2コマンドのオプション
+ */
static struct option longopts[] = {
{"trace", no_argument, NULL, 't'},
{"tracearithmetic", no_argument, NULL, 't'},
static struct option longopts[] = {
{"trace", no_argument, NULL, 't'},
{"tracearithmetic", no_argument, NULL, 't'},
@@
-11,44
+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'},
{"help", no_argument, NULL, 'h'},
- {0, 0, 0, 0}
-};
-
-/* comet2のエラー定義 */
-CERRARRAY cerr_comet2[] = {
- { 201, "Load object file - full of COMET II memory" },
+ {0, 0, 0, 0},
};
};
-bool addcerrlist_comet2()
-{
- return addcerrlist(ARRAYSIZE(cerr_comet2), cerr_comet2);
-}
-
-/* 指定されたファイルからアセンブル結果を読込 */
-bool loadassemble(char *file) {
- FILE *fp;
- if((fp = fopen(file, "r")) == NULL) {
- perror(file);
- return false;
- }
- if((endptr = startptr + fread(memory, sizeof(WORD), memsize-startptr, fp)) == memsize) {
- setcerr(201, NULL); /* Load object file - full of COMET II memory */
- fprintf(stderr, "Execute error - %d: %s\n", cerrno, cerrmsg);
- return false;
- }
- fclose(fp);
- return true;
-}
-
-/* comet2コマンド */
+/**
+ * @brief comet2コマンドのメイン
+ *
+ * @return 正常終了時は0、異常終了時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *argv[] コマンドライン引数の配列
+ */
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- int opt;
- const char *usage = "Usage: %s [-tTdh] [-M <memorysize>] [-C <clocks>] FILE\n";
+ int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
+ int opt, stat = 0;
+ const char *version = PACKAGE_VERSION, *cmdversion = "comet2 of YACASL2 version %s\n";
+ const char *usage = "Usage: %s [-tTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
- addcerrlist_comet2();
- while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
+ cerr_init();
+ addcerrlist_load();
+ addcerrlist_exec();
+
+ /* オプションの処理 */
+ while((opt = getopt_long(argc, argv, "tTdM:C:vh", longopts, NULL)) != -1) {
switch(opt) {
case 't':
execmode.trace = true;
switch(opt) {
case 't':
execmode.trace = true;
@@
-66,22
+61,32
@@
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);
}
}
}
}
- reset();
- startptr = 0;
- if(loadassemble(argv[optind]) == true) {
- ex
ec(); /* プログラム実行 */
+ if(argv[optind] == NULL) {
+ setcerr(211, ""); /* object file not specified */
+ fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
+ ex
it(1);
}
}
- if(cerrno > 0) {
- freecerr();
- exit(-1);
+ /* COMET II仮想マシンのリセット */
+ reset(memsize, clocks);
+ execptr->start = 0;
+ if(loadassemble(argv[optind]) == true) {
+ exec(); /* プログラム実行 */
}
}
- return 0;
+ /* COMET II仮想マシンのシャットダウン */
+ shutdown();
+ stat = (cerr->num == 0) ? 0 : 1;
+ /* エラーの解放 */
+ freecerr();
+ return stat;
}
}