実行時、バイナリからCOMET II以外の値を読み込んだ場合はエラーが発生するよう変更

[YACASL2.git] / src / exec.c

diff --git a/src/exec.c b/src/exec.c
index 7034e19..8530640 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -17,6 +17,7 @@ static CERR cerr_exec[] = {
     { 206, "Address - out of COMET II memory" },
     { 207, "Stack Pointer (SP) - out of COMET II memory" },
     { 209, "not GR in operand x" },
+    { 210, "not command code of COMET II" },
 };
 
 /**
@@ -380,7 +381,9 @@ bool exec()
         /* 命令の取り出し */
         op = sys->memory[sys->cpu->pr] & 0xFF00;
         /* 命令の解読 */
-        cmdtype = getcmdtype(op);
+        if((cmdtype = getcmdtype(op)) == NOTCMD) {
+            setcerr(210, pr2str(sys->cpu->pr));          /* not command code of COMET II */
+        }
         r_r1 = (sys->memory[sys->cpu->pr] >> 4) & 0xF;
         x_r2 = sys->memory[sys->cpu->pr] & 0xF;
         /* traceオプション指定時、レジスタを出力 */