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

diff --git a/src/comet2.c b/src/comet2.c
index c6cf486..e2a9e3c 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -3,19 +3,7 @@
 #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'},
@@ -27,6 +15,35 @@ static struct option longopts[] = {
     {0, 0, 0, 0}
 };
 
+/* エラー番号とエラーメッセージ */
+CERRARRAY cerr[] = {
+    { 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" },
+    { 205, "Stack Pointer (SP) - cannot allocate stack buffer" },
+    { 206, "Address - out of COMET II memory" },
+    { 207, "Stack Pointer (SP) - out of COMET II memory" },
+    { 0, NULL },
+};
+
+/* 指定されたファイルからアセンブル結果を読込 */
+bool loadassemble(char *file) {
+    FILE *fp;
+    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);
+        return false;
+    }
+    fclose(fp);
+    return true;
+}
+
+/* comet2コマンド */
 int main(int argc, char *argv[])
 {
     int opt;
@@ -35,14 +52,14 @@ int main(int argc, char *argv[])
     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);
@@ -58,7 +75,9 @@ int main(int argc, char *argv[])
             exit(-1);
         }
     }
-    if(inassemble(argv[optind]) == true) {
+    reset();
+    startptr = 0;
+    if(loadassemble(argv[optind]) == true) {
         exec();    /* プログラム実行 */
     }
     if(cerrno > 0) {