X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcomet2.c;h=e2a9e3c6ccd23023546536d1197ef24f3802cb0d;hb=e0de529cf2de73a298288fd294b24b964abdba34;hp=7fa8d2987ba463152946006eff5427a8b03e3f87;hpb=ed3225328d7bc0d718fc97dd0b05692b7287667b;p=YACASL2.git

diff --git a/src/comet2.c b/src/comet2.c
index 7fa8d29..e2a9e3c 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -15,12 +15,9 @@ static struct option longopts[] = {
     {0, 0, 0, 0}
 };
 
-/* 実行モード: trace, logical, dump */
-EXECMODE execmode = {false, false, false};
-
 /* エラー番号とエラーメッセージ */
 CERRARRAY cerr[] = {
-    { 201, "execute - out of COMET II memory" },
+    { 201, "Load object file - full 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" },
@@ -33,12 +30,15 @@ CERRARRAY cerr[] = {
 /* 指定されたファイルからアセンブル結果を読込 */
 bool loadassemble(char *file) {
     FILE *fp;
-    reset();
     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);
+        return false;
+    }
     fclose(fp);
     return true;
 }
@@ -75,6 +75,8 @@ int main(int argc, char *argv[])
             exit(-1);
         }
     }
+    reset();
+    startptr = 0;
     if(loadassemble(argv[optind]) == true) {
         exec();    /* プログラム実行 */
     }