X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcasl2.c;h=c3a555015a77009bb2c56ded13fe22fd7e18d61f;hb=e0de529cf2de73a298288fd294b24b964abdba34;hp=35f9a801087dcf35ffc7c6028d2c7bc4daa589f4;hpb=4fe8479d27f535a0ff44c9f6ce270249934e980f;p=YACASL2.git

diff --git a/src/casl2.c b/src/casl2.c
index 35f9a80..c3a5550 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -23,11 +23,6 @@ static struct option longopts[] = {
     {0, 0, 0, 0},
 };
 
-/* アセンブルモード: src, label, onlylabel, asdetail, onlyassemble */
-ASMODE asmode = {false, false, false, false, false};
-/* 実行モード: trace, logical, dump */
-EXECMODE execmode = {false, false, false};
-
 /* エラー番号とエラーメッセージ */
 CERRARRAY cerr[] = {
     { 101, "label already defined" },
@@ -35,25 +30,26 @@ CERRARRAY cerr[] = {
     { 103, "label not found" },
     { 104, "label length is too long" },
     { 105, "no command in the line" },
-    { 106, "operand count mismatch" },
+    { 106, "operand mismatch in assemble command" },
     { 107, "no label in START" },
     { 108, "not command of operand \"r\"" },
     { 109, "not command of operand \"r1,r2\"" },
     { 110, "not command of operand \"r,adr[,x]\"" },
     { 111, "not command of operand \"adr[,x]\"" },
     { 112, "not command of no operand" },
-    { 113, "command not defined" },
+    { 113, "operand too many in machine command" },
     { 114, "not integer" },
     { 115, "not hex" },
     { 116, "out of hex range" },
-    { 117, "operand is too many" },
-    { 118, "operand length is too long" },
+    { 117, "operand too many in DC" },
+    { 118, "operand length too long" },
     { 119, "out of COMET II memory" },
     { 120, "GR0 in operand x" },
     { 121, "cannot get operand token" },
     { 122, "cannot create hash table" },
-    { 123, "illegal string" },
+    { 123, "unclosed quote" },
     { 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" },
@@ -80,7 +76,7 @@ const char *objfile_name(const char *str)
 {
     const char *default_name = "a.o";
 
-    if(optarg == NULL) {
+    if(str == NULL) {
         return default_name;
     } else {
         return str;