Merge branch 'master' into cmd-casl

diff --git a/src/assemble.c b/src/assemble.c
index 811f670..36edd2b 100644 (file)
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -314,6 +314,7 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
             /* オペランド数3 */
             if(cmdl->opd->opdc == 3) {
                 if((x = getgr(cmdl->opd->opdv[2], true)) == 0xFFFF) {
+                    setcerr(125, cmdl->cmd);    /* not GR in operand x */
                     return false;
                 }
                 cmd |= x;

diff --git a/src/casl2.c b/src/casl2.c
index 35f9a80..8e0b94a 100644 (file)
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -54,6 +54,7 @@ CERRARRAY cerr[] = {
     { 122, "cannot create hash table" },
     { 123, "illegal string" },
     { 124, "more than one character in literal" },
+    { 125, "not GR in operand x" },
     { 201, "execute - out of COMET II memory" },
     { 202, "SVC input - out of Input memory" },
     { 203, "SVC output - out of COMET II memory" },