X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fexec.c;h=1bc891ee6196fcc8e4782cc2534dc58346ba8b33;hp=5a757c76fe1072dca5b58015568ca8a84c35bba6;hb=60d4c2573a30a48520545195b9ef89814fc60708;hpb=85a32cf5cc8e39dc5d4f085179559de71ad87cb8

diff --git a/src/exec.c b/src/exec.c
index 5a757c7..1bc891e 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -9,23 +9,23 @@
  * 実行エラーの定義
  */
 static CERR cerr_exec[] = {
-    { 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" },
-    { 209, "not GR in x/r2" },
-    { 210, "not command code of COMET II" },
-    { 211, "not GR in r/r1" },
+    { 201, "Program Register (PR) - memory overflow" },
+    { 202, "Stack Pointer (SP) - stack overflow" },
+    { 203, "Stack Pointer (SP) - stack underflow" },
+    { 204, "OP in word #1 - not command code" },
+    { 205, "r/r1 in word #1 - not GR" },
+    { 206, "x/r2 in word #1 - not GR" },
+    { 207, "address in word #2 - out of memory" },
+    { 208, "SVC input - memory overflow" },
+    { 209, "SVC output - memory overflow" },
 };
 
 /**
  * アセンブル結果読み込みエラーの定義
  */
 static CERR cerr_load[] = {
-    { 201, "Loading - full of COMET II memory" },
-    { 208, "object file is not specified" },
+    { 210, "load - memory overflow" },
+    { 211, "object file not specified" },
 };
 
 /**
@@ -51,10 +51,10 @@ void addcerrlist_exec()
 /**
  * 指定されたファイルからアセンブル結果を読み込む
  */
-bool loadassemble(char *file)
+bool loadassemble(const char *file)
 {
     FILE *fp;
-    bool status = true;
+    bool stat = true;
 
     assert(file != NULL);
     if((fp = fopen(file, "r")) == NULL) {
@@ -64,18 +64,18 @@ bool loadassemble(char *file)
     execptr->end = execptr->start +
         fread(sys->memory, sizeof(WORD), sys->memsize - execptr->start, fp);
     if(execptr->end == sys->memsize) {
-        setcerr(201, file);    /* Loading - full of COMET II memory */
+        setcerr(210, file);    /* load - memory overflow */
         fprintf(stderr, "Load error - %d: %s\n", cerr->num, cerr->msg);
-        status = false;
+        stat = false;
     }
     fclose(fp);
-    return status;
+    return stat;
 }
 
 /**
  * プログラムレジスタ（PR）を表す文字列を返す
  **/
-static char *pr2str(WORD pr) {
+char *pr2str(WORD pr) {
     char *str = malloc_chk(CERRSTRSIZE + 1, "pr2str.pr");
 
     sprintf(str, "PR:#%04X", pr);
@@ -85,7 +85,7 @@ static char *pr2str(WORD pr) {
 /**
  * 標準入力から文字データを読込（SVC 1）
  */
-static void svcin()
+void svcin()
 {
     int i;
     char *buffer = malloc_chk(INSIZE + 1, "svcin.buffer");
@@ -99,8 +99,8 @@ static void svcin()
             --i;
             break;
         }
-        if(sys->cpu->gr[1] + i >= sys->memsize - 1) {
-            setcerr(202, NULL);    /* SVC input - out of Input memory */
+        if(sys->cpu->gr[1] + i > execptr->end) {
+            setcerr(208, NULL);    /* SVC input - memory overflow */
             break;
         }
         sys->memory[sys->cpu->gr[1]+i] = *(buffer + i);
@@ -112,14 +112,14 @@ static void svcin()
 /**
  * 標準出力へ文字データを書出（SVC 2）
  */
-static void svcout()
+void svcout()
 {
     int i;
     WORD w;
 
     for(i = 0; i < sys->memory[sys->cpu->gr[2]]; i++) {
-        if(sys->cpu->gr[1] + i >= sys->memsize - 1) {
-            setcerr(203, NULL);    /* SVC output - out of Comet II memory */
+        if(sys->cpu->gr[1] + i > execptr->end) {
+            setcerr(209, NULL);    /* SVC output - memory overflow */
             return;
         }
         /* 「文字の組」の符号表に記載された文字と、改行（CR）／タブを表示 */
@@ -135,7 +135,7 @@ static void svcout()
 /**
  * ロード／論理積／論理和／排他的論理和のフラグ設定。OFは常に0
  */
-static void setfr(const WORD adr)
+void setfr(WORD adr)
 {
     sys->cpu->fr = 0x0;
     /* 第15ビットが1のとき、SFは1 */
@@ -148,14 +148,27 @@ static void setfr(const WORD adr)
     }
 }
 
+/**
+ * WORD値からr/r1を取得
+ */
+WORD get_r_r1(WORD oprx)
+{
+    WORD r;
+    if((r = ((oprx & 0x00F0) >>4)) > GRSIZE - 1) {
+        setcerr(205, pr2str(sys->cpu->pr));    /* r/r1 in word #1 - not GR */
+        return 0x0;
+    }
+    return r;
+}
+
 /**
  * WORD値からx/r2を取得
  */
-static WORD x_r2(const WORD oprx)
+WORD get_x_r2(WORD oprx)
 {
     WORD x;
     if((x = (oprx & 0x000F)) > GRSIZE - 1) {
-        setcerr(209, pr2str(sys->cpu->pr));    /* not GR in x/r2 */
+        setcerr(206, pr2str(sys->cpu->pr));    /* r/r1 in word #1 - not GR */
         return 0x0;
     }
     return x;
@@ -164,10 +177,10 @@ static WORD x_r2(const WORD oprx)
 /**
  * 2つのWORD値からadr[,x]を取得
  */
-static WORD adrx(const WORD adr, const WORD oprx)
+WORD get_adr_x(WORD adr, WORD oprx)
 {
     WORD a = adr, x;
-    if((x = x_r2(oprx)) > 0) {
+    if((x = get_x_r2(oprx)) > 0) {
         a += sys->cpu->gr[x];
     }
     return a;
@@ -177,29 +190,16 @@ static WORD adrx(const WORD adr, const WORD oprx)
 /**
  * 2つのWORD値からadr[,x]のアドレスに格納されている内容を取得
  */
-static WORD val_adrx(const WORD adr, const WORD oprx)
+WORD get_val_adr_x(WORD adr, WORD oprx)
 {
     WORD a;
-    if((a = adrx(adr, oprx)) >= sys->memsize) {
-        setcerr(206, pr2str(sys->cpu->pr + 1));    /* Address - out of COMET II memory */
+    if((a = get_adr_x(adr, oprx)) >= sys->memsize) {
+        setcerr(207, pr2str(sys->cpu->pr + 1));    /* address in word #2 - out of memory */
         return 0x0;
     }
     return sys->memory[a];
 }
 
-/**
- * WORD値からr/r2を取得
- */
-static WORD r_r1(const WORD oprx)
-{
-    WORD r;
-    if((r = ((oprx & 0x00F0) >>4)) > GRSIZE - 1) {
-        setcerr(211, pr2str(sys->cpu->pr));    /* not GR in r/r1 */
-        return 0x0;
-    }
-    return r;
-}
-
 /**
  * NOP命令。語長1（OPのみ）
  */
@@ -216,7 +216,7 @@ void ld_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    setfr(sys->cpu->gr[r_r1(w[0])] = val_adrx(w[1], w[0]));
+    setfr(sys->cpu->gr[get_r_r1(w[0])] = get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -227,7 +227,7 @@ void ld_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    setfr(sys->cpu->gr[r_r1(w[0])] = sys->cpu->gr[x_r2(w[0])]);
+    setfr(sys->cpu->gr[get_r_r1(w[0])] = sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -239,7 +239,7 @@ void st()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    sys->memory[adrx(w[1], w[0])] = sys->cpu->gr[r_r1(w[0])];
+    sys->memory[get_adr_x(w[1], w[0])] = sys->cpu->gr[get_r_r1(w[0])];
     sys->cpu->pr += 2;
 }
 
@@ -251,7 +251,7 @@ void lad()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    sys->cpu->gr[r_r1(w[0])] = adrx(w[1], w[0]);
+    sys->cpu->gr[get_r_r1(w[0])] = get_adr_x(w[1], w[0]);
     sys->cpu->pr += 2;
 }
 
@@ -259,7 +259,7 @@ void lad()
  * ADDA命令のテンプレート
  * 汎用レジスタrに値valを算術加算
  */
-void adda(const WORD r, const WORD val)
+void adda(WORD r, WORD val)
 {
     long tmp;
 
@@ -286,7 +286,7 @@ void adda_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    adda(r_r1(w[0]), val_adrx(w[1], w[0]));
+    adda(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -297,7 +297,7 @@ void adda_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    adda(r_r1(w[0]), sys->cpu->gr[x_r2(w[0])]);
+    adda(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -309,7 +309,7 @@ void suba_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    adda(r_r1(w[0]), ~(val_adrx(w[1], w[0])) + 1);
+    adda(get_r_r1(w[0]), ~(get_val_adr_x(w[1], w[0])) + 1);
     sys->cpu->pr += 2;
 }
 
@@ -320,7 +320,7 @@ void suba_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    adda(r_r1(w[0]), ~(sys->cpu->gr[x_r2(w[0])]) + 1);
+    adda(get_r_r1(w[0]), ~(sys->cpu->gr[get_x_r2(w[0])]) + 1);
     sys->cpu->pr += 1;
 }
 
@@ -328,7 +328,7 @@ void suba_r1_r2()
  * ADDL命令のテンプレート
  * 汎用レジスタrに値valを論理加算
  */
-void addl(const WORD r, const WORD val)
+void addl(WORD r, WORD val)
 {
     long tmp;
     sys->cpu->fr = 0x0;
@@ -351,7 +351,7 @@ void addl_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    addl(r_r1(w[0]), val_adrx(w[1], w[0]));
+    addl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -362,7 +362,7 @@ void addl_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    addl(r_r1(w[0]), sys->cpu->gr[x_r2(w[0])]);
+    addl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -374,7 +374,7 @@ void subl_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    addl(r_r1(w[0]), ~(val_adrx(w[1], w[0])) + 1);
+    addl(get_r_r1(w[0]), ~(get_val_adr_x(w[1], w[0])) + 1);
     sys->cpu->pr += 2;
 }
 
@@ -385,7 +385,7 @@ void subl_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    addl(r_r1(w[0]), ~(sys->cpu->gr[x_r2(w[0])]) + 1);
+    addl(get_r_r1(w[0]), ~(sys->cpu->gr[get_x_r2(w[0])]) + 1);
     sys->cpu->pr += 1;
 }
 
@@ -397,7 +397,7 @@ void and_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    setfr(sys->cpu->gr[r_r1(w[0])] &= val_adrx(w[1], w[0]));
+    setfr(sys->cpu->gr[get_r_r1(w[0])] &= get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -408,7 +408,7 @@ void and_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    setfr(sys->cpu->gr[r_r1(w[0])] &= sys->cpu->gr[x_r2(w[0])]);
+    setfr(sys->cpu->gr[get_r_r1(w[0])] &= sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -420,7 +420,7 @@ void or_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    setfr(sys->cpu->gr[r_r1(w[0])] |= val_adrx(w[1], w[0]));
+    setfr(sys->cpu->gr[get_r_r1(w[0])] |= get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -431,7 +431,7 @@ void or_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    setfr(sys->cpu->gr[r_r1(w[0])] |= sys->cpu->gr[x_r2(w[0])]);
+    setfr(sys->cpu->gr[get_r_r1(w[0])] |= sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -443,7 +443,7 @@ void xor_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    setfr(sys->cpu->gr[r_r1(w[0])] ^= val_adrx(w[1], w[0]));
+    setfr(sys->cpu->gr[get_r_r1(w[0])] ^= get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -454,7 +454,7 @@ void xor_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    setfr(sys->cpu->gr[r_r1(w[0])] ^= sys->cpu->gr[x_r2(w[0])]);
+    setfr(sys->cpu->gr[get_r_r1(w[0])] ^= sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -462,7 +462,7 @@ void xor_r1_r2()
  * CPA命令のテンプレート
  * 汎用レジスタrの内容と値valを算術比較
  */
-void cpa(const WORD r, const WORD val)
+void cpa(WORD r, WORD val)
 {
     sys->cpu->fr = 0x0;
     if((short)sys->cpu->gr[r] < (short)val) {
@@ -480,7 +480,7 @@ void cpa_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    cpa(r_r1(w[0]), val_adrx(w[1], w[0]));
+    cpa(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -491,7 +491,7 @@ void cpa_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    cpa(r_r1(w[0]), sys->cpu->gr[x_r2(w[0])]);
+    cpa(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -499,7 +499,7 @@ void cpa_r1_r2()
  * CPL命令のテンプレート
  * 汎用レジスタrの内容と値valを論理比較
  */
-void cpl(const WORD r, const WORD val)
+void cpl(WORD r, WORD val)
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
@@ -520,7 +520,7 @@ void cpl_r_adr_x()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    cpl(r_r1(w[0]), val_adrx(w[1], w[0]));
+    cpl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
@@ -531,7 +531,7 @@ void cpl_r1_r2()
 {
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    cpl(r_r1(w[0]), sys->cpu->gr[x_r2(w[0])]);
+    cpl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
@@ -547,9 +547,9 @@ void sla()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     sys->cpu->fr = 0x0;
-    sign = sys->cpu->gr[(r = r_r1(w[0]))] & 0x8000;
+    sign = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
     sys->cpu->gr[r] &= 0x7FFF;
-    for(i = 0; i < adrx(w[1], w[0]); i++) {
+    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
         last = sys->cpu->gr[r] & 0x4000;
         sys->cpu->gr[r] <<= 1;
     }
@@ -582,9 +582,9 @@ void sra()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     sys->cpu->fr = 0x0;
-    sign = sys->cpu->gr[(r = r_r1(w[0]))] & 0x8000;
+    sign = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
     sys->cpu->gr[r] &= 0x7FFF;
-    for(i = 0; i < adrx(w[1], w[0]); i++) {
+    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
         last = sys->cpu->gr[r] & 0x1;
         sys->cpu->gr[r] >>= 1;
         if(sign > 0) {
@@ -618,8 +618,8 @@ void sll()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     sys->cpu->fr = 0x0;
-    for(i = 0; i < adrx(w[1], w[0]); i++) {
-        last = sys->cpu->gr[(r = r_r1(w[0]))] & 0x8000;
+    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
+        last = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
         sys->cpu->gr[r] <<= 1;
     }
     /* OFに、レジスタから最後に送り出されたビットの値を設定 */
@@ -648,8 +648,8 @@ void srl()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     sys->cpu->fr = 0x0;
-    r = r_r1(w[0]);
-    for(i = 0; i < adrx(w[1], w[0]); i++) {
+    r = get_r_r1(w[0]);
+    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
         last = sys->cpu->gr[r] & 0x0001;
         sys->cpu->gr[r] >>= 1;
     }
@@ -677,7 +677,7 @@ void jpl()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     if((sys->cpu->fr & (SF | ZF)) == 0) {
-        sys->cpu->pr = adrx(w[1], w[0]); 
+        sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
         sys->cpu->pr += 2;
     }
@@ -692,7 +692,7 @@ void jmi()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     if((sys->cpu->fr & SF) > 0) {
-        sys->cpu->pr = adrx(w[1], w[0]);
+        sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
         sys->cpu->pr += 2;
     }
@@ -707,7 +707,7 @@ void jnz()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     if((sys->cpu->fr & ZF) == 0) {
-        sys->cpu->pr = adrx(w[1], w[0]);
+        sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
         sys->cpu->pr += 2;
     }
@@ -722,7 +722,7 @@ void jze()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     if((sys->cpu->fr & ZF) > 0) {
-        sys->cpu->pr = adrx(w[1], w[0]);
+        sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
         sys->cpu->pr += 2;
     }
@@ -737,7 +737,7 @@ void jov()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     if((sys->cpu->fr & OF) > 0) {
-        sys->cpu->pr = adrx(w[1], w[0]);
+        sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
         sys->cpu->pr += 2;
     }
@@ -751,7 +751,7 @@ void jump()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    sys->cpu->pr = adrx(w[1], w[0]);
+    sys->cpu->pr = get_adr_x(w[1], w[0]);
 }
 
 /**
@@ -763,7 +763,7 @@ void push()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
-    sys->memory[--(sys->cpu->sp)] = adrx(w[1], w[0]);
+    sys->memory[--(sys->cpu->sp)] = get_adr_x(w[1], w[0]);
     sys->cpu->pr += 2;
 }
 
@@ -775,7 +775,7 @@ void pop()
     assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
     WORD w[1];
     w[0] = sys->memory[sys->cpu->pr];
-    sys->cpu->gr[r_r1(w[0])] = sys->memory[(sys->cpu->sp)++];
+    sys->cpu->gr[get_r_r1(w[0])] = sys->memory[(sys->cpu->sp)++];
     sys->cpu->pr += 1;
 }
 
@@ -789,7 +789,7 @@ void call()
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
     sys->memory[--(sys->cpu->sp)] = sys->cpu->pr + 1;
-    sys->cpu->pr = adrx(w[1], w[0]);
+    sys->cpu->pr = get_adr_x(w[1], w[0]);
 }
 
 /**
@@ -813,7 +813,7 @@ void svc()
     WORD w[2];
     w[0] = sys->memory[sys->cpu->pr];
     w[1] = sys->memory[sys->cpu->pr + 1];
-    switch(adrx(w[1], w[0]))
+    switch(get_adr_x(w[1], w[0]))
     {
     case 0x0:                   /* STOP */
         execptr->stop = true;
@@ -831,53 +831,51 @@ void svc()
 /**
  * 仮想マシンCOMET IIの実行
  */
-bool exec()
+void exec()
 {
-    void (*cmdptr)();
     clock_t clock_begin, clock_end;
+    void (*cmdptr)();
 
+    create_code_type();                             /* 命令のコードとタイプがキーのハッシュ表を作成 */
     if(execmode.trace == true) {
         fprintf(stdout, "\nExecuting machine codes\n");
     }
-    sys->cpu->fr = 0x0;            /* フラグレジスタ */
-    sys->cpu->sp = sys->memsize;   /* スタックポインタ */
-    execptr->stop = false;         /* 終了フラグ */
     /* 機械語の実行 */
     for (sys->cpu->pr = execptr->start; ; ) {
-        clock_begin = clock();
-        if(execmode.dump || execmode.trace) {        /* traceまたはdumpオプション指定時、改行を出力 */
-            if(execmode.trace){                      /* traceオプション指定時、レジスタを出力 */
+        clock_begin = clock();                     /* クロック周波数設定のため、実行開始時間を格納 */
+        if(execmode.dump || execmode.trace) {      /* traceまたはdumpオプション指定時、改行を出力 */
+            if(execmode.trace) {                   /* traceオプション指定時、レジスタを出力 */
                 fprintf(stdout, "#%04X: Register::::\n", sys->cpu->pr);
                 dspregister();
             }
-            if(execmode.dump){                       /* dumpオプション指定時、メモリを出力 */
+            if(execmode.dump) {                    /* dumpオプション指定時、メモリを出力 */
                 fprintf(stdout, "#%04X: Memory::::\n", sys->cpu->pr);
                 dumpmemory();
             }
             fprintf(stdout, "\n");
         }
         /* プログラムレジスタとスタックポインタをチェック */
-        if(sys->cpu->pr >= sys->memsize || sys->cpu->sp <= execptr->end || sys->cpu->sp > sys->memsize) {
+        if(sys->cpu->pr >= sys->memsize || sys->cpu->sp > sys->memsize || sys->cpu->sp <= execptr->end) {
             if(sys->cpu->pr >= sys->memsize) {
-                setcerr(204, pr2str(sys->cpu->pr));    /* Program Register (PR) - out of COMET II memory */
+                setcerr(201, pr2str(sys->cpu->pr));        /* Program Register (PR) - memory overflow */
             } else if(sys->cpu->sp <= execptr->end) {
-                setcerr(205, pr2str(sys->cpu->pr));    /* Stack Pointer (SP) - cannot allocate stack buffer */
+                setcerr(202, pr2str(sys->cpu->pr));        /* Stack Pointer (SP) - stack overflow */
             } else if(sys->cpu->sp > sys->memsize) {
-                setcerr(207, pr2str(sys->cpu->pr));    /* Stack Pointer (SP) - out of COMET II memory */
+                setcerr(203, pr2str(sys->cpu->pr));        /* Stack Pointer (SP) - stack underflow */
             }
-            goto execerr;
+            goto execfin;
         }
         /* コードから命令を取得 */
         /* 取得できない場合はエラー終了 */
         if((cmdptr = getcmdptr(sys->memory[sys->cpu->pr] & 0xFF00)) == NULL) {
-            setcerr(210, pr2str(sys->cpu->pr));        /* not command code of COMET II */
-            goto execerr;
+            setcerr(204, pr2str(sys->cpu->pr));            /* OP in word #1 - not command code */
+            goto execfin;
         }
         /* 命令の実行 */
         (*cmdptr)();
         /* エラー発生時はエラー終了 */
         if(cerr->num > 0) {
-            goto execerr;
+            goto execfin;
         }
         /* 終了フラグがtrueの場合は、正常終了 */
         if(execptr->stop == true) {
@@ -888,8 +886,9 @@ bool exec()
             clock_end = clock();
         } while(clock_end - clock_begin < CLOCKS_PER_SEC / sys->clocks);
     }
-    return true;
-execerr:
-    fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
-    return false;
+execfin:
+    free_code_type();                              /* 命令のコードとタイプがキーのハッシュ表を解放 */
+    if(cerr->num > 0) {
+        fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
+    }
 }