X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcomet2.c;h=f6d9fb1c58791671e15ec9bc2fa666c935fa0a8d;hp=24040b3c1aff2d76fc69f7aef8f5e5ea66c03d8a;hb=f9ad3a081e1777bb6d892af65d0e4090cb31bbfa;hpb=ecd73ba08f9b8721742ae5dbb72e1c4261574b36

diff --git a/src/comet2.c b/src/comet2.c
index 24040b3..f6d9fb1 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -1,48 +1,51 @@
-#include "casl2.h"
-#include "exec.h"
+#include <stdio.h>
+#include <stdlib.h>
 #define _GNU_SOURCE
 #include <getopt.h>
 
-/* 指定されたファイルからCOMET II仮想メモリ（アセンブル結果）を読込 */
-bool inassemble(char *file) {
-    FILE *fp;
-    reset();
-    if((fp = fopen(file, "r")) == NULL) {
-        perror(file);
-        return false;
-    }
-    fread(memory, sizeof(WORD), memsize, fp);
-    fclose(fp);
-    return true;
-}
+#include "exec.h"
+#include "cmem.h"
+#include "cerr.h"
 
+/**
+ * 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'},
-    {"memsize", required_argument, NULL, 'M'},
+    {"memorysize", required_argument, NULL, 'M'},
     {"clocks", required_argument, NULL, 'C'},
     {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0}
+    {0, 0, 0, 0},
 };
 
+/**
+ * comet2コマンドのメイン
+ */
 int main(int argc, char *argv[])
 {
-    int opt;
-    const char *usage = "Usage: %s [-tTdh] [-M<memsize>] [-C<clocks>] FILE\n";
+    int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
+    int opt, status = 0;
+    const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
+    cerr_init();
+    addcerrlist_load();
+    addcerrlist_exec();
+
+    /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
-            tracemode = true;
+            execmode.trace = true;
             break;
         case 'T':
-            tracemode = true;
-            logicalmode = true;
+            execmode.trace = true;
+            execmode.logical = true;
             break;
         case 'd':
-            dumpmode = true;
+            execmode.dump = true;
             break;
         case 'M':
             memsize = atoi(optarg);
@@ -52,18 +55,27 @@ int main(int argc, char *argv[])
             break;
         case 'h':
             fprintf(stdout, usage, argv[0]);
-            exit(-1);
+            return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
             exit(-1);
         }
     }
-    if(inassemble(argv[optind]) == true) {
-        exec();    /* プログラム実行 */
-    }
-    if(cerrno > 0) {
-        freecerr();
+    if(argv[optind] == NULL) {
+        setcerr(211, NULL);    /* object file not specified */
+        fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
         exit(-1);
     }
-    return 0;
+    /* COMET II仮想マシンのリセット */
+    reset(memsize, clocks);
+    execptr->start = 0;
+    if(loadassemble(argv[optind]) == true) {
+        exec();                /* プログラム実行 */
+    }
+    /* COMET II仮想マシンのシャットダウン */
+    shutdown();
+    status = (cerr->num == 0) ? 0 : -1;
+    /* エラーの解放 */
+    freecerr();
+    return status;
 }