projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
COMET IIモニターに、コマンドQUITとREVERSEを追加
[YACASL2.git]
/
src
/
comet2.c
diff --git
a/src/comet2.c
b/src/comet2.c
index
0312035
..
f499022
100644
(file)
--- a/
src/comet2.c
+++ b/
src/comet2.c
@@
-1,60
+1,92
@@
-#include "
casl2
.h"
+#include "
package
.h"
#include "exec.h"
#include "exec.h"
-#define _GNU_SOURCE
-#include <getopt.h>
-
-/* 指定されたファイルからCOMET II仮想メモリ(アセンブル結果)を読込 */
-bool inassemble(char *file) {
- FILE *fp;
- if((fp = fopen(file, "r")) == NULL) {
- perror(file);
- return false;
- }
- fread(memory, sizeof(WORD), MEMSIZE, fp);
- fclose(fp);
- return true;
-}
+/**
+ * comet2コマンドのオプション
+ */
static struct option longopts[] = {
{"trace", no_argument, NULL, 't'},
{"tracearithmetic", no_argument, NULL, 't'},
{"tracelogical", no_argument, NULL, 'T'},
{"dump", no_argument, NULL, 'd'},
static struct option longopts[] = {
{"trace", no_argument, NULL, 't'},
{"tracearithmetic", no_argument, NULL, 't'},
{"tracelogical", no_argument, NULL, 'T'},
{"dump", no_argument, NULL, 'd'},
+ {"debug", no_argument, NULL, 'b'},
+ {"monitor", no_argument, NULL, 'm'},
+ {"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}
+ {0, 0, 0, 0}
,
};
};
+/**
+ * @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] 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 [-tTdmvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
- while((opt = getopt_long(argc, argv, "tTdh", longopts, NULL)) != -1) {
+ /* オプションの処理 */
+ while((opt = getopt_long(argc, argv, "tTdmM:C:vh", longopts, NULL)) != -1) {
switch(opt) {
case 't':
switch(opt) {
case 't':
-
tracemod
e = true;
+
execmode.trac
e = true;
break;
case 'T':
break;
case 'T':
-
tracemod
e = true;
-
logicalmode
= true;
+
execmode.trac
e = true;
+
execmode.logical
= true;
break;
case 'd':
break;
case 'd':
- dumpmode = true;
+ execmode.dump = true;
+ break;
+ case 'm':
+ execmode.step = true;
break;
break;
+ case 'M':
+ memsize = atoi(optarg);
+ break;
+ case 'C':
+ clocks = atoi(optarg);
+ break;
+ case 'v':
+ fprintf(stdout, cmdversion, version);
+ return 0;
case 'h':
fprintf(stdout, usage, argv[0]);
case 'h':
fprintf(stdout, usage, argv[0]);
-
exit(-1)
;
+
return 0
;
case '?':
fprintf(stderr, usage, argv[0]);
case '?':
fprintf(stderr, usage, argv[0]);
- exit(
-
1);
+ exit(1);
}
}
}
}
- if(inassemble(argv[optind]) == true) {
- exec(); /* プログラム実行 */
+ /* エラーの定義 */
+ cerr_init();
+ addcerrlist_load();
+ addcerrlist_exec();
+
+ if(argv[optind] == NULL) {
+ setcerr(211, ""); /* object file not specified */
+ fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
+ freecerr(); /* エラーの解放 */
+ exit(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;
}
}