casl2、comet2コマンドのエラーや使い方表示を変更

[YACASL2.git] / src / comet2.c

diff --git a/src/comet2.c b/src/comet2.c
index 24040b3..bb07c5f 100644 (file)
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -3,46 +3,64 @@
 #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;
-}
-
+/* 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}
 };
 
+/* 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コマンド */
 int main(int argc, char *argv[])
 {
     int opt;
-    const char *usage = "Usage: %s [-tTdh] [-M<memsize>] [-C<clocks>] FILE\n";
+    const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
+    addcerrlist_comet2();
     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 +70,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) {
+    if(argv[optind] == NULL) {
+        setcerr(208, NULL);    /* object file is not specified */
+        fprintf(stderr, "comet2 error - %d: %s\n", cerrno, cerrmsg);
+        goto comet2err;
+    }
+    reset();
+    startptr = 0;
+    if(loadassemble(argv[optind]) == true) {
         exec();    /* プログラム実行 */
     }
     if(cerrno > 0) {
-        freecerr();
-        exit(-1);
+        goto comet2err;
     }
     return 0;
+comet2err:
+    freecerr();
+    exit(-1);
 }