X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcomet2.c;h=55bab759af035537dc9018c2d0fc701b51cd7f0b;hp=1adf4266580c3ad8b36ac8a15a063e2f542315df;hb=2f0b91ab1a54973a084e1609b46a1432c8b8e334;hpb=bbc3d71fec11bbd5654a04719436135035835ba3

diff --git a/src/comet2.c b/src/comet2.c
index 1adf426..55bab75 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -1,64 +1,52 @@
-#include "casl2.h"
+#include "package.h"
 #include "exec.h"
-#define _GNU_SOURCE
-#include <getopt.h>
 
-/* comet2コマンドのオプション */
+/**
+ * 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'},
+    {"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'},
-    {0, 0, 0, 0}
+    {0, 0, 0, 0},
 };
 
-/* 実行モード: trace, logical, dump */
-EXECMODE execmode = {false, false, false};
-
-/* エラー番号とエラーメッセージ */
-CERRARRAY cerr[] = {
-    { 201, "execute - out of COMET II memory" },
-    { 202, "SVC input - out of Input memory" },
-    { 203, "SVC output - out of COMET II memory" },
-    { 204, "Program Register (PR) - out of COMET II memory" },
-    { 205, "Stack Pointer (SP) - cannot allocate stack buffer" },
-    { 206, "Address - out of COMET II memory" },
-    { 207, "Stack Pointer (SP) - out of COMET II memory" },
-    { 0, NULL },
-};
-
-/* 指定されたファイルからアセンブル結果を読込 */
-bool loadassemble(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コマンド */
+/**
+ * @brief comet2コマンドのメイン
+ *
+ * @return 正常終了時は0、異常終了時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *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 [-tTdmvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
-    while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
+    /* オプションの処理 */
+    while((opt = getopt_long(argc, argv, "tTdmM:C:vh", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
-            (&execmode)->trace = true;
+            execmode.trace = true;
             break;
         case 'T':
-            (&execmode)->trace = true;
-            (&execmode)->logical = true;
+            execmode.trace = true;
+            execmode.logical = true;
             break;
         case 'd':
-            (&execmode)->dump = true;
+            execmode.dump = true;
+            break;
+        case 'm':
+            execmode.monitor = true;
             break;
         case 'M':
             memsize = atoi(optarg);
@@ -66,21 +54,35 @@ int main(int argc, char *argv[])
         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]);
-            exit(-1);
+            exit(1);
         }
     }
-    reset();
-    if(loadassemble(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);
+        goto fin;
     }
-    if(cerrno > 0) {
-        freecerr();
-        exit(-1);
+    reset(memsize, clocks);     /* COMET II仮想マシンのリセット */
+    execptr->start = 0;
+    if((execptr->end = loadassemble(argv[optind], execptr->start)) > 0 && cerr->num == 0) {
+        exec();                 /* プログラム実行 */
     }
-    return 0;
+    shutdown();                 /* COMET II仮想マシンのシャットダウン */
+fin:
+    stat = (cerr->num == 0) ? 0 : 1;
+    freecerr();                 /* エラーの解放 */
+    return stat;
 }