X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcomet2.c;h=8d07715ae386f350828d5b52b0cdf713936798d6;hp=f417de4b13ef727883affe1675b8f0e97854520d;hb=60d4c2573a30a48520545195b9ef89814fc60708;hpb=b2ffb8eaafe3d8de6e9d6674d45ff97ef2874019

diff --git a/src/comet2.c b/src/comet2.c
index f417de4..8d07715 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -1,9 +1,15 @@
-#include "casl2.h"
-#include "exec.h"
+#include <stdio.h>
+#include <stdlib.h>
 #define _GNU_SOURCE
 #include <getopt.h>
 
-/* comet2コマンドのオプション */
+#include "exec.h"
+#include "cmem.h"
+#include "cerr.h"
+
+/**
+ * comet2コマンドのオプション
+ */
 static struct option longopts[] = {
     {"trace", no_argument, NULL, 't'},
     {"tracearithmetic", no_argument, NULL, 't'},
@@ -12,44 +18,23 @@ static struct option longopts[] = {
     {"memorysize", required_argument, NULL, 'M'},
     {"clocks", required_argument, NULL, 'C'},
     {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0}
+    {0, 0, 0, 0},
 };
 
-/* comet2のエラー定義 */
-CERRARRAY cerr_comet2[] = {
-    { 201, "Load object file - full of COMET II memory" },
-    { 208, "object file is not specified" },
-};
-bool addcerrlist_comet2()
-{
-    return addcerrlist(ARRAYSIZE(cerr_comet2), cerr_comet2);
-}
-
-/* 指定されたファイルからアセンブル結果を読込 */
-bool loadassemble(char *file) {
-    FILE *fp;
-    bool status = true;
-
-    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);
-        status = false;
-    }
-    fclose(fp);
-    return status;
-}
-
-/* comet2コマンド */
+/**
+ * comet2コマンドのメイン
+ */
 int main(int argc, char *argv[])
 {
-    int opt;
+    int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
+    int opt, stat = 0;
     const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
-    addcerrlist_comet2();
+    cerr_init();
+    addcerrlist_load();
+    addcerrlist_exec();
+
+    /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
@@ -77,22 +62,20 @@ int main(int argc, char *argv[])
         }
     }
     if(argv[optind] == NULL) {
-        setcerr(208, NULL);    /* object file is not specified */
-        fprintf(stderr, "comet2 error - %d: %s\n", cerrno, cerrmsg);
-        goto comet2err;
+        setcerr(211, NULL);    /* object file not specified */
+        fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
+        exit(-1);
     }
-    reset();
-    startptr = 0;
+    /* COMET II仮想マシンのリセット */
+    reset(memsize, clocks);
+    execptr->start = 0;
     if(loadassemble(argv[optind]) == true) {
-        exec();    /* プログラム実行 */
+        exec();                /* プログラム実行 */
     }
     /* COMET II仮想マシンのシャットダウン */
     shutdown();
-    if(cerrno > 0) {
-        goto comet2err;
-    }
-    return 0;
-comet2err:
+    stat = (cerr->num == 0) ? 0 : -1;
+    /* エラーの解放 */
     freecerr();
-    exit(-1);
+    return stat;
 }