X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcomet2.c;h=bb07c5f0946bbc13a15e32421ebea31ae4a2f955;hp=1c47d193d1305cf1df2f83038f273d78a539dd1a;hb=22dc7e0f6bc6f0a7ebe6c0b998db13d7e6c7cbbc;hpb=712486afe58b10ef37c5fa915de889ab8d1dd6cd

diff --git a/src/comet2.c b/src/comet2.c
index 1c47d19..bb07c5f 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -3,6 +3,7 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 
+/* comet2コマンドのオプション */
 static struct option longopts[] = {
     {"trace", no_argument, NULL, 't'},
     {"tracearithmetic", no_argument, NULL, 't'},
@@ -14,37 +15,52 @@ static struct option longopts[] = {
     {0, 0, 0, 0}
 };
 
-EXECMODE execmode = {false, false, false};
+/* 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);
+}
 
-/* 指定されたファイルからCOMET II仮想メモリ（アセンブル結果）を読込 */
-bool inassemble(char *file) {
+/* 指定されたファイルからアセンブル結果を読込 */
+bool loadassemble(char *file) {
     FILE *fp;
-    reset();
+    bool status = true;
+
     if((fp = fopen(file, "r")) == NULL) {
         perror(file);
         return false;
     }
-    fread(memory, sizeof(WORD), memsize, fp);
+    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 true;
+    return status;
 }
 
+/* comet2コマンド */
 int main(int argc, char *argv[])
 {
     int opt;
-    const char *usage = "Usage: %s [-tTdh] [-M <memorysize>] [-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':
-            (&execmode)->tracemode = true;
+            execmode.trace = true;
             break;
         case 'T':
-            (&execmode)->tracemode = true;
-            (&execmode)->logicalmode = true;
+            execmode.trace = true;
+            execmode.logical = true;
             break;
         case 'd':
-            (&execmode)->dumpmode = true;
+            execmode.dump = true;
             break;
         case 'M':
             memsize = atoi(optarg);
@@ -60,12 +76,21 @@ int main(int argc, char *argv[])
             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);
 }