{"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' },
+ {"version", no_argument, NULL, 'v' },
{"help", no_argument, NULL, 'h'},
{0, 0, 0, 0},
};
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 [-btTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
+ const char *usage = "Usage: %s [-tTdmvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
/* オプションの処理 */
- while((opt = getopt_long(argc, argv, "tTdM:C:vh", longopts, NULL)) != -1) {
+ while((opt = getopt_long(argc, argv, "tTdmM:C:vh", longopts, NULL)) != -1) {
switch(opt) {
case 't':
execmode.trace = true;
case 'd':
execmode.dump = true;
break;
- case 'b':
- execmode.debugger = true;
+ case 'm':
+ execmode.monitor = true;
break;
case 'M':
memsize = atoi(optarg);
if(argv[optind] == NULL) {
setcerr(211, ""); /* object file not specified */
fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
- freecerr(); /* エラーの解放 */
- exit(1);
+ goto fin;
}
-
- /* COMET II仮想マシンのリセット */
- reset(memsize, clocks);
+ reset(memsize, clocks); /* COMET II仮想マシンのリセット */
execptr->start = 0;
- if(loadassemble(argv[optind]) == true) {
- exec(); /* プログラム実行 */
+ if((execptr->end = loadassemble(argv[optind], execptr->start)) > 0 && cerr->num == 0) {
+ exec(); /* プログラム実行 */
}
- /* COMET II仮想マシンのシャットダウン */
- shutdown();
+ shutdown(); /* COMET II仮想マシンのシャットダウン */
+fin:
stat = (cerr->num == 0) ? 0 : 1;
freecerr(); /* エラーの解放 */
return stat;