From 4fc7ef863ab16292138ea6df30cbea7aacf6914f Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Thu, 26 Oct 2017 02:06:52 +0700
Subject: [PATCH 01/43] emit/__emit: Use 'tFIRST' instead of hardcoded '256'

---
 source/compiler/sc1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index e77b64c..a6d1f2f 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5842,7 +5842,7 @@ static void emit_invalid_token(int need_token, int current_token)
   char s[sNAMEMAX+ 2];
   extern char *sc_tokens[];
 
-  if (current_token<256) {
+  if (current_token<tFIRST) {
     sprintf(s,"%c",(char)current_token);
   } else {
     strcpy(s,sc_tokens[current_token-tFIRST]);
@@ -5901,7 +5901,7 @@ static void emit_param_num(char *name, ucell *p, int size)
           break;
         } /* if */
       } /* if */
-      if (tok<256) {
+      if (tok<tFIRST) {
         sprintf(ival,"%c",(char)tok);
       } else {
         strcpy(ival,sc_tokens[tok-tFIRST]);

From 2492d4793bca488ce7d76ff6c39b22f32c2bf7c8 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Thu, 26 Oct 2017 02:29:27 +0700
Subject: [PATCH 02/43] emit/__emit: Set the sign bit properly on non-32-bit
 cells

---
 source/compiler/sc1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index a6d1f2f..b384297 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5893,7 +5893,7 @@ static void emit_param_num(char *name, ucell *p, int size)
           p[curp]=-val;
           break;
         } else if (tok==tRATIONAL) {
-          p[curp]=val|0x80000000;
+          p[curp]=val|((cell)1 << (PAWN_CELL_SIZE-1));
           break;
         } else {
           strcpy(ival+1,str);

From 06feab9224f3d3273e328f025ffc928e18ae07e1 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Thu, 26 Oct 2017 23:29:29 +0700
Subject: [PATCH 03/43] emit/__emit: Code cleanup

---
 source/compiler/sc.h  |   2 +-
 source/compiler/sc1.c | 207 ++++++++++++++++++------------------------
 source/compiler/sc3.c |   4 +-
 3 files changed, 91 insertions(+), 122 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index 6adf043..69c2b27 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -699,7 +699,7 @@ SC_FUNC void dec(value *lval);
 SC_FUNC void jmp_ne0(int number);
 SC_FUNC void jmp_eq0(int number);
 SC_FUNC void outval(cell val,int newline);
-SC_FUNC void outinstr(const char *name, int nargs, ucell *args);
+SC_FUNC void outinstr(const char *name,int nargs,ucell *args);
 
 /* function prototypes in SC5.C */
 SC_FUNC int error(int number,...);
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index b384297..a88bc99 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5833,24 +5833,23 @@ static void check_empty(const unsigned char *lptr)
   /* verifies that the string contains only whitespace */
   while (*lptr<=' ' && *lptr!='\0')
     lptr++;
-  if (*lptr!='\0'&&*lptr!='}')
+  if (*lptr!='\0' && *lptr!='}')
     error(38);          /* extra characters on line */
 }
 
-static void emit_invalid_token(int need_token, int current_token)
+static void emit_invalid_token(int need_token,int current_token)
 {
-  char s[sNAMEMAX+ 2];
+  char s[sNAMEMAX+2];
   extern char *sc_tokens[];
 
-  if (current_token<tFIRST) {
+  if (current_token<tFIRST)
     sprintf(s,"%c",(char)current_token);
-  } else {
+  else
     strcpy(s,sc_tokens[current_token-tFIRST]);
-  } /* if */
   error(1,sc_tokens[tSYMBOL-tFIRST],s);
 }
 
-static void emit_param_num(char *name, ucell *p, int size)
+static void emit_param_num(char *name,ucell *p,int size)
 {
   char *str;
   cell val;
@@ -5861,7 +5860,7 @@ static void emit_param_num(char *name, ucell *p, int size)
   int curp=0;
 
   do {
-    switch (tok=lex(&val, &str)) {
+    switch (tok=lex(&val,&str)) {
     case tRATIONAL:
     case tNUMBER:
       p[curp]=val;
@@ -5870,20 +5869,16 @@ static void emit_param_num(char *name, ucell *p, int size)
       sym=findloc(str);
       if (sym==NULL)
         sym=findglb(str,sSTATEVAR);
-      if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0) || sym->ident==iLABEL) {
+      if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0) || sym->ident==iLABEL)
         error(17,str);  /* undefined symbol */
+      if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
+        if ((sym->usage & uNATIVE)!=0 && (sym->usage & uREAD)==0 && sym->addr>=0)
+          sym->addr=ntv_funcid++;
+        p[curp]=sym->addr;
+        markusage(sym,uREAD);
       } else {
-        if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
-          if ((sym->usage & uNATIVE)!=0) {
-            if ((sym->usage & uREAD)==0 && sym->addr>=0)
-              sym->addr=ntv_funcid++;
-          }
-          p[curp]=sym->addr;
-          markusage(sym,uREAD);
-        } else {
-          p[curp]=sym->addr;
-          markusage(sym,uREAD|uWRITTEN);
-        } /* if */
+        p[curp]=sym->addr;
+        markusage(sym,uREAD|uWRITTEN);
       } /* if */
       break;
     default:
@@ -5901,17 +5896,16 @@ static void emit_param_num(char *name, ucell *p, int size)
           break;
         } /* if */
       } /* if */
-      if (tok<tFIRST) {
+      if (tok<tFIRST)
         sprintf(ival,"%c",(char)tok);
-      } else {
+      else
         strcpy(ival,sc_tokens[tok-tFIRST]);
-      } /* if */
       error(1,sc_tokens[tSYMBOL-tFIRST],ival);
     } /* switch */
-  } while (++curp < size);
+  } while (++curp<size);
 }
 
-static void emit_param_data(char *name, ucell *p, int size)
+static void emit_param_data(char *name,ucell *p,int size)
 {
   cell val;
   char *str;
@@ -5922,22 +5916,18 @@ static void emit_param_data(char *name, ucell *p, int size)
 
   do {
     tok=lex(&val,&str);
-    if (tok!=tSYMBOL) {
-      emit_invalid_token(tSYMBOL, tok);
-    } /* if */
+    if (tok!=tSYMBOL)
+      emit_invalid_token(tSYMBOL,tok);
     sym=findloc(str);
     if (sym==NULL || sym->vclass!=sSTATIC)
       sym=findglb(str,sGLOBAL);
-    if (sym==NULL) {
-      error(17,str);
-    } else {
-      if (sym->ident!=iVARIABLE) {
-        error(17,str);  /* undefined symbol */
-      } /* if */
-      markusage(sym,uREAD|uWRITTEN);
-      p[curp]=sym->addr;
-    } /* if */
-  } while (++curp < size);
+    if (sym==NULL)
+      error(17,str);    /* undefined symbol */
+    if (sym->ident!=iVARIABLE)
+      error(17,str);    /* undefined symbol */
+    markusage(sym,uREAD|uWRITTEN);
+    p[curp]=sym->addr;
+  } while (++curp<size);
 }
 
 static void OPHANDLER_CALL emit_noop(char *name)
@@ -5947,23 +5937,23 @@ static void OPHANDLER_CALL emit_noop(char *name)
 
 static void OPHANDLER_CALL emit_parm0(char *name)
 {
-  outinstr(name, 0, NULL);
+  outinstr(name,0,NULL);
 }
 
 static void OPHANDLER_CALL emit_parm1_num(char *name)
 {
   ucell p[1];
 
-  emit_param_num(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm1_gvar(char *name)
 {
   ucell p[1];
 
-  emit_param_data(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm1_lbl(char *name)
@@ -5974,9 +5964,8 @@ static void OPHANDLER_CALL emit_parm1_lbl(char *name)
   int tok;
 
   tok=lex(&val,&str);
-  if (tok!=tSYMBOL) {
-    emit_invalid_token(tSYMBOL, tok);
-  } /* if */
+  if (tok!=tSYMBOL)
+    emit_invalid_token(tSYMBOL,tok);
   sym=fetchlab(str);
   sym->usage|=uREAD;
   outinstr(name,1,&sym->addr);
@@ -5986,16 +5975,16 @@ static void OPHANDLER_CALL emit_parm2_num(char *name)
 {
   ucell p[2];
 
-  emit_param_num(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm2_gvar(char *name)
 {
   ucell p[2];
 
-  emit_param_data(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm2_gvar_num(char *name)
@@ -6009,75 +5998,68 @@ static void OPHANDLER_CALL emit_parm2_gvar_num(char *name)
   extern char *sc_tokens[];
 
   tok=lex(&val,&str);
-  if (tok!=tSYMBOL) {
-    emit_invalid_token(tSYMBOL, tok);
-  } /* if */
+  if (tok!=tSYMBOL)
+    emit_invalid_token(tSYMBOL,tok);
   sym=findloc(str);
   if (sym==NULL || sym->vclass!=sSTATIC)
     sym=findglb(str,sGLOBAL);
-  if (sym==NULL) {
-    error(17,str);
-  } else {
-    if (sym->ident!=iVARIABLE) {
-      error(17,str);  /* undefined symbol */
-    } /* if */
-    markusage(sym,uREAD);
-    p[0]=sym->addr;
-    tok=lex(&val,&str);
-    if (tok!=tNUMBER) {
-      emit_invalid_token(tNUMBER, tok);
-    } /* if */
-    p[1]=val;
-    outinstr(name,arraysize(p),p);
-  } /* if */
+  if (sym==NULL || sym->ident!=iVARIABLE)
+    error(17,str);    /* undefined symbol */
+  markusage(sym,uREAD);
+  p[0]=sym->addr;
+  tok=lex(&val,&str);
+  if (tok!=tNUMBER)
+    emit_invalid_token(tNUMBER,tok);
+  p[1]=val;
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm3_num(char *name)
 {
   ucell p[3];
 
-  emit_param_num(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm3_gvar(char *name)
 {
   ucell p[3];
 
-  emit_param_data(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm4_num(char *name)
 {
   ucell p[4];
 
-  emit_param_num(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm4_gvar(char *name)
 {
   ucell p[4];
 
-  emit_param_data(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm5_num(char *name)
 {
   ucell p[5];
 
-  emit_param_num(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm5_gvar(char *name)
 {
   ucell p[5];
 
-  emit_param_data(name, p, arraysize(p));
-  outinstr(name,arraysize(p),p);
+  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_do_case(char *name)
@@ -6094,18 +6076,15 @@ static void OPHANDLER_CALL emit_do_case(char *name)
   stgwrite(" ");
 
   tok=lex(&val,&str);
-  if (tok!=tNUMBER) {
-    emit_invalid_token(tSYMBOL, tok);
-  } /* if */
+  if (tok!=tNUMBER)
+    emit_invalid_token(tSYMBOL,tok);
   outval(val,FALSE);
   tok=lex(&val,&str);
-  if (tok!=tSYMBOL) {
-    emit_invalid_token(tSYMBOL, tok);
-  } /* if */
+  if (tok!=tSYMBOL)
+    emit_invalid_token(tSYMBOL,tok);
   sym=fetchlab(str);
-  if (sym==NULL) {
+  if (sym==NULL)
     error(17,str);  /* undefined symbol */
-  } /* if */
   outval(sym->addr,FALSE);
   stgwrite("\n");
   code_idx+=opargs(2)+opcodes(0);
@@ -6119,12 +6098,10 @@ static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
   extern char *sc_tokens[];
 
   tok=lex(&val,&str);
-  if (tok!=tNUMBER) {
-    emit_invalid_token(tNUMBER, tok);
-  } /* if */
-  if (val!=1 && val!=2 && val!=4) {
+  if (tok!=tNUMBER)
+    emit_invalid_token(tNUMBER,tok);
+  if (val!=1 && val!=2 && val!=4)
     error(50);  /* invalid range */
-  } /* if */
   outinstr(name,1,&val);
 }
 
@@ -6137,22 +6114,18 @@ static void OPHANDLER_CALL emit_do_call(char *name)
   extern char *sc_tokens[];
 
   tok=lex(&val,&str);
-  if (tok!=tSYMBOL) {
-    emit_invalid_token(tSYMBOL, tok);
-  } /* if */
+  if (tok!=tSYMBOL)
+    emit_invalid_token(tSYMBOL,tok);
   sym=findglb(str,sGLOBAL);
-  if (sym==NULL) {
+  if (sym==NULL)
     error(12);  /* invalid function call */
-  } else {
-    stgwrite("\t");
-    stgwrite(name);
-    stgwrite(" ");
-    stgwrite(".");
-    stgwrite(str);
-    stgwrite("\n");
-    code_idx+=opcodes(1)+opargs(1);
-    markusage(sym,uREAD);
-  }
+  stgwrite("\t");
+  stgwrite(name);
+  stgwrite(" .");
+  stgwrite(str);
+  stgwrite("\n");
+  code_idx+=opcodes(1)+opargs(1);
+  markusage(sym,uREAD);
 }
 
 static EMIT_OPCODE emit_opcodelist[] = {
@@ -6354,36 +6327,32 @@ SC_FUNC void emit_parse_line(void)
   int tok,len,i;
   symbol *sym;
   char name[MAX_INSTR_LEN];
+  extern char *sc_tokens[];
 
   tok=tokeninfo(&val,&st);
-  if (tok==tSYMBOL || (tok > tMIDDLE && tok <= tLAST)) {
+  if (tok==tSYMBOL || (tok>tMIDDLE && tok<=tLAST)) {
     /* get the token length */
-    if (tok > tMIDDLE && tok <= tLAST) {
-      extern char *sc_tokens[];
+    if (tok>tMIDDLE && tok<=tLAST)
       len=strlen(sc_tokens[tok-tFIRST]);
-    } else {
+    else
       len=strlen(st);
-    } /* if */
     lptr-=len;
-    for(i=0; i<sizeof(name) && (isalnum(*lptr) || *lptr=='.'); ++i,++lptr) {
+    for(i=0; i<sizeof(name) && (isalnum(*lptr) || *lptr=='.'); ++i,++lptr)
       name[i]=(char)tolower(*lptr);
-    } /* for */
     name[i]='\0';
     i=emit_findopcode(name,strlen(name));
-    if (emit_opcodelist[i].name==NULL && *name!='\0') {
+    if (emit_opcodelist[i].name==NULL && *name!='\0')
       error(104,name); /* invalid assembler instruction */
-    } /* if */
     emit_opcodelist[i].func(name);
     check_empty(lptr);
   } else if (tok==tLABEL) {
-    if (!emit_block_parsing) {
+    if (!emit_block_parsing)
       error(38);  /* extra characters on line */
-    } /* if */
     sym=fetchlab(st);
     setlabel((int)sym->addr);
     sym->usage|=uDEFINE;
   } /* if */
-  if ((emit_block_parsing && matchtoken('}')) || !emit_block_parsing) {
+  if (!emit_block_parsing || matchtoken('}')) {
     matchtoken(';');
     emit_block_parsing=FALSE;
   } /* if */
diff --git a/source/compiler/sc3.c b/source/compiler/sc3.c
index 2665ae8..de9e89f 100644
--- a/source/compiler/sc3.c
+++ b/source/compiler/sc3.c
@@ -1453,12 +1453,12 @@ static int hier2(value *lval)
     cell val;
     char* st;
     if (!matchtoken('{'))
-      error(38);
+      error(38);    /* extra characters on line */
     lex(&val,&st);
     lval->ident=iEXPRESSION;
     emit_parse_line();
     if (!matchtoken('}'))
-      error(38);
+      error(38);    /* extra characters on line */
     return FALSE;
   } /* case */
   default:

From d15c11f42054aa7bff6f2879c1ce22d9ae1dbbaf Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 29 Oct 2017 21:25:42 +0700
Subject: [PATCH 04/43] Fix OPHANDLER_CALL-related warnings issued by clang on
 non-x86 targets

---
 source/compiler/sc.h | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index 69c2b27..664ca3c 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -47,19 +47,14 @@
 
 #if defined _MSC_VER
   #define OPHANDLER_CALL __fastcall
-#elif defined __GNUC__
-  #if defined __clang__
+#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__ || defined __amd64__)
+  #if !defined __x86_64__ && !defined __amd64__ && (__GNUC__>=4 || __GNUC__==3 && __GNUC_MINOR__>=4)
     #define OPHANDLER_CALL __attribute__((fastcall))
-  #elif (defined __i386__ || defined __x86_64__ || defined __amd64__)
-    #if !defined __x86_64__ && !defined __amd64__ && (__GNUC__>=4 || __GNUC__==3 && __GNUC_MINOR__>=4)
-      #define OPHANDLER_CALL __attribute__((fastcall))
-    #else
-      #define OPHANDLER_CALL __attribute__((regparam(3)))
-    #endif
   #else
-    #define OPHANDLER_CALL
+    #define OPHANDLER_CALL __attribute__((regparam(3)))
   #endif
-#else
+#endif
+#if !defined OPHANDLER_CALL
   #define OPHANDLER_CALL
 #endif
 

From af31143ec3afe9ef2c0037ea785d8028025637d1 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 30 Oct 2017 18:59:21 +0700
Subject: [PATCH 05/43] emit/__emit: Avoid excess instruction name copying in
 emit_findopcode()

---
 source/compiler/sc1.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index a88bc99..3e19e67 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6290,14 +6290,10 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 92, "zero.s",     emit_parm1_num },
 };
 
-static int emit_findopcode(char *instr,int maxlen)
+static int emit_findopcode(const char *instr,int maxlen)
 {
   int low,high,mid,cmp;
-  char str[MAX_INSTR_LEN];
 
-  if (maxlen>=MAX_INSTR_LEN)
-    return 0;
-  strlcpy(str,instr,maxlen+1);
   /* look up the instruction with a binary search
    * the assembler is case insensitive to instructions (but case sensitive
    * to symbols)
@@ -6307,7 +6303,7 @@ static int emit_findopcode(char *instr,int maxlen)
   while (low<high) {
     mid=(low+high)/2;
     assert(emit_opcodelist[mid].name!=NULL);
-    cmp=stricmp(str,emit_opcodelist[mid].name);
+    cmp=stricmp(instr,emit_opcodelist[mid].name);
     if (cmp>0)
       low=mid+1;
     else
@@ -6315,7 +6311,7 @@ static int emit_findopcode(char *instr,int maxlen)
   } /* while */
 
   assert(low==high);
-  if (stricmp(str,emit_opcodelist[low].name)==0)
+  if (stricmp(instr,emit_opcodelist[low].name)==0)
     return low;         /* found */
   return 0;             /* not found, return special index */
 }

From eb5ee448e54fafad4d358fb16c438cb24506774a Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 30 Oct 2017 19:09:19 +0700
Subject: [PATCH 06/43] emit/__emit: Use case-sensitive search in
 emit_findopcode() The instruction name is copied in lower case anyway (see
 emit_parse_line()).

---
 source/compiler/sc1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 3e19e67..dfbe8b9 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6303,7 +6303,7 @@ static int emit_findopcode(const char *instr,int maxlen)
   while (low<high) {
     mid=(low+high)/2;
     assert(emit_opcodelist[mid].name!=NULL);
-    cmp=stricmp(instr,emit_opcodelist[mid].name);
+    cmp=strcmp(instr,emit_opcodelist[mid].name);
     if (cmp>0)
       low=mid+1;
     else
@@ -6311,7 +6311,7 @@ static int emit_findopcode(const char *instr,int maxlen)
   } /* while */
 
   assert(low==high);
-  if (stricmp(instr,emit_opcodelist[low].name)==0)
+  if (strcmp(instr,emit_opcodelist[low].name)==0)
     return low;         /* found */
   return 0;             /* not found, return special index */
 }

From 7440670150890ff757112197205b6c6dafaf5848 Mon Sep 17 00:00:00 2001
From: VVWVV <d0u61ev@gmail.com>
Date: Fri, 27 Oct 2017 17:33:56 +0300
Subject: [PATCH 07/43] fix params for data seg.

Conflicts:
	source/compiler/sc1.c
---
 source/compiler/sc1.c | 54 ++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index dfbe8b9..64e642d 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5901,6 +5901,7 @@ static void emit_param_num(char *name,ucell *p,int size)
       else
         strcpy(ival,sc_tokens[tok-tFIRST]);
       error(1,sc_tokens[tSYMBOL-tFIRST],ival);
+      break;
     } /* switch */
   } while (++curp<size);
 }
@@ -5916,17 +5917,24 @@ static void emit_param_data(char *name,ucell *p,int size)
 
   do {
     tok=lex(&val,&str);
-    if (tok!=tSYMBOL)
+    switch (tok) {
+    case tNUMBER:
+      p[curp]=val;
+      break;
+    case tSYMBOL:
+      sym=findloc(str);
+      if (sym==NULL)
+        sym=findglb(str,sSTATIC);
+      else if (sym->vclass!=sSTATIC)
+        error(17,str);
+      if (sym==NULL)
+        error(17,str);
+      markusage(sym,uREAD|uWRITTEN);
+      p[curp]=sym->addr;
+      break;
+    default:
       emit_invalid_token(tSYMBOL,tok);
-    sym=findloc(str);
-    if (sym==NULL || sym->vclass!=sSTATIC)
-      sym=findglb(str,sGLOBAL);
-    if (sym==NULL)
-      error(17,str);    /* undefined symbol */
-    if (sym->ident!=iVARIABLE)
-      error(17,str);    /* undefined symbol */
-    markusage(sym,uREAD|uWRITTEN);
-    p[curp]=sym->addr;
+    } /* switch */
   } while (++curp<size);
 }
 
@@ -5998,15 +6006,25 @@ static void OPHANDLER_CALL emit_parm2_gvar_num(char *name)
   extern char *sc_tokens[];
 
   tok=lex(&val,&str);
-  if (tok!=tSYMBOL)
+  switch (tok) {
+  case tNUMBER:
+    p[0]=val;
+    break;
+  case tSYMBOL:
+    sym=findloc(str);
+    if (sym==NULL)
+      sym=findglb(str,sSTATIC);
+    else if (sym->vclass!=sSTATIC)
+      error(17,str);
+    if (sym==NULL)
+      error(17,str);
+    markusage(sym,uREAD|uWRITTEN);
+    p[0]=sym->addr;
+    break;
+  default:
     emit_invalid_token(tSYMBOL,tok);
-  sym=findloc(str);
-  if (sym==NULL || sym->vclass!=sSTATIC)
-    sym=findglb(str,sGLOBAL);
-  if (sym==NULL || sym->ident!=iVARIABLE)
-    error(17,str);    /* undefined symbol */
-  markusage(sym,uREAD);
-  p[0]=sym->addr;
+  } /* switch */
+
   tok=lex(&val,&str);
   if (tok!=tNUMBER)
     emit_invalid_token(tNUMBER,tok);

From 28c69cd8c8a6242244cb4b4e507dd3cd901bce7a Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 12 Nov 2017 16:59:28 +0700
Subject: [PATCH 08/43] #emit: Set the sign bit properly on non-32-bit cells

---
 source/compiler/sc2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/compiler/sc2.c b/source/compiler/sc2.c
index 04f746b..38e5f6f 100644
--- a/source/compiler/sc2.c
+++ b/source/compiler/sc2.c
@@ -1356,7 +1356,7 @@ static int command(void)
               break;
             } else if (current_token==tRATIONAL) {
               /* change the first bit to make float negative value */
-              outval(val | 0x80000000,FALSE);
+              outval(val|((cell)1 << (PAWN_CELL_SIZE-1)),FALSE);
               code_idx+=opargs(1);
               break;
             } else {

From f921451c8a34006cb8f9d747b1f3e1c7f984ee11 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 12 Nov 2017 18:25:38 +0700
Subject: [PATCH 09/43] emit/__emit: Fix multiple occurences of NULL pointer
 dereference

---
 source/compiler/sc1.c | 55 ++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 64e642d..8628dc1 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5869,9 +5869,9 @@ static void emit_param_num(char *name,ucell *p,int size)
       sym=findloc(str);
       if (sym==NULL)
         sym=findglb(str,sSTATEVAR);
-      if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0) || sym->ident==iLABEL)
+      if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0) || sym->ident==iLABEL) {
         error(17,str);  /* undefined symbol */
-      if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
+      } else if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
         if ((sym->usage & uNATIVE)!=0 && (sym->usage & uREAD)==0 && sym->addr>=0)
           sym->addr=ntv_funcid++;
         p[curp]=sym->addr;
@@ -5892,16 +5892,14 @@ static void emit_param_num(char *name,ucell *p,int size)
           break;
         } else {
           strcpy(ival+1,str);
-          error(1,sc_tokens[tSYMBOL-tFIRST],ival);
-          break;
         } /* if */
+      } else {
+        if (tok<tFIRST)
+          sprintf(ival,"%c",(char)tok);
+        else
+          strcpy(ival,sc_tokens[tok-tFIRST]);
       } /* if */
-      if (tok<tFIRST)
-        sprintf(ival,"%c",(char)tok);
-      else
-        strcpy(ival,sc_tokens[tok-tFIRST]);
       error(1,sc_tokens[tSYMBOL-tFIRST],ival);
-      break;
     } /* switch */
   } while (++curp<size);
 }
@@ -5923,12 +5921,18 @@ static void emit_param_data(char *name,ucell *p,int size)
       break;
     case tSYMBOL:
       sym=findloc(str);
-      if (sym==NULL)
+      if (sym!=NULL) {
+        if (sym->vclass!=sSTATIC) {
+          error(17,str);    /* undefined symbol */
+          continue;
+        }
+      } else {
         sym=findglb(str,sSTATIC);
-      else if (sym->vclass!=sSTATIC)
-        error(17,str);
-      if (sym==NULL)
-        error(17,str);
+        if (sym==NULL) {
+          error(17,str);    /* undefined symbol */
+          continue;
+        }
+      }
       markusage(sym,uREAD|uWRITTEN);
       p[curp]=sym->addr;
       break;
@@ -6103,8 +6107,9 @@ static void OPHANDLER_CALL emit_do_case(char *name)
   sym=fetchlab(str);
   if (sym==NULL)
     error(17,str);  /* undefined symbol */
-  outval(sym->addr,FALSE);
-  stgwrite("\n");
+  else
+    val=sym->addr;
+  outval(val,TRUE);
   code_idx+=opargs(2)+opcodes(0);
 }
 
@@ -6135,15 +6140,17 @@ static void OPHANDLER_CALL emit_do_call(char *name)
   if (tok!=tSYMBOL)
     emit_invalid_token(tSYMBOL,tok);
   sym=findglb(str,sGLOBAL);
-  if (sym==NULL)
+  if (sym==NULL) {
     error(12);  /* invalid function call */
-  stgwrite("\t");
-  stgwrite(name);
-  stgwrite(" .");
-  stgwrite(str);
-  stgwrite("\n");
-  code_idx+=opcodes(1)+opargs(1);
-  markusage(sym,uREAD);
+  } else {
+    stgwrite("\t");
+    stgwrite(name);
+    stgwrite(" .");
+    stgwrite(str);
+    stgwrite("\n");
+    code_idx+=opcodes(1)+opargs(1);
+    markusage(sym,uREAD);
+  }
 }
 
 static EMIT_OPCODE emit_opcodelist[] = {

From d4af23b5debea6ea64117d23e34e5e8f844faec2 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 12 Nov 2017 19:28:59 +0700
Subject: [PATCH 10/43] emit/__emit: Allow local constants to be used as data
 addresses in emit_param_data()

---
 source/compiler/sc1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 8628dc1..4351ab7 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5922,7 +5922,7 @@ static void emit_param_data(char *name,ucell *p,int size)
     case tSYMBOL:
       sym=findloc(str);
       if (sym!=NULL) {
-        if (sym->vclass!=sSTATIC) {
+        if (sym->vclass!=sSTATIC && sym->ident!=iCONSTEXPR) {
           error(17,str);    /* undefined symbol */
           continue;
         }

From 35fb9e8393975eb0fd144986842f659920d0ab01 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 12 Nov 2017 20:15:30 +0700
Subject: [PATCH 11/43] emit/__emit: Remove excess instruction name passing to
 emit_param_num() & emit_param_data()

---
 source/compiler/sc1.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 4351ab7..bf3e28b 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5849,7 +5849,7 @@ static void emit_invalid_token(int need_token,int current_token)
   error(1,sc_tokens[tSYMBOL-tFIRST],s);
 }
 
-static void emit_param_num(char *name,ucell *p,int size)
+static void emit_param_num(ucell *p,int size)
 {
   char *str;
   cell val;
@@ -5904,7 +5904,7 @@ static void emit_param_num(char *name,ucell *p,int size)
   } while (++curp<size);
 }
 
-static void emit_param_data(char *name,ucell *p,int size)
+static void emit_param_data(ucell *p,int size)
 {
   cell val;
   char *str;
@@ -5956,7 +5956,7 @@ static void OPHANDLER_CALL emit_parm1_num(char *name)
 {
   ucell p[1];
 
-  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  emit_param_num(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -5964,7 +5964,7 @@ static void OPHANDLER_CALL emit_parm1_gvar(char *name)
 {
   ucell p[1];
 
-  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  emit_param_data(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -5987,7 +5987,7 @@ static void OPHANDLER_CALL emit_parm2_num(char *name)
 {
   ucell p[2];
 
-  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  emit_param_num(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -5995,7 +5995,7 @@ static void OPHANDLER_CALL emit_parm2_gvar(char *name)
 {
   ucell p[2];
 
-  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  emit_param_data(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -6040,7 +6040,7 @@ static void OPHANDLER_CALL emit_parm3_num(char *name)
 {
   ucell p[3];
 
-  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  emit_param_num(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -6048,7 +6048,7 @@ static void OPHANDLER_CALL emit_parm3_gvar(char *name)
 {
   ucell p[3];
 
-  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  emit_param_data(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -6056,7 +6056,7 @@ static void OPHANDLER_CALL emit_parm4_num(char *name)
 {
   ucell p[4];
 
-  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  emit_param_num(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -6064,7 +6064,7 @@ static void OPHANDLER_CALL emit_parm4_gvar(char *name)
 {
   ucell p[4];
 
-  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  emit_param_data(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -6072,7 +6072,7 @@ static void OPHANDLER_CALL emit_parm5_num(char *name)
 {
   ucell p[5];
 
-  emit_param_num(name,p,(sizeof p / sizeof p[0]));
+  emit_param_num(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
@@ -6080,7 +6080,7 @@ static void OPHANDLER_CALL emit_parm5_gvar(char *name)
 {
   ucell p[5];
 
-  emit_param_data(name,p,(sizeof p / sizeof p[0]));
+  emit_param_data(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 

From 69b552c90dc0da66546ae5e3f7de86c444a431b0 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 12 Nov 2017 20:38:32 +0700
Subject: [PATCH 12/43] emit/__emit: Simplify the code in emit_parm2_gvar_num()

---
 source/compiler/sc1.c | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index bf3e28b..6196446 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6001,38 +6001,10 @@ static void OPHANDLER_CALL emit_parm2_gvar(char *name)
 
 static void OPHANDLER_CALL emit_parm2_gvar_num(char *name)
 {
-  cell val;
-  char *str;
   ucell p[2];
-  symbol *sym;
-  int curp=0;
-  int tok;
-  extern char *sc_tokens[];
 
-  tok=lex(&val,&str);
-  switch (tok) {
-  case tNUMBER:
-    p[0]=val;
-    break;
-  case tSYMBOL:
-    sym=findloc(str);
-    if (sym==NULL)
-      sym=findglb(str,sSTATIC);
-    else if (sym->vclass!=sSTATIC)
-      error(17,str);
-    if (sym==NULL)
-      error(17,str);
-    markusage(sym,uREAD|uWRITTEN);
-    p[0]=sym->addr;
-    break;
-  default:
-    emit_invalid_token(tSYMBOL,tok);
-  } /* switch */
-
-  tok=lex(&val,&str);
-  if (tok!=tNUMBER)
-    emit_invalid_token(tNUMBER,tok);
-  p[1]=val;
+  emit_param_data(&p[0],1);
+  emit_param_num(&p[1],1);
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 

From f5cbeb010bcd3ec45d35e7c63adaa5304deb6b62 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 12 Nov 2017 21:19:57 +0700
Subject: [PATCH 13/43] emit/__emit: Remove excess sc_tokens declarations, fix
 cell*/ucell* argument type mismatch

---
 source/compiler/sc1.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 6196446..fef6b09 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5911,7 +5911,6 @@ static void emit_param_data(ucell *p,int size)
   symbol *sym;
   int curp=0;
   int tok;
-  extern char *sc_tokens[];
 
   do {
     tok=lex(&val,&str);
@@ -5980,7 +5979,7 @@ static void OPHANDLER_CALL emit_parm1_lbl(char *name)
     emit_invalid_token(tSYMBOL,tok);
   sym=fetchlab(str);
   sym->usage|=uREAD;
-  outinstr(name,1,&sym->addr);
+  outinstr(name,1,(ucell *)&sym->addr);
 }
 
 static void OPHANDLER_CALL emit_parm2_num(char *name)
@@ -6063,7 +6062,6 @@ static void OPHANDLER_CALL emit_do_case(char *name)
   char *str;
   symbol* sym;
   int tok;
-  extern char *sc_tokens[];
 
   stgwrite("\t");
   stgwrite(name);
@@ -6087,17 +6085,16 @@ static void OPHANDLER_CALL emit_do_case(char *name)
 
 static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
 {
-  ucell val;
+  cell val;
   char *str;
   int tok;
-  extern char *sc_tokens[];
 
   tok=lex(&val,&str);
   if (tok!=tNUMBER)
     emit_invalid_token(tNUMBER,tok);
   if (val!=1 && val!=2 && val!=4)
     error(50);  /* invalid range */
-  outinstr(name,1,&val);
+  outinstr(name,1,(ucell *)&val);
 }
 
 static void OPHANDLER_CALL emit_do_call(char *name)
@@ -6106,7 +6103,6 @@ static void OPHANDLER_CALL emit_do_call(char *name)
   char *str;
   symbol *sym;
   int tok;
-  extern char *sc_tokens[];
 
   tok=lex(&val,&str);
   if (tok!=tSYMBOL)

From b726f44a0221af53169b7890da0fda8e4ce73c52 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 12 Nov 2017 22:49:09 +0700
Subject: [PATCH 14/43] emit/__emit: Simplify the code in emit_parm1_lbl() and
 emit_do_case()

---
 source/compiler/sc1.c | 54 ++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index fef6b09..d6b9d86 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5941,6 +5941,21 @@ static void emit_param_data(ucell *p,int size)
   } while (++curp<size);
 }
 
+static void emit_param_label(ucell *p)
+{
+  cell val;
+  char *str;
+  symbol *sym;
+  int tok;
+
+  tok=lex(&val,&str);
+  if (tok!=tSYMBOL)
+    emit_invalid_token(tSYMBOL,tok);
+  sym=fetchlab(str);
+  sym->usage|=uREAD;
+  *p=*(ucell *)&sym->addr;
+}
+
 static void OPHANDLER_CALL emit_noop(char *name)
 {
   (void)name;
@@ -5969,17 +5984,10 @@ static void OPHANDLER_CALL emit_parm1_gvar(char *name)
 
 static void OPHANDLER_CALL emit_parm1_lbl(char *name)
 {
-  char *str;
-  cell val;
-  symbol *sym;
-  int tok;
+  ucell p[1];
 
-  tok=lex(&val,&str);
-  if (tok!=tSYMBOL)
-    emit_invalid_token(tSYMBOL,tok);
-  sym=fetchlab(str);
-  sym->usage|=uREAD;
-  outinstr(name,1,(ucell *)&sym->addr);
+  emit_param_label(&p[0]);
+  outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
 static void OPHANDLER_CALL emit_parm2_num(char *name)
@@ -6057,29 +6065,11 @@ static void OPHANDLER_CALL emit_parm5_gvar(char *name)
 
 static void OPHANDLER_CALL emit_do_case(char *name)
 {
-  /* case <value> <label> */
-  cell val;
-  char *str;
-  symbol* sym;
-  int tok;
+  ucell p[2];
 
-  stgwrite("\t");
-  stgwrite(name);
-  stgwrite(" ");
-
-  tok=lex(&val,&str);
-  if (tok!=tNUMBER)
-    emit_invalid_token(tSYMBOL,tok);
-  outval(val,FALSE);
-  tok=lex(&val,&str);
-  if (tok!=tSYMBOL)
-    emit_invalid_token(tSYMBOL,tok);
-  sym=fetchlab(str);
-  if (sym==NULL)
-    error(17,str);  /* undefined symbol */
-  else
-    val=sym->addr;
-  outval(val,TRUE);
+  emit_param_num(&p[1],1);
+  emit_param_label(&p[1]);
+  outinstr(name,2,p);
   code_idx+=opargs(2)+opcodes(0);
 }
 

From d788eeaeb8fbd8ae9ee15879a1d6e60196240d37 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 13 Nov 2017 19:26:40 +0700
Subject: [PATCH 15/43] emit/__emit: Make 'switch', 'casetbl' and 'case'
 generate valid code

This changes the way 'switch', 'casetbl' and 'case' are handled; now 'casetbl' can't be used directly and the arguments for the first case table entry (the number of entries and 'default' label) are specified to 'switch'.
Example:
    emit
    {
        load.s.pri my_var
        switch 3 lbl_deafult
        case 0 lbl_0
        case 2 lbl_2
        case 4 lbl_4
    }
---
 source/compiler/sc1.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index d6b9d86..76fd35d 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6063,14 +6063,36 @@ static void OPHANDLER_CALL emit_parm5_gvar(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
+static void OPHANDLER_CALL emit_do_switch(char *name)
+{
+  ucell p[2];
+  int lbl_table;
+
+  emit_param_num(&p[0],1);
+  emit_param_label(&p[1]);
+  lbl_table=getlabel();
+  stgwrite("\tswitch ");
+  outval((cell)lbl_table,TRUE);
+  setlabel(lbl_table);
+  stgwrite("\tcasetbl\n");
+  stgwrite("\tcase ");
+  outval(p[0],FALSE);
+  stgwrite(" ");
+  outval(p[1],TRUE);
+  code_idx+=opcodes(2)+opargs(3);
+}
+
 static void OPHANDLER_CALL emit_do_case(char *name)
 {
   ucell p[2];
 
-  emit_param_num(&p[1],1);
+  emit_param_num(&p[0],1);
   emit_param_label(&p[1]);
-  outinstr(name,2,p);
-  code_idx+=opargs(2)+opcodes(0);
+  stgwrite("\tcase ");
+  outval(p[0],FALSE);
+  stgwrite(" ");
+  outval(p[1],TRUE);
+  code_idx+=opargs(2);
 }
 
 static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
@@ -6125,7 +6147,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 49, "call",       emit_do_call },
   { 50, "call.pri",   emit_parm0 },
   {  0, "case",       emit_do_case },
-  {130, "casetbl",    emit_parm0 },
+/*{130, "casetbl",    emit_parm0 },*/
   {118, "cmps",       emit_parm1_num },
   {156, "const",      emit_parm2_gvar_num },
   { 12, "const.alt",  emit_parm1_num },
@@ -6256,7 +6278,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 80, "sub.alt",    emit_parm0 },
   {132, "swap.alt",   emit_parm0 },
   {131, "swap.pri",   emit_parm0 },
-  {129, "switch",     emit_parm1_lbl },
+  {129, "switch",     emit_do_switch },
 /*{126, "symbol",     do_symbol }, */
 /*{136, "symtag",     emit_parm1_num }, */
   {123, "sysreq.c",   emit_parm1_num },

From cccf0f16740fd289067f0f736ccc4f2d3c5043c8 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 13 Nov 2017 22:48:10 +0700
Subject: [PATCH 16/43] emit/__emit: Remove check_empty() from sc1.c

It was copied from sc2.c with a check for a trailing '}' added and was too specific to be reused anywhere else.
---
 source/compiler/sc1.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 76fd35d..7076f58 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5828,15 +5828,6 @@ static void dolabel(void)
   sym->usage|=uDEFINE;  /* label is now defined */
 }
 
-static void check_empty(const unsigned char *lptr)
-{
-  /* verifies that the string contains only whitespace */
-  while (*lptr<=' ' && *lptr!='\0')
-    lptr++;
-  if (*lptr!='\0' && *lptr!='}')
-    error(38);          /* extra characters on line */
-}
-
 static void emit_invalid_token(int need_token,int current_token)
 {
   char s[sNAMEMAX+2];
@@ -6345,7 +6336,11 @@ SC_FUNC void emit_parse_line(void)
     if (emit_opcodelist[i].name==NULL && *name!='\0')
       error(104,name); /* invalid assembler instruction */
     emit_opcodelist[i].func(name);
-    check_empty(lptr);
+    /* make sure the string only contains whitespaces and/or a trailing '}' */
+    while (*lptr<=' ' && *lptr!='\0')
+      lptr++;
+    if (*lptr!='\0' && *lptr!='}')
+      error(38);  /* extra characters on line */
   } else if (tok==tLABEL) {
     if (!emit_block_parsing)
       error(38);  /* extra characters on line */

From c14186a48f56a08f88cb3a3891e9faa9a07ed08d Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 13 Nov 2017 23:18:43 +0700
Subject: [PATCH 17/43] emit/__emit: Fix 'need_token' argument being unused in
 emit_invalid_token()

---
 source/compiler/sc1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 7076f58..bf4db2a 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5837,7 +5837,7 @@ static void emit_invalid_token(int need_token,int current_token)
     sprintf(s,"%c",(char)current_token);
   else
     strcpy(s,sc_tokens[current_token-tFIRST]);
-  error(1,sc_tokens[tSYMBOL-tFIRST],s);
+  error(1,sc_tokens[need_token-tFIRST],s);
 }
 
 static void emit_param_num(ucell *p,int size)

From e55f6a213a7f55e80d7a48edb9a31e0df3ad3182 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Tue, 14 Nov 2017 00:51:39 +0700
Subject: [PATCH 18/43] emit/__emit: Minor adjustments

---
 source/compiler/sc1.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index bf4db2a..a534df2 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5846,7 +5846,6 @@ static void emit_param_num(ucell *p,int size)
   cell val;
   symbol *sym;
   int tok;
-  char ival[sNAMEMAX+2]="-";
   extern char *sc_tokens[];
   int curp=0;
 
@@ -5877,20 +5876,16 @@ static void emit_param_num(ucell *p,int size)
         tok=lex(&val,&str);
         if (tok==tNUMBER) {
           p[curp]=-val;
-          break;
         } else if (tok==tRATIONAL) {
           p[curp]=val|((cell)1 << (PAWN_CELL_SIZE-1));
-          break;
         } else {
+          char ival[sNAMEMAX+2]="-";
           strcpy(ival+1,str);
+          error(1,sc_tokens[tSYMBOL-tFIRST],ival);
         } /* if */
       } else {
-        if (tok<tFIRST)
-          sprintf(ival,"%c",(char)tok);
-        else
-          strcpy(ival,sc_tokens[tok-tFIRST]);
+        emit_invalid_token(tSYMBOL,tok);
       } /* if */
-      error(1,sc_tokens[tSYMBOL-tFIRST],ival);
     } /* switch */
   } while (++curp<size);
 }
@@ -5914,13 +5909,13 @@ static void emit_param_data(ucell *p,int size)
       if (sym!=NULL) {
         if (sym->vclass!=sSTATIC && sym->ident!=iCONSTEXPR) {
           error(17,str);    /* undefined symbol */
-          continue;
+          break;
         }
       } else {
         sym=findglb(str,sSTATIC);
         if (sym==NULL) {
           error(17,str);    /* undefined symbol */
-          continue;
+          break;
         }
       }
       markusage(sym,uREAD|uWRITTEN);
@@ -6138,7 +6133,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 49, "call",       emit_do_call },
   { 50, "call.pri",   emit_parm0 },
   {  0, "case",       emit_do_case },
-/*{130, "casetbl",    emit_parm0 },*/
+/*{130, "casetbl",    emit_parm0 }, */
   {118, "cmps",       emit_parm1_num },
   {156, "const",      emit_parm2_gvar_num },
   { 12, "const.alt",  emit_parm1_num },
@@ -6336,7 +6331,9 @@ SC_FUNC void emit_parse_line(void)
     if (emit_opcodelist[i].name==NULL && *name!='\0')
       error(104,name); /* invalid assembler instruction */
     emit_opcodelist[i].func(name);
-    /* make sure the string only contains whitespaces and/or a trailing '}' */
+    /* make sure the string only contains whitespaces
+     * and/or an optional trailing '}'
+     */
     while (*lptr<=' ' && *lptr!='\0')
       lptr++;
     if (*lptr!='\0' && *lptr!='}')

From c58fce34cbf3cb0c0b280c24b8ec62bd5d22b9d6 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Tue, 14 Nov 2017 19:34:00 +0700
Subject: [PATCH 19/43] emit/__emit: New argument type: local variable (name or
 offset)

---
 source/compiler/sc1.c | 119 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 96 insertions(+), 23 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index a534df2..a641e44 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5927,6 +5927,39 @@ static void emit_param_data(ucell *p,int size)
   } while (++curp<size);
 }
 
+static void emit_param_local(ucell *p,int size)
+{
+  cell val;
+  char *str;
+  symbol *sym;
+  int curp=0;
+  int tok;
+
+  do {
+    tok=lex(&val,&str);
+    switch (tok) {
+    case tNUMBER:
+      p[curp]=val;
+      break;
+    case tSYMBOL:
+      sym=findloc(str);
+      if (sym==NULL) {
+        sym=findglb(str,sSTATEVAR);
+        if (sym==NULL || sym->ident!=iCONSTEXPR)
+          error(17,str);    /* undefined symbol */
+      } else if (sym->vclass==sSTATIC) {
+        error(17,str);      /* undefined symbol */
+        break;
+      } /* if */
+      markusage(sym,uREAD|uWRITTEN);
+      p[curp]=sym->addr;
+      break;
+    default:
+      emit_invalid_token(tSYMBOL,tok);
+    } /* switch */
+  } while (++curp<size);
+}
+
 static void emit_param_label(ucell *p)
 {
   cell val;
@@ -5968,6 +6001,14 @@ static void OPHANDLER_CALL emit_parm1_gvar(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
+static void OPHANDLER_CALL emit_parm1_local(char *name)
+{
+  ucell p[1];
+
+  emit_param_local(p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
+}
+
 static void OPHANDLER_CALL emit_parm1_lbl(char *name)
 {
   ucell p[1];
@@ -5992,6 +6033,14 @@ static void OPHANDLER_CALL emit_parm2_gvar(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
+static void OPHANDLER_CALL emit_parm2_local(char *name)
+{
+  ucell p[2];
+
+  emit_param_local(p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
+}
+
 static void OPHANDLER_CALL emit_parm2_gvar_num(char *name)
 {
   ucell p[2];
@@ -6017,6 +6066,14 @@ static void OPHANDLER_CALL emit_parm3_gvar(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
+static void OPHANDLER_CALL emit_parm3_local(char *name)
+{
+  ucell p[3];
+
+  emit_param_local(p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
+}
+
 static void OPHANDLER_CALL emit_parm4_num(char *name)
 {
   ucell p[4];
@@ -6033,6 +6090,14 @@ static void OPHANDLER_CALL emit_parm4_gvar(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
+static void OPHANDLER_CALL emit_parm4_local(char *name)
+{
+  ucell p[4];
+
+  emit_param_local(p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
+}
+
 static void OPHANDLER_CALL emit_parm5_num(char *name)
 {
   ucell p[5];
@@ -6049,6 +6114,14 @@ static void OPHANDLER_CALL emit_parm5_gvar(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
+static void OPHANDLER_CALL emit_parm5_local(char *name)
+{
+  ucell p[5];
+
+  emit_param_local(p,(sizeof p / sizeof p[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),p);
+}
+
 static void OPHANDLER_CALL emit_do_switch(char *name)
 {
   ucell p[2];
@@ -6138,12 +6211,12 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {156, "const",      emit_parm2_gvar_num },
   { 12, "const.alt",  emit_parm1_num },
   { 11, "const.pri",  emit_parm1_num },
-  {157, "const.s",    emit_parm2_num },
+  {157, "const.s",    emit_parm2_local },
   {114, "dec",        emit_parm1_gvar },
   {113, "dec.alt",    emit_parm0 },
   {116, "dec.i",      emit_parm0 },
   {112, "dec.pri",    emit_parm0 },
-  {115, "dec.s",      emit_parm1_num },
+  {115, "dec.s",      emit_parm1_local },
   { 95, "eq",         emit_parm0 },
   {106, "eq.c.alt",   emit_parm1_num },
   {105, "eq.c.pri",   emit_parm1_num },
@@ -6159,7 +6232,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {108, "inc.alt",    emit_parm0 },
   {111, "inc.i",      emit_parm0 },
   {107, "inc.pri",    emit_parm0 },
-  {110, "inc.s",      emit_parm1_num },
+  {110, "inc.s",      emit_parm1_local },
   { 86, "invert",     emit_parm0 },
   { 55, "jeq",        emit_parm1_lbl },
   { 60, "jgeq",       emit_parm1_lbl },
@@ -6186,14 +6259,14 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {154, "load.both",  emit_parm2_gvar },
   {  9, "load.i",     emit_parm0 },
   {  1, "load.pri",   emit_parm1_gvar },
-  {  4, "load.s.alt", emit_parm1_num },
-  {155, "load.s.both",emit_parm2_num },
-  {  3, "load.s.pri", emit_parm1_num },
+  {  4, "load.s.alt", emit_parm1_local },
+  {155, "load.s.both",emit_parm2_local },
+  {  3, "load.s.pri", emit_parm1_local },
   { 10, "lodb.i",     emit_do_lodb_strb },
   {  6, "lref.alt",   emit_parm1_gvar },
   {  5, "lref.pri",   emit_parm1_gvar },
-  {  8, "lref.s.alt", emit_parm1_num },
-  {  7, "lref.s.pri", emit_parm1_num },
+  {  8, "lref.s.alt", emit_parm1_local },
+  {  7, "lref.s.pri", emit_parm1_local },
   { 34, "move.alt",   emit_parm0 },
   { 33, "move.pri",   emit_parm0 },
   {117, "movs",       emit_parm1_num },
@@ -6206,28 +6279,28 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 42, "pop.pri",    emit_parm0 },
   { 46, "proc",       emit_parm0 },
   { 40, "push",       emit_parm1_gvar },
-  {133, "push.adr",   emit_parm1_num },
+  {133, "push.adr",   emit_parm1_local },
   { 37, "push.alt",   emit_parm0 },
   { 39, "push.c",     emit_parm1_num },
   { 36, "push.pri",   emit_parm0 },
   { 38, "push.r",     emit_parm1_num },
-  { 41, "push.s",     emit_parm1_num },
+  { 41, "push.s",     emit_parm1_local },
   {139, "push2",      emit_parm2_gvar },
-  {141, "push2.adr",  emit_parm2_num },
+  {141, "push2.adr",  emit_parm2_local },
   {138, "push2.c",    emit_parm2_num },
-  {140, "push2.s",    emit_parm2_num },
+  {140, "push2.s",    emit_parm2_local },
   {143, "push3",      emit_parm3_gvar },
-  {145, "push3.adr",  emit_parm3_num },
+  {145, "push3.adr",  emit_parm3_local },
   {142, "push3.c",    emit_parm3_num },
-  {144, "push3.s",    emit_parm3_num },
+  {144, "push3.s",    emit_parm3_local },
   {147, "push4",      emit_parm4_gvar },
-  {149, "push4.adr",  emit_parm4_num },
+  {149, "push4.adr",  emit_parm4_local },
   {146, "push4.c",    emit_parm4_num },
-  {148, "push4.s",    emit_parm4_num },
+  {148, "push4.s",    emit_parm4_local },
   {151, "push5",      emit_parm5_gvar },
-  {153, "push5.adr",  emit_parm5_num },
+  {153, "push5.adr",  emit_parm5_local },
   {150, "push5.c",    emit_parm5_num },
-  {152, "push5.s",    emit_parm5_num },
+  {152, "push5.s",    emit_parm5_local },
   { 47, "ret",        emit_parm0 },
   { 48, "retn",       emit_parm0 },
   { 32, "sctrl",      emit_parm1_num },
@@ -6250,15 +6323,15 @@ static EMIT_OPCODE emit_opcodelist[] = {
 /*{127, "srange",     emit_parm2_num }, */
   { 20, "sref.alt",   emit_parm1_gvar },
   { 19, "sref.pri",   emit_parm1_gvar },
-  { 22, "sref.s.alt", emit_parm1_num },
-  { 21, "sref.s.pri", emit_parm1_num },
+  { 22, "sref.s.alt", emit_parm1_local },
+  { 21, "sref.s.pri", emit_parm1_local },
   { 67, "sshr",       emit_parm0 },
   { 44, "stack",      emit_parm1_num },
   { 16, "stor.alt",   emit_parm1_gvar },
   { 23, "stor.i",     emit_parm0 },
   { 15, "stor.pri",   emit_parm1_gvar },
-  { 18, "stor.s.alt", emit_parm1_num },
-  { 17, "stor.s.pri", emit_parm1_num },
+  { 18, "stor.s.alt", emit_parm1_local },
+  { 17, "stor.s.pri", emit_parm1_local },
   { 24, "strb.i",     emit_do_lodb_strb },
   { 79, "sub",        emit_parm0 },
   { 80, "sub.alt",    emit_parm0 },
@@ -6278,7 +6351,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 91, "zero",       emit_parm1_gvar },
   { 90, "zero.alt",   emit_parm0 },
   { 89, "zero.pri",   emit_parm0 },
-  { 92, "zero.s",     emit_parm1_num },
+  { 92, "zero.s",     emit_parm1_local },
 };
 
 static int emit_findopcode(const char *instr,int maxlen)

From abe9c965dcb1fe3b55078d020352d7b6140fff1d Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Fri, 17 Nov 2017 18:25:31 +0700
Subject: [PATCH 20/43] emit/__emit: Make type mismatch errors more informative

Example:
    main()
    {
        new x;
        emit load.pri x
    }
Before this commit:
    error 017: undefined symbol "x"
After:
    error 001: expected token: "-data offset-", but found "-local variable-"
---
 source/compiler/sc.h  |  9 +++++++--
 source/compiler/sc1.c | 36 +++++++++++++++++++++---------------
 source/compiler/sc2.c |  3 ++-
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index 664ca3c..234c11b 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -402,8 +402,13 @@ typedef struct s_valuepair {
 #define tSYMBOL     336
 #define tLABEL      337
 #define tSTRING     338
-#define tEXPR       339 /* for assigment to "lastst" only (see SC1.C) */
-#define tENDLESS    340 /* endless loop, for assigment to "lastst" only */
+/* argument types for emit/__emit */
+#define teNUMBER    339 /* integer/rational number */
+#define teDATA      340 /* data (variable name or address) */
+#define teLOCAL     341 /* local variable (name or offset) */
+/* for assigment to "lastst" only (see SC1.C) */
+#define tEXPR       342
+#define tENDLESS    343 /* endless loop */
 
 /* (reversed) evaluation of staging buffer */
 #define sSTARTREORDER 0x01
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index a641e44..366fe3d 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5828,16 +5828,18 @@ static void dolabel(void)
   sym->usage|=uDEFINE;  /* label is now defined */
 }
 
-static void emit_invalid_token(int need_token,int current_token)
+static void emit_invalid_token(int expected_token,int found_token)
 {
-  char s[sNAMEMAX+2];
+  char s[2];
   extern char *sc_tokens[];
 
-  if (current_token<tFIRST)
-    sprintf(s,"%c",(char)current_token);
-  else
-    strcpy(s,sc_tokens[current_token-tFIRST]);
-  error(1,sc_tokens[need_token-tFIRST],s);
+  assert(expected_token>=tFIRST);
+  if (found_token<tFIRST) {
+    sprintf(s,"%c",(char)found_token);
+    error(1,sc_tokens[expected_token-tFIRST],s);
+  } else {
+    error(1,sc_tokens[expected_token-tFIRST],sc_tokens[found_token-tFIRST]);
+  } /* if */
 }
 
 static void emit_param_num(ucell *p,int size)
@@ -5884,7 +5886,7 @@ static void emit_param_num(ucell *p,int size)
           error(1,sc_tokens[tSYMBOL-tFIRST],ival);
         } /* if */
       } else {
-        emit_invalid_token(tSYMBOL,tok);
+        emit_invalid_token(teNUMBER,tok);
       } /* if */
     } /* switch */
   } while (++curp<size);
@@ -5908,7 +5910,7 @@ static void emit_param_data(ucell *p,int size)
       sym=findloc(str);
       if (sym!=NULL) {
         if (sym->vclass!=sSTATIC && sym->ident!=iCONSTEXPR) {
-          error(17,str);    /* undefined symbol */
+          emit_invalid_token(teDATA,teLOCAL);
           break;
         }
       } else {
@@ -5922,7 +5924,7 @@ static void emit_param_data(ucell *p,int size)
       p[curp]=sym->addr;
       break;
     default:
-      emit_invalid_token(tSYMBOL,tok);
+      emit_invalid_token(teDATA,tok);
     } /* switch */
   } while (++curp<size);
 }
@@ -5943,13 +5945,17 @@ static void emit_param_local(ucell *p,int size)
       break;
     case tSYMBOL:
       sym=findloc(str);
-      if (sym==NULL) {
+      if (sym!=NULL) {
+        if (sym->vclass==sSTATIC) {
+          emit_invalid_token(teLOCAL,teDATA);
+          break;
+        } /* if */
+      } else {
         sym=findglb(str,sSTATEVAR);
-        if (sym==NULL || sym->ident!=iCONSTEXPR)
+        if (sym==NULL || sym->ident!=iCONSTEXPR) {
           error(17,str);    /* undefined symbol */
-      } else if (sym->vclass==sSTATIC) {
-        error(17,str);      /* undefined symbol */
-        break;
+          break;
+        } /* if */
       } /* if */
       markusage(sym,uREAD|uWRITTEN);
       p[curp]=sym->addr;
diff --git a/source/compiler/sc2.c b/source/compiler/sc2.c
index 38e5f6f..b693eaa 100644
--- a/source/compiler/sc2.c
+++ b/source/compiler/sc2.c
@@ -2096,7 +2096,8 @@ char *sc_tokens[] = {
          "#endscript", "#error", "#file", "#if", "#include", "#line", "#pragma",
          "#tryinclude", "#undef", "#warning",
          ";", ";", "-integer value-", "-rational value-", "-identifier-",
-         "-label-", "-string-"
+         "-label-", "-string-",
+         "-numeric value-", "-data offset-", "-local variable-"
        };
 
 SC_FUNC int lex(cell *lexvalue,char **lexsym)

From 912376b65834929b9b6f6f27086202fb7ca309c1 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Fri, 17 Nov 2017 19:55:27 +0700
Subject: [PATCH 21/43] emit/__emit: Check if the argument of instruction
 'call' is a Pawn function

---
 source/compiler/sc.h  |  6 ++++--
 source/compiler/sc1.c | 30 ++++++++++++++++++++----------
 source/compiler/sc2.c |  3 ++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index 234c11b..7fad6a1 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -406,9 +406,11 @@ typedef struct s_valuepair {
 #define teNUMBER    339 /* integer/rational number */
 #define teDATA      340 /* data (variable name or address) */
 #define teLOCAL     341 /* local variable (name or offset) */
+#define teFUNCTN    342 /* Pawn function */
+#define teNATIVE    343 /* native function */
 /* for assigment to "lastst" only (see SC1.C) */
-#define tEXPR       342
-#define tENDLESS    343 /* endless loop */
+#define tEXPR       344
+#define tENDLESS    345 /* endless loop */
 
 /* (reversed) evaluation of staging buffer */
 #define sSTARTREORDER 0x01
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 366fe3d..a36d089 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6182,20 +6182,30 @@ static void OPHANDLER_CALL emit_do_call(char *name)
   int tok;
 
   tok=lex(&val,&str);
-  if (tok!=tSYMBOL)
+  if (tok!=tSYMBOL) {
     emit_invalid_token(tSYMBOL,tok);
+    return;
+  }
   sym=findglb(str,sGLOBAL);
   if (sym==NULL) {
-    error(12);  /* invalid function call */
-  } else {
-    stgwrite("\t");
-    stgwrite(name);
-    stgwrite(" .");
-    stgwrite(str);
-    stgwrite("\n");
-    code_idx+=opcodes(1)+opargs(1);
-    markusage(sym,uREAD);
+    error(17,str); /* undefined symbol */
+    return;
   }
+  if (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && sym->ident!=iVARARGS) {
+    emit_invalid_token(teFUNCTN,(sym->ident==iCONSTEXPR) ? teNUMBER : teDATA);
+    return;
+  }
+  if ((sym->usage & uNATIVE)!=0) {
+    emit_invalid_token(teFUNCTN,teNATIVE);
+    return;
+  }
+  stgwrite("\t");
+  stgwrite(name);
+  stgwrite(" .");
+  stgwrite(str);
+  stgwrite("\n");
+  code_idx+=opcodes(1)+opargs(1);
+  markusage(sym,uREAD);
 }
 
 static EMIT_OPCODE emit_opcodelist[] = {
diff --git a/source/compiler/sc2.c b/source/compiler/sc2.c
index b693eaa..14c280b 100644
--- a/source/compiler/sc2.c
+++ b/source/compiler/sc2.c
@@ -2097,7 +2097,8 @@ char *sc_tokens[] = {
          "#tryinclude", "#undef", "#warning",
          ";", ";", "-integer value-", "-rational value-", "-identifier-",
          "-label-", "-string-",
-         "-numeric value-", "-data offset-", "-local variable-"
+         "-numeric value-", "-data offset-", "-local variable-", "-function-",
+         "-native function-"
        };
 
 SC_FUNC int lex(cell *lexvalue,char **lexsym)

From 5eb18c4eec61c23db299816dc55d777a9246522c Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Fri, 17 Nov 2017 22:54:10 +0700
Subject: [PATCH 22/43] emit/__emit: Allow for leading '-' to negate symbol
 values in emit_param_num()

Now it should be possible to do this:
    const SOME_VAL = 1;
    emit const.pri -SOME_VAL

or this:
    static some_array[] = { 0, 1, 2, 3, 4, 5 };
    static some_var;
    emit { const.pri some_var };
    new some_var_offset = emit { add.c -some_array };
---
 source/compiler/sc1.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index a36d089..7a7f53d 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5850,12 +5850,18 @@ static void emit_param_num(ucell *p,int size)
   int tok;
   extern char *sc_tokens[];
   int curp=0;
+  int neg;
 
   do {
-    switch (tok=lex(&val,&str)) {
-    case tRATIONAL:
+    neg=0;
+  fetchtok:
+    tok=lex(&val,&str);
+    switch (tok) {
     case tNUMBER:
-      p[curp]=val;
+      p[curp]=(neg!=0) ? -val : val;
+      break;
+    case tRATIONAL:
+      p[curp]=(neg!=0) ? (val|((cell)1 << (PAWN_CELL_SIZE-1))) : val;
       break;
     case tSYMBOL:
       sym=findloc(str);
@@ -5863,28 +5869,26 @@ static void emit_param_num(ucell *p,int size)
         sym=findglb(str,sSTATEVAR);
       if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0) || sym->ident==iLABEL) {
         error(17,str);  /* undefined symbol */
-      } else if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
+        break;
+      } /* if */
+      if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
         if ((sym->usage & uNATIVE)!=0 && (sym->usage & uREAD)==0 && sym->addr>=0)
           sym->addr=ntv_funcid++;
-        p[curp]=sym->addr;
         markusage(sym,uREAD);
       } else {
-        p[curp]=sym->addr;
         markusage(sym,uREAD|uWRITTEN);
       } /* if */
+      p[curp]=(neg!=0) ? -sym->addr : sym->addr;
       break;
     default:
-      if ((char)tok=='-') {
-        tok=lex(&val,&str);
-        if (tok==tNUMBER) {
-          p[curp]=-val;
-        } else if (tok==tRATIONAL) {
-          p[curp]=val|((cell)1 << (PAWN_CELL_SIZE-1));
-        } else {
-          char ival[sNAMEMAX+2]="-";
-          strcpy(ival+1,str);
-          error(1,sc_tokens[tSYMBOL-tFIRST],ival);
+      if (tok==(int)'-') {
+        if (neg==0) {
+          neg=1;
+          goto fetchtok;
         } /* if */
+        char ival[sNAMEMAX+2]="-";
+        strcpy(ival+1,str);
+        error(1,sc_tokens[tSYMBOL-tFIRST],ival);
       } else {
         emit_invalid_token(teNUMBER,tok);
       } /* if */

From 5c0d45aab3741f6d9cd860366e83d06c99c59bad Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Fri, 17 Nov 2017 23:08:52 +0700
Subject: [PATCH 23/43] emit/__emit: emit_param_data(): make sure the argument
 is not a function

---
 source/compiler/sc1.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 7a7f53d..6c7529f 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5923,6 +5923,10 @@ static void emit_param_data(ucell *p,int size)
           error(17,str);    /* undefined symbol */
           break;
         }
+        if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
+          emit_invalid_token(teDATA,((sym->usage & uNATIVE)!=0) ? teNATIVE : teFUNCTN);
+          break;
+        }
       }
       markusage(sym,uREAD|uWRITTEN);
       p[curp]=sym->addr;

From 98817bf8f8afa23bd34f209b55710a479f9cf2ce Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Fri, 17 Nov 2017 23:40:47 +0700
Subject: [PATCH 24/43] emit/__emit: Code cleanup, minor fixes

---
 source/compiler/sc1.c | 207 +++++++++++++++++++++---------------------
 1 file changed, 105 insertions(+), 102 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 6c7529f..272502b 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5842,7 +5842,7 @@ static void emit_invalid_token(int expected_token,int found_token)
   } /* if */
 }
 
-static void emit_param_num(ucell *p,int size)
+static void emit_param_any(ucell *p,int size)
 {
   char *str;
   cell val;
@@ -5852,6 +5852,7 @@ static void emit_param_num(ucell *p,int size)
   int curp=0;
   int neg;
 
+  assert(size>0);
   do {
     neg=0;
   fetchtok:
@@ -5889,9 +5890,9 @@ static void emit_param_num(ucell *p,int size)
         char ival[sNAMEMAX+2]="-";
         strcpy(ival+1,str);
         error(1,sc_tokens[tSYMBOL-tFIRST],ival);
-      } else {
-        emit_invalid_token(teNUMBER,tok);
+        break;
       } /* if */
+      emit_invalid_token(teNUMBER,tok);
     } /* switch */
   } while (++curp<size);
 }
@@ -5904,6 +5905,7 @@ static void emit_param_data(ucell *p,int size)
   int curp=0;
   int tok;
 
+  assert(size>0);
   do {
     tok=lex(&val,&str);
     switch (tok) {
@@ -5916,18 +5918,18 @@ static void emit_param_data(ucell *p,int size)
         if (sym->vclass!=sSTATIC && sym->ident!=iCONSTEXPR) {
           emit_invalid_token(teDATA,teLOCAL);
           break;
-        }
+        } /* if */
       } else {
         sym=findglb(str,sSTATIC);
         if (sym==NULL) {
           error(17,str);    /* undefined symbol */
           break;
-        }
+        } /* if */
         if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
           emit_invalid_token(teDATA,((sym->usage & uNATIVE)!=0) ? teNATIVE : teFUNCTN);
           break;
-        }
-      }
+        } /* if */
+      } /* if */
       markusage(sym,uREAD|uWRITTEN);
       p[curp]=sym->addr;
       break;
@@ -5945,6 +5947,7 @@ static void emit_param_local(ucell *p,int size)
   int curp=0;
   int tok;
 
+  assert(size>0);
   do {
     tok=lex(&val,&str);
     switch (tok) {
@@ -5999,15 +6002,15 @@ static void OPHANDLER_CALL emit_parm0(char *name)
   outinstr(name,0,NULL);
 }
 
-static void OPHANDLER_CALL emit_parm1_num(char *name)
+static void OPHANDLER_CALL emit_parm1_any(char *name)
 {
   ucell p[1];
 
-  emit_param_num(p,(sizeof p / sizeof p[0]));
+  emit_param_any(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm1_gvar(char *name)
+static void OPHANDLER_CALL emit_parm1_data(char *name)
 {
   ucell p[1];
 
@@ -6023,7 +6026,7 @@ static void OPHANDLER_CALL emit_parm1_local(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm1_lbl(char *name)
+static void OPHANDLER_CALL emit_parm1_label(char *name)
 {
   ucell p[1];
 
@@ -6031,15 +6034,15 @@ static void OPHANDLER_CALL emit_parm1_lbl(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm2_num(char *name)
+static void OPHANDLER_CALL emit_parm2_any(char *name)
 {
   ucell p[2];
 
-  emit_param_num(p,(sizeof p / sizeof p[0]));
+  emit_param_any(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm2_gvar(char *name)
+static void OPHANDLER_CALL emit_parm2_data(char *name)
 {
   ucell p[2];
 
@@ -6055,24 +6058,24 @@ static void OPHANDLER_CALL emit_parm2_local(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm2_gvar_num(char *name)
+static void OPHANDLER_CALL emit_parm2_data_any(char *name)
 {
   ucell p[2];
 
   emit_param_data(&p[0],1);
-  emit_param_num(&p[1],1);
+  emit_param_any(&p[1],1);
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm3_num(char *name)
+static void OPHANDLER_CALL emit_parm3_any(char *name)
 {
   ucell p[3];
 
-  emit_param_num(p,(sizeof p / sizeof p[0]));
+  emit_param_any(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm3_gvar(char *name)
+static void OPHANDLER_CALL emit_parm3_data(char *name)
 {
   ucell p[3];
 
@@ -6088,15 +6091,15 @@ static void OPHANDLER_CALL emit_parm3_local(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm4_num(char *name)
+static void OPHANDLER_CALL emit_parm4_any(char *name)
 {
   ucell p[4];
 
-  emit_param_num(p,(sizeof p / sizeof p[0]));
+  emit_param_any(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm4_gvar(char *name)
+static void OPHANDLER_CALL emit_parm4_data(char *name)
 {
   ucell p[4];
 
@@ -6112,15 +6115,15 @@ static void OPHANDLER_CALL emit_parm4_local(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm5_num(char *name)
+static void OPHANDLER_CALL emit_parm5_any(char *name)
 {
   ucell p[5];
 
-  emit_param_num(p,(sizeof p / sizeof p[0]));
+  emit_param_any(p,(sizeof p / sizeof p[0]));
   outinstr(name,(sizeof p / sizeof p[0]),p);
 }
 
-static void OPHANDLER_CALL emit_parm5_gvar(char *name)
+static void OPHANDLER_CALL emit_parm5_data(char *name)
 {
   ucell p[5];
 
@@ -6141,7 +6144,7 @@ static void OPHANDLER_CALL emit_do_switch(char *name)
   ucell p[2];
   int lbl_table;
 
-  emit_param_num(&p[0],1);
+  emit_param_any(&p[0],1);
   emit_param_label(&p[1]);
   lbl_table=getlabel();
   stgwrite("\tswitch ");
@@ -6159,7 +6162,7 @@ static void OPHANDLER_CALL emit_do_case(char *name)
 {
   ucell p[2];
 
-  emit_param_num(&p[0],1);
+  emit_param_any(&p[0],1);
   emit_param_label(&p[1]);
   stgwrite("\tcase ");
   outval(p[0],FALSE);
@@ -6193,20 +6196,20 @@ static void OPHANDLER_CALL emit_do_call(char *name)
   if (tok!=tSYMBOL) {
     emit_invalid_token(tSYMBOL,tok);
     return;
-  }
+  } /* if */
   sym=findglb(str,sGLOBAL);
   if (sym==NULL) {
     error(17,str); /* undefined symbol */
     return;
-  }
-  if (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && sym->ident!=iVARARGS) {
+  } /* if */
+  if (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC) {
     emit_invalid_token(teFUNCTN,(sym->ident==iCONSTEXPR) ? teNUMBER : teDATA);
     return;
-  }
+  } /* if */
   if ((sym->usage & uNATIVE)!=0) {
     emit_invalid_token(teFUNCTN,teNATIVE);
     return;
-  }
+  } /* if */
   stgwrite("\t");
   stgwrite(name);
   stgwrite(" .");
@@ -6219,81 +6222,81 @@ static void OPHANDLER_CALL emit_do_call(char *name)
 static EMIT_OPCODE emit_opcodelist[] = {
   {  0, NULL,         emit_noop },
   { 78, "add",        emit_parm0 },
-  { 87, "add.c",      emit_parm1_num },
-  { 14, "addr.alt",   emit_parm1_num },
-  { 13, "addr.pri",   emit_parm1_num },
-  { 30, "align.alt",  emit_parm1_num },
-  { 29, "align.pri",  emit_parm1_num },
+  { 87, "add.c",      emit_parm1_any },
+  { 14, "addr.alt",   emit_parm1_any },
+  { 13, "addr.pri",   emit_parm1_any },
+  { 30, "align.alt",  emit_parm1_any },
+  { 29, "align.pri",  emit_parm1_any },
   { 81, "and",        emit_parm0 },
-  {121, "bounds",     emit_parm1_num },
+  {121, "bounds",     emit_parm1_any },
   {137, "break",      emit_parm0 },
   { 49, "call",       emit_do_call },
   { 50, "call.pri",   emit_parm0 },
   {  0, "case",       emit_do_case },
 /*{130, "casetbl",    emit_parm0 }, */
-  {118, "cmps",       emit_parm1_num },
-  {156, "const",      emit_parm2_gvar_num },
-  { 12, "const.alt",  emit_parm1_num },
-  { 11, "const.pri",  emit_parm1_num },
+  {118, "cmps",       emit_parm1_any },
+  {156, "const",      emit_parm2_data_any },
+  { 12, "const.alt",  emit_parm1_any },
+  { 11, "const.pri",  emit_parm1_any },
   {157, "const.s",    emit_parm2_local },
-  {114, "dec",        emit_parm1_gvar },
+  {114, "dec",        emit_parm1_data },
   {113, "dec.alt",    emit_parm0 },
   {116, "dec.i",      emit_parm0 },
   {112, "dec.pri",    emit_parm0 },
   {115, "dec.s",      emit_parm1_local },
   { 95, "eq",         emit_parm0 },
-  {106, "eq.c.alt",   emit_parm1_num },
-  {105, "eq.c.pri",   emit_parm1_num },
+  {106, "eq.c.alt",   emit_parm1_any },
+  {105, "eq.c.pri",   emit_parm1_any },
 /*{124, "file",       do_file }, */
-  {119, "fill",       emit_parm1_num },
+  {119, "fill",       emit_parm1_any },
   {100, "geq",        emit_parm0 },
   { 99, "grtr",       emit_parm0 },
-  {120, "halt",       emit_parm1_num },
-  { 45, "heap",       emit_parm1_num },
+  {120, "halt",       emit_parm1_any },
+  { 45, "heap",       emit_parm1_any },
   { 27, "idxaddr",    emit_parm0 },
-  { 28, "idxaddr.b",  emit_parm1_num },
-  {109, "inc",        emit_parm1_gvar },
+  { 28, "idxaddr.b",  emit_parm1_any },
+  {109, "inc",        emit_parm1_data },
   {108, "inc.alt",    emit_parm0 },
   {111, "inc.i",      emit_parm0 },
   {107, "inc.pri",    emit_parm0 },
   {110, "inc.s",      emit_parm1_local },
   { 86, "invert",     emit_parm0 },
-  { 55, "jeq",        emit_parm1_lbl },
-  { 60, "jgeq",       emit_parm1_lbl },
-  { 59, "jgrtr",      emit_parm1_lbl },
-  { 58, "jleq",       emit_parm1_lbl },
-  { 57, "jless",      emit_parm1_lbl },
-  { 56, "jneq",       emit_parm1_lbl },
-  { 54, "jnz",        emit_parm1_lbl },
-  { 52, "jrel",       emit_parm1_num },
-  { 64, "jsgeq",      emit_parm1_lbl },
-  { 63, "jsgrtr",     emit_parm1_lbl },
-  { 62, "jsleq",      emit_parm1_lbl },
-  { 61, "jsless",     emit_parm1_lbl },
-  { 51, "jump",       emit_parm1_lbl },
+  { 55, "jeq",        emit_parm1_label },
+  { 60, "jgeq",       emit_parm1_label },
+  { 59, "jgrtr",      emit_parm1_label },
+  { 58, "jleq",       emit_parm1_label },
+  { 57, "jless",      emit_parm1_label },
+  { 56, "jneq",       emit_parm1_label },
+  { 54, "jnz",        emit_parm1_label },
+  { 52, "jrel",       emit_parm1_any },
+  { 64, "jsgeq",      emit_parm1_label },
+  { 63, "jsgrtr",     emit_parm1_label },
+  { 62, "jsleq",      emit_parm1_label },
+  { 61, "jsless",     emit_parm1_label },
+  { 51, "jump",       emit_parm1_label },
   {128, "jump.pri",   emit_parm0 },
-  { 53, "jzer",       emit_parm1_lbl },
-  { 31, "lctrl",      emit_parm1_num },
+  { 53, "jzer",       emit_parm1_label },
+  { 31, "lctrl",      emit_parm1_any },
   { 98, "leq",        emit_parm0 },
   { 97, "less",       emit_parm0 },
   { 25, "lidx",       emit_parm0 },
-  { 26, "lidx.b",     emit_parm1_num },
-/*{125, "line",       emit_parm2_num }, */
-  {  2, "load.alt",   emit_parm1_gvar },
-  {154, "load.both",  emit_parm2_gvar },
+  { 26, "lidx.b",     emit_parm1_any },
+/*{125, "line",       emit_parm2_any }, */
+  {  2, "load.alt",   emit_parm1_data },
+  {154, "load.both",  emit_parm2_data },
   {  9, "load.i",     emit_parm0 },
-  {  1, "load.pri",   emit_parm1_gvar },
+  {  1, "load.pri",   emit_parm1_data },
   {  4, "load.s.alt", emit_parm1_local },
   {155, "load.s.both",emit_parm2_local },
   {  3, "load.s.pri", emit_parm1_local },
   { 10, "lodb.i",     emit_do_lodb_strb },
-  {  6, "lref.alt",   emit_parm1_gvar },
-  {  5, "lref.pri",   emit_parm1_gvar },
+  {  6, "lref.alt",   emit_parm1_data },
+  {  5, "lref.pri",   emit_parm1_data },
   {  8, "lref.s.alt", emit_parm1_local },
   {  7, "lref.s.pri", emit_parm1_local },
   { 34, "move.alt",   emit_parm0 },
   { 33, "move.pri",   emit_parm0 },
-  {117, "movs",       emit_parm1_num },
+  {117, "movs",       emit_parm1_any },
   { 85, "neg",        emit_parm0 },
   { 96, "neq",        emit_parm0 },
   {134, "nop",        emit_parm0 },
@@ -6302,58 +6305,58 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 43, "pop.alt",    emit_parm0 },
   { 42, "pop.pri",    emit_parm0 },
   { 46, "proc",       emit_parm0 },
-  { 40, "push",       emit_parm1_gvar },
+  { 40, "push",       emit_parm1_data },
   {133, "push.adr",   emit_parm1_local },
   { 37, "push.alt",   emit_parm0 },
-  { 39, "push.c",     emit_parm1_num },
+  { 39, "push.c",     emit_parm1_any },
   { 36, "push.pri",   emit_parm0 },
-  { 38, "push.r",     emit_parm1_num },
+  { 38, "push.r",     emit_parm1_any },
   { 41, "push.s",     emit_parm1_local },
-  {139, "push2",      emit_parm2_gvar },
+  {139, "push2",      emit_parm2_data },
   {141, "push2.adr",  emit_parm2_local },
-  {138, "push2.c",    emit_parm2_num },
+  {138, "push2.c",    emit_parm2_any },
   {140, "push2.s",    emit_parm2_local },
-  {143, "push3",      emit_parm3_gvar },
+  {143, "push3",      emit_parm3_data },
   {145, "push3.adr",  emit_parm3_local },
-  {142, "push3.c",    emit_parm3_num },
+  {142, "push3.c",    emit_parm3_any },
   {144, "push3.s",    emit_parm3_local },
-  {147, "push4",      emit_parm4_gvar },
+  {147, "push4",      emit_parm4_data },
   {149, "push4.adr",  emit_parm4_local },
-  {146, "push4.c",    emit_parm4_num },
+  {146, "push4.c",    emit_parm4_any },
   {148, "push4.s",    emit_parm4_local },
-  {151, "push5",      emit_parm5_gvar },
+  {151, "push5",      emit_parm5_data },
   {153, "push5.adr",  emit_parm5_local },
-  {150, "push5.c",    emit_parm5_num },
+  {150, "push5.c",    emit_parm5_any },
   {152, "push5.s",    emit_parm5_local },
   { 47, "ret",        emit_parm0 },
   { 48, "retn",       emit_parm0 },
-  { 32, "sctrl",      emit_parm1_num },
+  { 32, "sctrl",      emit_parm1_any },
   { 73, "sdiv",       emit_parm0 },
   { 74, "sdiv.alt",   emit_parm0 },
   {104, "sgeq",       emit_parm0 },
   {103, "sgrtr",      emit_parm0 },
   { 65, "shl",        emit_parm0 },
-  { 69, "shl.c.alt",  emit_parm1_num },
-  { 68, "shl.c.pri",  emit_parm1_num },
+  { 69, "shl.c.alt",  emit_parm1_any },
+  { 68, "shl.c.pri",  emit_parm1_any },
   { 66, "shr",        emit_parm0 },
-  { 71, "shr.c.alt",  emit_parm1_num },
-  { 70, "shr.c.pri",  emit_parm1_num },
+  { 71, "shr.c.alt",  emit_parm1_any },
+  { 70, "shr.c.pri",  emit_parm1_any },
   { 94, "sign.alt",   emit_parm0 },
   { 93, "sign.pri",   emit_parm0 },
   {102, "sleq",       emit_parm0 },
   {101, "sless",      emit_parm0 },
   { 72, "smul",       emit_parm0 },
-  { 88, "smul.c",     emit_parm1_num },
-/*{127, "srange",     emit_parm2_num }, */
-  { 20, "sref.alt",   emit_parm1_gvar },
-  { 19, "sref.pri",   emit_parm1_gvar },
+  { 88, "smul.c",     emit_parm1_any },
+/*{127, "srange",     emit_parm2_any }, */
+  { 20, "sref.alt",   emit_parm1_data },
+  { 19, "sref.pri",   emit_parm1_data },
   { 22, "sref.s.alt", emit_parm1_local },
   { 21, "sref.s.pri", emit_parm1_local },
   { 67, "sshr",       emit_parm0 },
-  { 44, "stack",      emit_parm1_num },
-  { 16, "stor.alt",   emit_parm1_gvar },
+  { 44, "stack",      emit_parm1_any },
+  { 16, "stor.alt",   emit_parm1_data },
   { 23, "stor.i",     emit_parm0 },
-  { 15, "stor.pri",   emit_parm1_gvar },
+  { 15, "stor.pri",   emit_parm1_data },
   { 18, "stor.s.alt", emit_parm1_local },
   { 17, "stor.s.pri", emit_parm1_local },
   { 24, "strb.i",     emit_do_lodb_strb },
@@ -6363,16 +6366,16 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {131, "swap.pri",   emit_parm0 },
   {129, "switch",     emit_do_switch },
 /*{126, "symbol",     do_symbol }, */
-/*{136, "symtag",     emit_parm1_num }, */
-  {123, "sysreq.c",   emit_parm1_num },
-  {135, "sysreq.n",   emit_parm2_num },
+/*{136, "symtag",     emit_parm1_any }, */
+  {123, "sysreq.c",   emit_parm1_any },
+  {135, "sysreq.n",   emit_parm2_any },
   {122, "sysreq.pri", emit_parm0 },
   { 76, "udiv",       emit_parm0 },
   { 77, "udiv.alt",   emit_parm0 },
   { 75, "umul",       emit_parm0 },
   { 35, "xchg",       emit_parm0 },
   { 83, "xor",        emit_parm0 },
-  { 91, "zero",       emit_parm1_gvar },
+  { 91, "zero",       emit_parm1_data },
   { 90, "zero.alt",   emit_parm0 },
   { 89, "zero.pri",   emit_parm0 },
   { 92, "zero.s",     emit_parm1_local },
@@ -6454,13 +6457,13 @@ static void doemit(void)
   char *st;
 
   emit_block_parsing=FALSE;
-  if (matchtoken('{')) {
+  if (matchtoken((int)'{')) {
     lexpush();
     emit_block_parsing=TRUE;
   } else {
     lex(&val,&st);
     emit_parse_line();
-  }
+  } /* if */
 }
 
 /*  fetchlab

From 15e53272afb7456293b8d78c2afa756370c3ec01 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sat, 18 Nov 2017 01:12:47 +0700
Subject: [PATCH 25/43] emit/__emit: Allow named constants with 'lodb.i' and
 'strb.i'

---
 source/compiler/sc1.c | 73 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 64 insertions(+), 9 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 272502b..ee1c70b 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5977,6 +5977,66 @@ static void emit_param_local(ucell *p,int size)
   } while (++curp<size);
 }
 
+static void emit_param_index(ucell *p, const cell *valid_values, int size)
+{
+  cell val;
+  char *str;
+  symbol *sym;
+  int tok,i;
+  int neg=0;
+
+  assert(size>0);
+fetchtok:
+  tok=lex(&val,&str);
+  switch (tok) {
+  case tNUMBER:
+    if (neg!=0)
+      val=-val;
+    break;
+  case tRATIONAL:
+    if (neg!=0)
+      val=val|((cell)1 << (PAWN_CELL_SIZE-1));
+    break;
+  case tSYMBOL:
+  	sym=findloc(str);
+    if (sym==NULL)
+      sym=findglb(str,sSTATEVAR);
+    if (sym==NULL) {
+      error(17,str);    /* undefined symbol */
+      return;
+    } /* if */
+    switch (sym->ident) {
+    case iCONSTEXPR:
+      break;
+    case iFUNCTN:
+    case iREFFUNC:
+      tok=((sym->usage & uNATIVE)!=0) ? teNATIVE : teFUNCTN;
+      /* drop through */
+    default:
+      if (tok==tSYMBOL)
+        tok=teDATA;
+      emit_invalid_token(teNUMBER,tok);
+      return;
+    } /* switch */
+    markusage(sym,uREAD);
+    val=(neg!=0) ? -sym->addr : sym->addr;
+    break;
+  default:
+    if (tok==(int)'-' && neg==0) {
+      neg=1;
+      goto fetchtok;
+    } /* if */
+    emit_invalid_token(teNUMBER,tok);
+    return;
+  } /* switch */
+
+  *p=val;
+  for (i=0; i<size; i++)
+    if (val==valid_values[i])
+      return;
+  error(50);    /* invalid range */
+}
+
 static void emit_param_label(ucell *p)
 {
   cell val;
@@ -6173,16 +6233,11 @@ static void OPHANDLER_CALL emit_do_case(char *name)
 
 static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
 {
-  cell val;
-  char *str;
-  int tok;
+  static const cell valid_values[] = { 1, 2, 4 };
+  ucell p[1];
 
-  tok=lex(&val,&str);
-  if (tok!=tNUMBER)
-    emit_invalid_token(tNUMBER,tok);
-  if (val!=1 && val!=2 && val!=4)
-    error(50);  /* invalid range */
-  outinstr(name,1,(ucell *)&val);
+  emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),&p[0]);
 }
 
 static void OPHANDLER_CALL emit_do_call(char *name)

From 60ca0009f31323c7c71d11fb00654567d3e82ae1 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sat, 18 Nov 2017 01:34:37 +0700
Subject: [PATCH 26/43] emit/__emit: Also check the arguments of 'lctrl' and
 'sctrl'

---
 source/compiler/sc1.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index ee1c70b..d7a7ee2 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6240,6 +6240,24 @@ static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
   outinstr(name,(sizeof p / sizeof p[0]),&p[0]);
 }
 
+static void OPHANDLER_CALL emit_do_lctrl(char *name)
+{
+  static const cell valid_values[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+  ucell p[1];
+
+  emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),&p[0]);
+}
+
+static void OPHANDLER_CALL emit_do_sctrl(char *name)
+{
+  static const cell valid_values[] = { 2, 4, 5, 6 };
+  ucell p[1];
+
+  emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
+  outinstr(name,(sizeof p / sizeof p[0]),&p[0]);
+}
+
 static void OPHANDLER_CALL emit_do_call(char *name)
 {
   cell val;
@@ -6331,7 +6349,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 51, "jump",       emit_parm1_label },
   {128, "jump.pri",   emit_parm0 },
   { 53, "jzer",       emit_parm1_label },
-  { 31, "lctrl",      emit_parm1_any },
+  { 31, "lctrl",      emit_do_lctrl },
   { 98, "leq",        emit_parm0 },
   { 97, "less",       emit_parm0 },
   { 25, "lidx",       emit_parm0 },
@@ -6385,7 +6403,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {152, "push5.s",    emit_parm5_local },
   { 47, "ret",        emit_parm0 },
   { 48, "retn",       emit_parm0 },
-  { 32, "sctrl",      emit_parm1_any },
+  { 32, "sctrl",      emit_do_sctrl },
   { 73, "sdiv",       emit_parm0 },
   { 74, "sdiv.alt",   emit_parm0 },
   {104, "sgeq",       emit_parm0 },

From 7f9be674978deb81ae46d915dc347c3748eb5765 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sat, 18 Nov 2017 23:42:04 +0700
Subject: [PATCH 27/43] emit/__emit: Change the argument order in 'outinstr()'

Now the function takes the array itself before the array size, as the argument handlers in sc1.c do.
---
 source/compiler/sc.h  |  2 +-
 source/compiler/sc1.c | 42 +++++++++++++++++++++---------------------
 source/compiler/sc4.c |  6 +++---
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index 7fad6a1..f4369df 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -701,7 +701,7 @@ SC_FUNC void dec(value *lval);
 SC_FUNC void jmp_ne0(int number);
 SC_FUNC void jmp_eq0(int number);
 SC_FUNC void outval(cell val,int newline);
-SC_FUNC void outinstr(const char *name,int nargs,ucell *args);
+SC_FUNC void outinstr(const char *name,ucell args[],int numargs);
 
 /* function prototypes in SC5.C */
 SC_FUNC int error(int number,...);
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index d7a7ee2..7f16421 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6059,7 +6059,7 @@ static void OPHANDLER_CALL emit_noop(char *name)
 
 static void OPHANDLER_CALL emit_parm0(char *name)
 {
-  outinstr(name,0,NULL);
+  outinstr(name,NULL,0);
 }
 
 static void OPHANDLER_CALL emit_parm1_any(char *name)
@@ -6067,7 +6067,7 @@ static void OPHANDLER_CALL emit_parm1_any(char *name)
   ucell p[1];
 
   emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm1_data(char *name)
@@ -6075,7 +6075,7 @@ static void OPHANDLER_CALL emit_parm1_data(char *name)
   ucell p[1];
 
   emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm1_local(char *name)
@@ -6083,7 +6083,7 @@ static void OPHANDLER_CALL emit_parm1_local(char *name)
   ucell p[1];
 
   emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm1_label(char *name)
@@ -6091,7 +6091,7 @@ static void OPHANDLER_CALL emit_parm1_label(char *name)
   ucell p[1];
 
   emit_param_label(&p[0]);
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm2_any(char *name)
@@ -6099,7 +6099,7 @@ static void OPHANDLER_CALL emit_parm2_any(char *name)
   ucell p[2];
 
   emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm2_data(char *name)
@@ -6107,7 +6107,7 @@ static void OPHANDLER_CALL emit_parm2_data(char *name)
   ucell p[2];
 
   emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm2_local(char *name)
@@ -6115,7 +6115,7 @@ static void OPHANDLER_CALL emit_parm2_local(char *name)
   ucell p[2];
 
   emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm2_data_any(char *name)
@@ -6124,7 +6124,7 @@ static void OPHANDLER_CALL emit_parm2_data_any(char *name)
 
   emit_param_data(&p[0],1);
   emit_param_any(&p[1],1);
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm3_any(char *name)
@@ -6132,7 +6132,7 @@ static void OPHANDLER_CALL emit_parm3_any(char *name)
   ucell p[3];
 
   emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm3_data(char *name)
@@ -6140,7 +6140,7 @@ static void OPHANDLER_CALL emit_parm3_data(char *name)
   ucell p[3];
 
   emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm3_local(char *name)
@@ -6148,7 +6148,7 @@ static void OPHANDLER_CALL emit_parm3_local(char *name)
   ucell p[3];
 
   emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm4_any(char *name)
@@ -6156,7 +6156,7 @@ static void OPHANDLER_CALL emit_parm4_any(char *name)
   ucell p[4];
 
   emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm4_data(char *name)
@@ -6164,7 +6164,7 @@ static void OPHANDLER_CALL emit_parm4_data(char *name)
   ucell p[4];
 
   emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm4_local(char *name)
@@ -6172,7 +6172,7 @@ static void OPHANDLER_CALL emit_parm4_local(char *name)
   ucell p[4];
 
   emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm5_any(char *name)
@@ -6180,7 +6180,7 @@ static void OPHANDLER_CALL emit_parm5_any(char *name)
   ucell p[5];
 
   emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm5_data(char *name)
@@ -6188,7 +6188,7 @@ static void OPHANDLER_CALL emit_parm5_data(char *name)
   ucell p[5];
 
   emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_parm5_local(char *name)
@@ -6196,7 +6196,7 @@ static void OPHANDLER_CALL emit_parm5_local(char *name)
   ucell p[5];
 
   emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),p);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_do_switch(char *name)
@@ -6237,7 +6237,7 @@ static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),&p[0]);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_do_lctrl(char *name)
@@ -6246,7 +6246,7 @@ static void OPHANDLER_CALL emit_do_lctrl(char *name)
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),&p[0]);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_do_sctrl(char *name)
@@ -6255,7 +6255,7 @@ static void OPHANDLER_CALL emit_do_sctrl(char *name)
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
-  outinstr(name,(sizeof p / sizeof p[0]),&p[0]);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static void OPHANDLER_CALL emit_do_call(char *name)
diff --git a/source/compiler/sc4.c b/source/compiler/sc4.c
index 9ae173c..2d9e2b8 100644
--- a/source/compiler/sc4.c
+++ b/source/compiler/sc4.c
@@ -1379,19 +1379,19 @@ SC_FUNC void outval(cell val,int newline)
 }
 
 /* write an instruction with arguments */
-SC_FUNC void outinstr(const char *name, int nargs, ucell *args)
+SC_FUNC void outinstr(const char *name,ucell args[],int numargs)
 {
   int i;
 
   stgwrite("\t");
   stgwrite(name);
 
-  for (i=0; i<nargs; i++) {
+  for (i=0; i<numargs; i++) {
     stgwrite(" ");
     stgwrite(itoh(args[i]));
   } /* for */
 
   stgwrite("\n");
 
-  code_idx+=opargs(nargs)+opcodes(1);
+  code_idx+=opargs(numargs)+opcodes(1);
 }

From b52e32d1bc9db1f7a90783f7d866b9dad4212043 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 19 Nov 2017 01:56:02 +0700
Subject: [PATCH 28/43] emit/__emit: Move 'fetchlab()' closer to 'dogoto()' and
 'dolabel()'

---
 source/compiler/sc1.c | 50 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 7f16421..1d59070 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5828,6 +5828,31 @@ static void dolabel(void)
   sym->usage|=uDEFINE;  /* label is now defined */
 }
 
+/*  fetchlab
+ *
+ *  Finds a label from the (local) symbol table or adds one to it.
+ *  Labels are local in scope.
+ *
+ *  Note: The "_usage" bit is set to zero. The routines that call "fetchlab()"
+ *        must set this bit accordingly.
+ */
+static symbol *fetchlab(char *name)
+{
+  symbol *sym;
+
+  sym=findloc(name);            /* labels are local in scope */
+  if (sym) {
+    if (sym->ident!=iLABEL)
+      error(19,sym->name);      /* not a label: ... */
+  } else {
+    sym=addsym(name,getlabel(),iLABEL,sLOCAL,0,0);
+    assert(sym!=NULL);          /* fatal error 103 must be given on error */
+    sym->x.declared=(int)declared;
+    sym->compound=nestlevel;
+  } /* if */
+  return sym;
+}
+
 static void emit_invalid_token(int expected_token,int found_token)
 {
   char s[2];
@@ -6539,31 +6564,6 @@ static void doemit(void)
   } /* if */
 }
 
-/*  fetchlab
- *
- *  Finds a label from the (local) symbol table or adds one to it.
- *  Labels are local in scope.
- *
- *  Note: The "_usage" bit is set to zero. The routines that call "fetchlab()"
- *        must set this bit accordingly.
- */
-static symbol *fetchlab(char *name)
-{
-  symbol *sym;
-
-  sym=findloc(name);            /* labels are local in scope */
-  if (sym){
-    if (sym->ident!=iLABEL)
-      error(19,sym->name);      /* not a label: ... */
-  } else {
-    sym=addsym(name,getlabel(),iLABEL,sLOCAL,0,0);
-    assert(sym!=NULL);          /* fatal error 103 must be given on error */
-    sym->x.declared=(int)declared;
-    sym->compound=nestlevel;
-  } /* if */
-  return sym;
-}
-
 /* isvariadic
  *
  * Checks if the function is variadic.

From 40bf47c6b51019b9f4121da1763b72fe92a78680 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 19 Nov 2017 02:41:34 +0700
Subject: [PATCH 29/43] emit/__emit: Allow direct use of opcode 'casetbl'

---
 source/compiler/sc1.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 1d59070..7ff9cbb 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6224,23 +6224,19 @@ static void OPHANDLER_CALL emit_parm5_local(char *name)
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_do_switch(char *name)
+static void OPHANDLER_CALL emit_do_casetbl(char *name)
 {
   ucell p[2];
-  int lbl_table;
 
+  (void)name;
   emit_param_any(&p[0],1);
   emit_param_label(&p[1]);
-  lbl_table=getlabel();
-  stgwrite("\tswitch ");
-  outval((cell)lbl_table,TRUE);
-  setlabel(lbl_table);
   stgwrite("\tcasetbl\n");
   stgwrite("\tcase ");
   outval(p[0],FALSE);
   stgwrite(" ");
   outval(p[1],TRUE);
-  code_idx+=opcodes(2)+opargs(3);
+  code_idx+=opcodes(1)+opargs(2);
 }
 
 static void OPHANDLER_CALL emit_do_case(char *name)
@@ -6331,7 +6327,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 49, "call",       emit_do_call },
   { 50, "call.pri",   emit_parm0 },
   {  0, "case",       emit_do_case },
-/*{130, "casetbl",    emit_parm0 }, */
+  {130, "casetbl",    emit_do_casetbl },
   {118, "cmps",       emit_parm1_any },
   {156, "const",      emit_parm2_data_any },
   { 12, "const.alt",  emit_parm1_any },
@@ -6462,7 +6458,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 80, "sub.alt",    emit_parm0 },
   {132, "swap.alt",   emit_parm0 },
   {131, "swap.pri",   emit_parm0 },
-  {129, "switch",     emit_do_switch },
+  {129, "switch",     emit_parm1_label },
 /*{126, "symbol",     do_symbol }, */
 /*{136, "symtag",     emit_parm1_any }, */
   {123, "sysreq.c",   emit_parm1_any },
@@ -6539,6 +6535,8 @@ SC_FUNC void emit_parse_line(void)
   } else if (tok==tLABEL) {
     if (!emit_block_parsing)
       error(38);  /* extra characters on line */
+    if (find_constval(&tagname_tab,st,0)!=NULL)
+      error(221,st);    /* label name shadows tagname */
     sym=fetchlab(st);
     setlabel((int)sym->addr);
     sym->usage|=uDEFINE;

From 23ab402763f3e6147fa5bc5ab6edff3d9a95107b Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 19 Nov 2017 16:15:12 +0700
Subject: [PATCH 30/43] emit/__emit: Fix argument handling in 'const.s'

---
 source/compiler/sc1.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 7ff9cbb..619f878 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6002,7 +6002,7 @@ static void emit_param_local(ucell *p,int size)
   } while (++curp<size);
 }
 
-static void emit_param_index(ucell *p, const cell *valid_values, int size)
+static void emit_param_index(ucell *p,const cell *valid_values,int size)
 {
   cell val;
   char *str;
@@ -6152,6 +6152,15 @@ static void OPHANDLER_CALL emit_parm2_data_any(char *name)
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
+static void OPHANDLER_CALL emit_parm2_local_any(char *name)
+{
+  ucell p[2];
+
+  emit_param_local(&p[0],1);
+  emit_param_any(&p[1],1);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
+}
+
 static void OPHANDLER_CALL emit_parm3_any(char *name)
 {
   ucell p[3];
@@ -6254,7 +6263,7 @@ static void OPHANDLER_CALL emit_do_case(char *name)
 
 static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
 {
-  static const cell valid_values[] = { 1, 2, 4 };
+  static const cell valid_values[] = { 1,2,4 };
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
@@ -6263,7 +6272,7 @@ static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
 
 static void OPHANDLER_CALL emit_do_lctrl(char *name)
 {
-  static const cell valid_values[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+  static const cell valid_values[] = { 0,1,2,3,4,5,6,7 };
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
@@ -6272,7 +6281,7 @@ static void OPHANDLER_CALL emit_do_lctrl(char *name)
 
 static void OPHANDLER_CALL emit_do_sctrl(char *name)
 {
-  static const cell valid_values[] = { 2, 4, 5, 6 };
+  static const cell valid_values[] = { 2,4,5,6 };
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
@@ -6332,7 +6341,7 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {156, "const",      emit_parm2_data_any },
   { 12, "const.alt",  emit_parm1_any },
   { 11, "const.pri",  emit_parm1_any },
-  {157, "const.s",    emit_parm2_local },
+  {157, "const.s",    emit_parm2_local_any },
   {114, "dec",        emit_parm1_data },
   {113, "dec.alt",    emit_parm0 },
   {116, "dec.i",      emit_parm0 },

From afc829977eda17d5282f589799858950ccaebfff Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Thu, 23 Nov 2017 18:31:00 +0700
Subject: [PATCH 31/43] emit/__emit: Add support for 'lctrl 8/9' and 'sctrl
 8/9'

---
 source/compiler/sc1.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 619f878..db7575b 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5911,11 +5911,12 @@ static void emit_param_any(ucell *p,int size)
         if (neg==0) {
           neg=1;
           goto fetchtok;
+        } else {
+          char ival[sNAMEMAX+2]="-";
+          strcpy(ival+1,str);
+          error(1,sc_tokens[tSYMBOL-tFIRST],ival);
+          break;
         } /* if */
-        char ival[sNAMEMAX+2]="-";
-        strcpy(ival+1,str);
-        error(1,sc_tokens[tSYMBOL-tFIRST],ival);
-        break;
       } /* if */
       emit_invalid_token(teNUMBER,tok);
     } /* switch */
@@ -6272,7 +6273,7 @@ static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
 
 static void OPHANDLER_CALL emit_do_lctrl(char *name)
 {
-  static const cell valid_values[] = { 0,1,2,3,4,5,6,7 };
+  static const cell valid_values[] = { 0,1,2,3,4,5,6,7,8,9 };
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));
@@ -6281,7 +6282,7 @@ static void OPHANDLER_CALL emit_do_lctrl(char *name)
 
 static void OPHANDLER_CALL emit_do_sctrl(char *name)
 {
-  static const cell valid_values[] = { 2,4,5,6 };
+  static const cell valid_values[] = { 2,4,5,6,8,9 };
   ucell p[1];
 
   emit_param_index(&p[0],valid_values,(sizeof valid_values / sizeof valid_values[0]));

From 907c4b610e353dbc143d674c260912345d99f132 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Wed, 29 Nov 2017 21:50:13 +0700
Subject: [PATCH 32/43] emit/__emit: Syntax change

---
 source/compiler/sc.h     | 11 +++++++-
 source/compiler/sc1.c    | 59 +++++++++++++++++++++++++---------------
 source/compiler/sc3.c    | 10 +++----
 source/compiler/scvars.c |  2 +-
 4 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index f4369df..f403e45 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -870,7 +870,16 @@ SC_VDECL FILE *outf;          /* file written to */
 
 SC_VDECL jmp_buf errbuf;      /* target of longjmp() on a fatal error */
 
-SC_VDECL int emit_block_parsing;
+
+/*  Possible entries for "emit_parsing_mode"
+ *  Bits: 0     (epmBLOCK) multiline ('{}' block) syntax
+ *        1     (epmEXPR) used within an expression
+ *        2     (epmGLOBAL) used outside of function
+ */
+#define epmBLOCK    1
+#define epmEXPR     2
+#define epmGLOBAL   4
+SC_VDECL int emit_parsing_mode;
 
 #if !defined SC_LIGHT
   SC_VDECL int sc_makereport; /* generate a cross-reference report */
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index db7575b..3c0f282 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -895,7 +895,7 @@ static void resetglobals(void)
   sc_curstates=0;
   pc_memflags=0;
   pc_naked=FALSE;
-  emit_block_parsing=FALSE;
+  emit_parsing_mode=0;
 }
 
 static void initglobals(void)
@@ -1652,9 +1652,10 @@ static void parse(void)
       break;
     case tEMIT:
     case t__EMIT:
-      emit_block_parsing=FALSE;
+      emit_parsing_mode |= epmGLOBAL;
       lex(&val,&str);
       emit_parse_line();
+      emit_parsing_mode &= ~epmGLOBAL;
       break;
     case tNEW:
       if (getclassspec(tok,&fpublic,&fstatic,&fstock,&fconst))
@@ -5102,10 +5103,10 @@ static void statement(int *lastindent,int allow_decl)
   if (tok==tEMIT || tok==t__EMIT) {
     doemit();
     return;
-  } else if (emit_block_parsing) {
+  } else if ((emit_parsing_mode & epmBLOCK)!=0) {
     emit_parse_line();
     return;
-  }
+  } /* if */
   if (tok!='{') {
     insert_dbgline(fline);
     setline(TRUE);
@@ -6527,33 +6528,48 @@ SC_FUNC void emit_parse_line(void)
       len=strlen(sc_tokens[tok-tFIRST]);
     else
       len=strlen(st);
+
+    /* move back to the start of the last fetched token
+     * and copy the instruction name
+     */
     lptr-=len;
     for(i=0; i<sizeof(name) && (isalnum(*lptr) || *lptr=='.'); ++i,++lptr)
       name[i]=(char)tolower(*lptr);
     name[i]='\0';
+
+    /* find the corresponding argument handler and call it */
     i=emit_findopcode(name,strlen(name));
     if (emit_opcodelist[i].name==NULL && *name!='\0')
       error(104,name); /* invalid assembler instruction */
     emit_opcodelist[i].func(name);
-    /* make sure the string only contains whitespaces
-     * and/or an optional trailing '}'
-     */
-    while (*lptr<=' ' && *lptr!='\0')
-      lptr++;
-    if (*lptr!='\0' && *lptr!='}')
-      error(38);  /* extra characters on line */
+
+    if ((emit_parsing_mode & epmEXPR)==0) {
+      /* make sure the string only contains whitespaces
+       * and/or an optional trailing '}' or ';'
+       */
+      while (*lptr<=' ' && *lptr!='\0')
+        lptr++;
+      if (*lptr!='\0' && *lptr!='}' && (*lptr!=';' || (emit_parsing_mode & epmBLOCK)!=0))
+        error(38);  /* extra characters on line */
+    } /* if */
   } else if (tok==tLABEL) {
-    if (!emit_block_parsing)
-      error(38);  /* extra characters on line */
-    if (find_constval(&tagname_tab,st,0)!=NULL)
+    if ((emit_parsing_mode & epmEXPR)!=0) {
+      error(29);        /* invalid expression, assumed zero */
+    } else if ((emit_parsing_mode & epmGLOBAL)!=0) {
+      error(11);        /* invalid outside functions */
+    } else if (find_constval(&tagname_tab,st,0)!=NULL) {
       error(221,st);    /* label name shadows tagname */
-    sym=fetchlab(st);
-    setlabel((int)sym->addr);
-    sym->usage|=uDEFINE;
+    } else {
+      sym=fetchlab(st);
+      setlabel((int)sym->addr);
+      sym->usage|=uDEFINE;
+    } /* if */
   } /* if */
-  if (!emit_block_parsing || matchtoken('}')) {
+  if ((emit_parsing_mode & epmBLOCK)!=0) {
+    if (matchtoken('}'))
+      emit_parsing_mode &= ~epmBLOCK;
+  } else if ((emit_parsing_mode & epmEXPR)==0) {
     matchtoken(';');
-    emit_block_parsing=FALSE;
   } /* if */
 }
 
@@ -6562,10 +6578,9 @@ static void doemit(void)
   cell val;
   char *st;
 
-  emit_block_parsing=FALSE;
-  if (matchtoken((int)'{')) {
+  if (matchtoken('{')) {
     lexpush();
-    emit_block_parsing=TRUE;
+    emit_parsing_mode |= epmBLOCK;
   } else {
     lex(&val,&st);
     emit_parse_line();
diff --git a/source/compiler/sc3.c b/source/compiler/sc3.c
index de9e89f..cb8ae85 100644
--- a/source/compiler/sc3.c
+++ b/source/compiler/sc3.c
@@ -1452,13 +1452,13 @@ static int hier2(value *lval)
   case t__EMIT: {
     cell val;
     char* st;
-    if (!matchtoken('{'))
-      error(38);    /* extra characters on line */
-    lex(&val,&st);
+    if (matchtoken('{'))
+      error(29);    /* invalid expression, assumed zero */
     lval->ident=iEXPRESSION;
+    emit_parsing_mode |= epmEXPR;
+    lex(&val,&st);
     emit_parse_line();
-    if (!matchtoken('}'))
-      error(38);    /* extra characters on line */
+    emit_parsing_mode &= ~epmEXPR;
     return FALSE;
   } /* case */
   default:
diff --git a/source/compiler/scvars.c b/source/compiler/scvars.c
index 562b767..2038ad8 100644
--- a/source/compiler/scvars.c
+++ b/source/compiler/scvars.c
@@ -105,7 +105,7 @@ SC_VDEFINE FILE *outf    = NULL;   /* (intermediate) text file written to */
 
 SC_VDEFINE jmp_buf errbuf;
 
-SC_VDEFINE int emit_block_parsing=FALSE;
+SC_VDEFINE int emit_parsing_mode=0;
 
 #if !defined SC_LIGHT
   SC_VDEFINE int sc_makereport=FALSE; /* generate a cross-reference report */

From 873060e7e876605eaa1b7b82f524104ee670850d Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sat, 2 Dec 2017 19:02:17 +0700
Subject: [PATCH 33/43] emit/__emit: Do not allow to redefine the same label

---
 source/compiler/sc1.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 3c0f282..670d455 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6561,6 +6561,8 @@ SC_FUNC void emit_parse_line(void)
       error(221,st);    /* label name shadows tagname */
     } else {
       sym=fetchlab(st);
+      if ((sym->usage & uDEFINE)!=0)
+        error(021,st);  /* symbol already defined */
       setlabel((int)sym->addr);
       sym->usage|=uDEFINE;
     } /* if */

From fab8c53db0a86bf54c803419dd56a69cb7ac4c05 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 3 Dec 2017 21:23:36 +0700
Subject: [PATCH 34/43] emit/__emit: Allow the use of constant expressions as
 opcode arguments

---
 source/compiler/sc1.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 670d455..c6dd67a 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5907,18 +5907,21 @@ static void emit_param_any(ucell *p,int size)
       } /* if */
       p[curp]=(neg!=0) ? -sym->addr : sym->addr;
       break;
-    default:
-      if (tok==(int)'-') {
-        if (neg==0) {
-          neg=1;
-          goto fetchtok;
-        } else {
-          char ival[sNAMEMAX+2]="-";
-          strcpy(ival+1,str);
-          error(1,sc_tokens[tSYMBOL-tFIRST],ival);
-          break;
-        } /* if */
+    case '(':
+      constexpr(&val,NULL,NULL);
+      needtoken(')');
+      p[curp]=val;
+      break;
+    case '-':
+      if (neg==0) {
+        neg=1;
+        goto fetchtok;
       } /* if */
+      char ival[sNAMEMAX+2]="-";
+      strcpy(ival+1,str);
+      error(1,sc_tokens[tSYMBOL-tFIRST],ival);
+      break;
+    default:
       emit_invalid_token(teNUMBER,tok);
     } /* switch */
   } while (++curp<size);
@@ -6048,11 +6051,13 @@ fetchtok:
     markusage(sym,uREAD);
     val=(neg!=0) ? -sym->addr : sym->addr;
     break;
-  default:
-    if (tok==(int)'-' && neg==0) {
+  case '-':
+    if (neg==0) {
       neg=1;
       goto fetchtok;
     } /* if */
+    /* drop through */
+  default:
     emit_invalid_token(teNUMBER,tok);
     return;
   } /* switch */

From e922e48aa67c0748f1623efeda90760cef051d65 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 4 Dec 2017 18:18:06 +0700
Subject: [PATCH 35/43] emit/__emit: Fix incorrect code generation

---
 source/compiler/sc1.c | 19 ++++++++++++++-----
 source/compiler/sc3.c | 18 +++++++++++++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index c6dd67a..dad2fb4 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5871,12 +5871,11 @@ static void emit_invalid_token(int expected_token,int found_token)
 static void emit_param_any(ucell *p,int size)
 {
   char *str;
-  cell val;
+  cell val,cidx;
   symbol *sym;
-  int tok;
   extern char *sc_tokens[];
   int curp=0;
-  int neg;
+  int tok,neg,ident,index;
 
   assert(size>0);
   do {
@@ -5908,9 +5907,19 @@ static void emit_param_any(ucell *p,int size)
       p[curp]=(neg!=0) ? -sym->addr : sym->addr;
       break;
     case '(':
-      constexpr(&val,NULL,NULL);
+      if ((emit_parsing_mode & epmEXPR)==0)
+        stgset(TRUE);
+      stgget(&index,&cidx);
+      errorset(sEXPRMARK,0);
+      ident=expression(&val,NULL,NULL,FALSE);
+      if (ident!=iCONSTEXPR)
+        error(8);       /* must be constant expression */
+      errorset(sEXPRRELEASE,0);
+      stgdel(index,cidx);
+      if ((emit_parsing_mode & epmEXPR)==0)
+        stgset(FALSE);
       needtoken(')');
-      p[curp]=val;
+      p[curp]=(neg==0) ? val : -val;
       break;
     case '-':
       if (neg==0) {
diff --git a/source/compiler/sc3.c b/source/compiler/sc3.c
index cb8ae85..c516a0b 100644
--- a/source/compiler/sc3.c
+++ b/source/compiler/sc3.c
@@ -1452,13 +1452,25 @@ static int hier2(value *lval)
   case t__EMIT: {
     cell val;
     char* st;
-    if (matchtoken('{'))
-      error(29);    /* invalid expression, assumed zero */
-    lval->ident=iEXPRESSION;
+    int opt_bck;
+
+    /* write the staging buffer to the output file and temporarily disable
+     * bytecode optimisation so instructions generated by the `emit`/`__emit`
+     * operator won't get altered by the optimizer
+     */
+    stgout(0);
+    opt_bck=pc_optimize;
+    pc_optimize=sOPTIMIZE_NONE;
+
+    /* parse the `emit`/`__emit` expression */
     emit_parsing_mode |= epmEXPR;
     lex(&val,&st);
     emit_parse_line();
     emit_parsing_mode &= ~epmEXPR;
+    lval->ident=iEXPRESSION;
+
+    /* restore the bytecode optimisation level and return */
+    pc_optimize=opt_bck;
     return FALSE;
   } /* case */
   default:

From 5f716b7f62fc9d3fa58932e62eafc39d159c3e5d Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 4 Dec 2017 21:36:58 +0700
Subject: [PATCH 36/43] emit/__emit: Don't allow to use labels as arguments of
 type 'numeric value', 'data offset', 'local variable' and 'function'

---
 source/compiler/sc1.c | 58 ++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index dad2fb4..809ca1f 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5879,24 +5879,28 @@ static void emit_param_any(ucell *p,int size)
 
   assert(size>0);
   do {
-    neg=0;
+    neg=FALSE;
   fetchtok:
     tok=lex(&val,&str);
     switch (tok) {
     case tNUMBER:
-      p[curp]=(neg!=0) ? -val : val;
+      p[curp]=(neg==TRUE) ? -val : val;
       break;
     case tRATIONAL:
-      p[curp]=(neg!=0) ? (val|((cell)1 << (PAWN_CELL_SIZE-1))) : val;
+      p[curp]=(neg==TRUE) ? (val|((cell)1 << (PAWN_CELL_SIZE-1))) : val;
       break;
     case tSYMBOL:
       sym=findloc(str);
       if (sym==NULL)
         sym=findglb(str,sSTATEVAR);
-      if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0) || sym->ident==iLABEL) {
+      if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0)) {
         error(17,str);  /* undefined symbol */
         break;
       } /* if */
+      if (sym->ident==iLABEL) {
+        emit_invalid_token(teNUMBER,tLABEL);
+        break;
+      } /* if */
       if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
         if ((sym->usage & uNATIVE)!=0 && (sym->usage & uREAD)==0 && sym->addr>=0)
           sym->addr=ntv_funcid++;
@@ -5904,7 +5908,7 @@ static void emit_param_any(ucell *p,int size)
       } else {
         markusage(sym,uREAD|uWRITTEN);
       } /* if */
-      p[curp]=(neg!=0) ? -sym->addr : sym->addr;
+      p[curp]=(neg==TRUE) ? -sym->addr : sym->addr;
       break;
     case '(':
       if ((emit_parsing_mode & epmEXPR)==0)
@@ -5919,11 +5923,11 @@ static void emit_param_any(ucell *p,int size)
       if ((emit_parsing_mode & epmEXPR)==0)
         stgset(FALSE);
       needtoken(')');
-      p[curp]=(neg==0) ? val : -val;
+      p[curp]=(neg==TRUE) ? -val : val;
       break;
     case '-':
-      if (neg==0) {
-        neg=1;
+      if (neg==FALSE) {
+        neg=TRUE;
         goto fetchtok;
       } /* if */
       char ival[sNAMEMAX+2]="-";
@@ -5954,6 +5958,10 @@ static void emit_param_data(ucell *p,int size)
     case tSYMBOL:
       sym=findloc(str);
       if (sym!=NULL) {
+        if (sym->ident==iLABEL) {
+          emit_invalid_token(teDATA,tLABEL);
+          break;
+        } /* if */
         if (sym->vclass!=sSTATIC && sym->ident!=iCONSTEXPR) {
           emit_invalid_token(teDATA,teLOCAL);
           break;
@@ -5996,6 +6004,10 @@ static void emit_param_local(ucell *p,int size)
     case tSYMBOL:
       sym=findloc(str);
       if (sym!=NULL) {
+        if (sym->ident==iLABEL) {
+          emit_invalid_token(teLOCAL,tLABEL);
+          break;
+        } /* if */
         if (sym->vclass==sSTATIC) {
           emit_invalid_token(teLOCAL,teDATA);
           break;
@@ -6021,25 +6033,28 @@ static void emit_param_index(ucell *p,const cell *valid_values,int size)
   cell val;
   char *str;
   symbol *sym;
-  int tok,i;
-  int neg=0;
+  int tok,i,global;
+  int neg=FALSE;
 
   assert(size>0);
 fetchtok:
   tok=lex(&val,&str);
   switch (tok) {
   case tNUMBER:
-    if (neg!=0)
+    if (neg==TRUE)
       val=-val;
     break;
   case tRATIONAL:
-    if (neg!=0)
+    if (neg==TRUE)
       val=val|((cell)1 << (PAWN_CELL_SIZE-1));
     break;
   case tSYMBOL:
-  	sym=findloc(str);
-    if (sym==NULL)
+    global=FALSE;
+    sym=findloc(str);
+    if (sym==NULL) {
+      global=TRUE;
       sym=findglb(str,sSTATEVAR);
+    } /* if */
     if (sym==NULL) {
       error(17,str);    /* undefined symbol */
       return;
@@ -6047,22 +6062,25 @@ fetchtok:
     switch (sym->ident) {
     case iCONSTEXPR:
       break;
+    case iLABEL:
+      tok=tLABEL;
+      goto invalid_token;
     case iFUNCTN:
     case iREFFUNC:
       tok=((sym->usage & uNATIVE)!=0) ? teNATIVE : teFUNCTN;
-      /* drop through */
+      goto invalid_token;
     default:
-      if (tok==tSYMBOL)
-        tok=teDATA;
+      tok=(global==FALSE && sym->vclass!=sSTATIC) ? teLOCAL : teDATA;
+    invalid_token:
       emit_invalid_token(teNUMBER,tok);
       return;
     } /* switch */
     markusage(sym,uREAD);
-    val=(neg!=0) ? -sym->addr : sym->addr;
+    val=(neg==TRUE) ? -sym->addr : sym->addr;
     break;
   case '-':
-    if (neg==0) {
-      neg=1;
+    if (neg==FALSE) {
+      neg=TRUE;
       goto fetchtok;
     } /* if */
     /* drop through */

From bd01c04deffbf8d2d56e7c0a8814cd6146c70685 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Mon, 4 Dec 2017 22:33:02 +0700
Subject: [PATCH 37/43] emit/__emit: Fix argument type for 'addr.pri/alt'

---
 source/compiler/sc1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 809ca1f..9aa169a 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6360,8 +6360,8 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {  0, NULL,         emit_noop },
   { 78, "add",        emit_parm0 },
   { 87, "add.c",      emit_parm1_any },
-  { 14, "addr.alt",   emit_parm1_any },
-  { 13, "addr.pri",   emit_parm1_any },
+  { 14, "addr.alt",   emit_parm1_local },
+  { 13, "addr.pri",   emit_parm1_local },
   { 30, "align.alt",  emit_parm1_any },
   { 29, "align.pri",  emit_parm1_any },
   { 81, "and",        emit_parm0 },

From c77b0f1bdde185cdbc5f45bd24bbc57766316aef Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Wed, 6 Dec 2017 00:47:10 +0700
Subject: [PATCH 38/43] emit/__emit: Verify the arguments for 'sysreq.c' and
 'sysreq.n'

---
 source/compiler/sc1.c | 138 +++++++++++++++++++++++++++---------------
 1 file changed, 88 insertions(+), 50 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 9aa169a..3ff5a5b 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -5868,7 +5868,7 @@ static void emit_invalid_token(int expected_token,int found_token)
   } /* if */
 }
 
-static void emit_param_any(ucell *p,int size)
+static void emit_param_any(ucell *p,int numargs)
 {
   char *str;
   cell val,cidx;
@@ -5877,17 +5877,17 @@ static void emit_param_any(ucell *p,int size)
   int curp=0;
   int tok,neg,ident,index;
 
-  assert(size>0);
+  assert(numargs>0);
   do {
     neg=FALSE;
   fetchtok:
     tok=lex(&val,&str);
     switch (tok) {
     case tNUMBER:
-      p[curp]=(neg==TRUE) ? -val : val;
+      p[curp]=(neg!=FALSE) ? -val : val;
       break;
     case tRATIONAL:
-      p[curp]=(neg==TRUE) ? (val|((cell)1 << (PAWN_CELL_SIZE-1))) : val;
+      p[curp]=(neg!=FALSE) ? (val|((cell)1 << (PAWN_CELL_SIZE-1))) : val;
       break;
     case tSYMBOL:
       sym=findloc(str);
@@ -5908,7 +5908,7 @@ static void emit_param_any(ucell *p,int size)
       } else {
         markusage(sym,uREAD|uWRITTEN);
       } /* if */
-      p[curp]=(neg==TRUE) ? -sym->addr : sym->addr;
+      p[curp]=(neg!=FALSE) ? -sym->addr : sym->addr;
       break;
     case '(':
       if ((emit_parsing_mode & epmEXPR)==0)
@@ -5923,24 +5923,25 @@ static void emit_param_any(ucell *p,int size)
       if ((emit_parsing_mode & epmEXPR)==0)
         stgset(FALSE);
       needtoken(')');
-      p[curp]=(neg==TRUE) ? -val : val;
+      p[curp]=(neg!=FALSE) ? -val : val;
       break;
     case '-':
       if (neg==FALSE) {
         neg=TRUE;
         goto fetchtok;
+      } else {
+        char ival[sNAMEMAX+2]="-";
+        strcpy(ival+1,str);
+        error(1,sc_tokens[tSYMBOL-tFIRST],ival);
+        break;
       } /* if */
-      char ival[sNAMEMAX+2]="-";
-      strcpy(ival+1,str);
-      error(1,sc_tokens[tSYMBOL-tFIRST],ival);
-      break;
     default:
       emit_invalid_token(teNUMBER,tok);
     } /* switch */
-  } while (++curp<size);
+  } while (++curp<numargs);
 }
 
-static void emit_param_data(ucell *p,int size)
+static void emit_param_data(ucell *p,int numargs)
 {
   cell val;
   char *str;
@@ -5948,7 +5949,7 @@ static void emit_param_data(ucell *p,int size)
   int curp=0;
   int tok;
 
-  assert(size>0);
+  assert(numargs>0);
   do {
     tok=lex(&val,&str);
     switch (tok) {
@@ -5983,10 +5984,10 @@ static void emit_param_data(ucell *p,int size)
     default:
       emit_invalid_token(teDATA,tok);
     } /* switch */
-  } while (++curp<size);
+  } while (++curp<numargs);
 }
 
-static void emit_param_local(ucell *p,int size)
+static void emit_param_local(ucell *p,int numargs)
 {
   cell val;
   char *str;
@@ -5994,7 +5995,7 @@ static void emit_param_local(ucell *p,int size)
   int curp=0;
   int tok;
 
-  assert(size>0);
+  assert(numargs>0);
   do {
     tok=lex(&val,&str);
     switch (tok) {
@@ -6025,10 +6026,10 @@ static void emit_param_local(ucell *p,int size)
     default:
       emit_invalid_token(tSYMBOL,tok);
     } /* switch */
-  } while (++curp<size);
+  } while (++curp<numargs);
 }
 
-static void emit_param_index(ucell *p,const cell *valid_values,int size)
+static void emit_param_index(ucell *p,const cell *valid_values,int numvalues)
 {
   cell val;
   char *str;
@@ -6036,16 +6037,16 @@ static void emit_param_index(ucell *p,const cell *valid_values,int size)
   int tok,i,global;
   int neg=FALSE;
 
-  assert(size>0);
+  assert(numvalues>0);
 fetchtok:
   tok=lex(&val,&str);
   switch (tok) {
   case tNUMBER:
-    if (neg==TRUE)
+    if (neg!=FALSE)
       val=-val;
     break;
   case tRATIONAL:
-    if (neg==TRUE)
+    if (neg!=FALSE)
       val=val|((cell)1 << (PAWN_CELL_SIZE-1));
     break;
   case tSYMBOL:
@@ -6076,7 +6077,7 @@ fetchtok:
       return;
     } /* switch */
     markusage(sym,uREAD);
-    val=(neg==TRUE) ? -sym->addr : sym->addr;
+    val=(neg!=FALSE) ? -sym->addr : sym->addr;
     break;
   case '-':
     if (neg==FALSE) {
@@ -6090,7 +6091,7 @@ fetchtok:
   } /* switch */
 
   *p=val;
-  for (i=0; i<size; i++)
+  for (i=0; i<numvalues; i++)
     if (val==valid_values[i])
       return;
   error(50);    /* invalid range */
@@ -6111,6 +6112,45 @@ static void emit_param_label(ucell *p)
   *p=*(ucell *)&sym->addr;
 }
 
+static void emit_param_function(ucell *p,int isnative)
+{
+  cell val;
+  char *str;
+  symbol *sym;
+  int tok;
+
+  tok=lex(&val,&str);
+  switch (tok)
+  {
+  case tSYMBOL:
+    sym=findglb(str,sSTATEVAR);
+    if (sym==NULL) {
+      error(17,str);    /* undefined symbol */
+      return;
+    } /* if */
+    if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
+      if (!!(sym->usage & uNATIVE)==isnative)
+        break;
+      tok=(isnative!=FALSE) ? teFUNCTN : teNATIVE;
+    } else {
+      tok=(sym->ident==iCONSTEXPR) ? teNUMBER : teDATA;
+    } /* if */
+    /* drop through */
+  default:
+    emit_invalid_token((isnative!=FALSE) ? teNATIVE : teFUNCTN,tok);
+    return;
+  } /* switch */
+
+  if (isnative!=FALSE) {
+    if ((sym->usage & uREAD)==0 && sym->addr>=0)
+      sym->addr=ntv_funcid++;
+    *p=sym->addr;
+  } else {
+    *(char **)p=str;
+  } /* if */
+  markusage(sym,uREAD);
+}
+
 static void OPHANDLER_CALL emit_noop(char *name)
 {
   (void)name;
@@ -6324,36 +6364,34 @@ static void OPHANDLER_CALL emit_do_sctrl(char *name)
 
 static void OPHANDLER_CALL emit_do_call(char *name)
 {
-  cell val;
-  char *str;
-  symbol *sym;
-  int tok;
+  char *funcname=NULL;
 
-  tok=lex(&val,&str);
-  if (tok!=tSYMBOL) {
-    emit_invalid_token(tSYMBOL,tok);
-    return;
-  } /* if */
-  sym=findglb(str,sGLOBAL);
-  if (sym==NULL) {
-    error(17,str); /* undefined symbol */
-    return;
-  } /* if */
-  if (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC) {
-    emit_invalid_token(teFUNCTN,(sym->ident==iCONSTEXPR) ? teNUMBER : teDATA);
-    return;
-  } /* if */
-  if ((sym->usage & uNATIVE)!=0) {
-    emit_invalid_token(teFUNCTN,teNATIVE);
-    return;
-  } /* if */
+  emit_param_function((ucell *)&funcname,FALSE);
   stgwrite("\t");
   stgwrite(name);
-  stgwrite(" .");
-  stgwrite(str);
+  if (funcname!=NULL) {
+    stgwrite(" .");
+    stgwrite(funcname);
+  } /* if */
   stgwrite("\n");
   code_idx+=opcodes(1)+opargs(1);
-  markusage(sym,uREAD);
+}
+
+static void OPHANDLER_CALL emit_do_sysreq_c(char *name)
+{
+  ucell p[1];
+
+  emit_param_function(&p[0],TRUE);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
+}
+
+static void OPHANDLER_CALL emit_do_sysreq_n(char *name)
+{
+  ucell p[2];
+
+  emit_param_function(&p[0],TRUE);
+  emit_param_any(&p[1],1);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
 static EMIT_OPCODE emit_opcodelist[] = {
@@ -6504,8 +6542,8 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {129, "switch",     emit_parm1_label },
 /*{126, "symbol",     do_symbol }, */
 /*{136, "symtag",     emit_parm1_any }, */
-  {123, "sysreq.c",   emit_parm1_any },
-  {135, "sysreq.n",   emit_parm2_any },
+  {123, "sysreq.c",   emit_do_sysreq_c },
+  {135, "sysreq.n",   emit_do_sysreq_n },
   {122, "sysreq.pri", emit_parm0 },
   { 76, "udiv",       emit_parm0 },
   { 77, "udiv.alt",   emit_parm0 },

From 59428b0c39a8f3dd3522846917bc0ca3a00fafa3 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Wed, 6 Dec 2017 16:57:47 +0700
Subject: [PATCH 39/43] emit/__emit: Code cleanup, misc. adjustments

---
 source/compiler/sc.h  |  12 +-
 source/compiler/sc1.c | 572 +++++++++++++++++++-----------------------
 source/compiler/sc6.c |  30 +--
 3 files changed, 281 insertions(+), 333 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index f403e45..f2250f1 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -46,16 +46,16 @@
 #include "../amx/amx.h"
 
 #if defined _MSC_VER
-  #define OPHANDLER_CALL __fastcall
+  #define SC_FASTCALL __fastcall
 #elif defined __GNUC__ && (defined __i386__ || defined __x86_64__ || defined __amd64__)
   #if !defined __x86_64__ && !defined __amd64__ && (__GNUC__>=4 || __GNUC__==3 && __GNUC_MINOR__>=4)
-    #define OPHANDLER_CALL __attribute__((fastcall))
+    #define SC_FASTCALL __attribute__((fastcall))
   #else
-    #define OPHANDLER_CALL __attribute__((regparam(3)))
+    #define SC_FASTCALL __attribute__((regparam(3)))
   #endif
 #endif
-#if !defined OPHANDLER_CALL
-  #define OPHANDLER_CALL
+#if !defined SC_FASTCALL
+  #define SC_FASTCALL
 #endif
 
 /* Note: the "cell" and "ucell" types are defined in AMX.H */
@@ -403,7 +403,7 @@ typedef struct s_valuepair {
 #define tLABEL      337
 #define tSTRING     338
 /* argument types for emit/__emit */
-#define teNUMBER    339 /* integer/rational number */
+#define teNUMERIC   339 /* integer/rational number */
 #define teDATA      340 /* data (variable name or address) */
 #define teLOCAL     341 /* local variable (name or offset) */
 #define teFUNCTN    342 /* Pawn function */
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 3ff5a5b..7bc0138 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -139,7 +139,7 @@ static void delwhile(void);
 static int *readwhile(void);
 static void doemit(void);
 
-typedef void (OPHANDLER_CALL *OPCODE_PROC)(char *name);
+typedef void (SC_FASTCALL *OPCODE_PROC)(char *name);
 typedef struct {
   cell opcode;
   char *name;
@@ -5854,7 +5854,7 @@ static symbol *fetchlab(char *name)
   return sym;
 }
 
-static void emit_invalid_token(int expected_token,int found_token)
+static void SC_FASTCALL emit_invalid_token(int expected_token,int found_token)
 {
   char s[2];
   extern char *sc_tokens[];
@@ -5868,168 +5868,159 @@ static void emit_invalid_token(int expected_token,int found_token)
   } /* if */
 }
 
-static void emit_param_any(ucell *p,int numargs)
+static void SC_FASTCALL emit_param_any(ucell *p)
 {
   char *str;
   cell val,cidx;
   symbol *sym;
   extern char *sc_tokens[];
-  int curp=0;
   int tok,neg,ident,index;
 
-  assert(numargs>0);
-  do {
-    neg=FALSE;
-  fetchtok:
-    tok=lex(&val,&str);
-    switch (tok) {
-    case tNUMBER:
-      p[curp]=(neg!=FALSE) ? -val : val;
+  neg=FALSE;
+fetchtok:
+  tok=lex(&val,&str);
+  switch (tok) {
+  case tNUMBER:
+    *p=(neg!=FALSE) ? -val : val;
+    break;
+  case tRATIONAL:
+    *p=(neg!=FALSE) ? (val|((cell)1 << (PAWN_CELL_SIZE-1))) : val;
+    break;
+  case tSYMBOL:
+    sym=findloc(str);
+    if (sym==NULL)
+      sym=findglb(str,sSTATEVAR);
+    if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0)) {
+      error(17,str);    /* undefined symbol */
       break;
-    case tRATIONAL:
-      p[curp]=(neg!=FALSE) ? (val|((cell)1 << (PAWN_CELL_SIZE-1))) : val;
+    } /* if */
+    if (sym->ident==iLABEL) {
+      tok=tLABEL;
+      goto invalid_token;
+    } /* if */
+    if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
+      if ((sym->usage & uNATIVE)!=0 && (sym->usage & uREAD)==0 && sym->addr>=0)
+        sym->addr=ntv_funcid++;
+      markusage(sym,uREAD);
+    } else {
+      markusage(sym,uREAD | uWRITTEN);
+    } /* if */
+    *p=(neg!=FALSE) ? -sym->addr : sym->addr;
+    break;
+  case '(':
+    if ((emit_parsing_mode & epmEXPR)==0)
+      stgset(TRUE);
+    stgget(&index,&cidx);
+    errorset(sEXPRMARK,0);
+    ident=expression(&val,NULL,NULL,FALSE);
+    if (ident!=iCONSTEXPR)
+      error(8);         /* must be constant expression */
+    errorset(sEXPRRELEASE,0);
+    stgdel(index,cidx);
+    if ((emit_parsing_mode & epmEXPR)==0)
+      stgset(FALSE);
+    needtoken(')');
+    *p=(neg!=FALSE) ? -val : val;
+    break;
+  case '-':
+    if (neg==FALSE) {
+      neg=TRUE;
+      goto fetchtok;
+    } else {
+      char ival[sNAMEMAX+2]="-";
+      strcpy(ival+1,str);
+      error(1,sc_tokens[tSYMBOL-tFIRST],ival);
       break;
-    case tSYMBOL:
-      sym=findloc(str);
-      if (sym==NULL)
-        sym=findglb(str,sSTATEVAR);
-      if (sym==NULL || (sym->ident!=iFUNCTN && sym->ident!=iREFFUNC && (sym->usage & uDEFINE)==0)) {
+    } /* if */
+  default:
+  invalid_token:
+    emit_invalid_token(teNUMERIC,tok);
+  } /* switch */
+}
+
+static void SC_FASTCALL emit_param_data(ucell *p)
+{
+  cell val;
+  char *str;
+  symbol *sym;
+  int tok;
+
+  tok=lex(&val,&str);
+  switch (tok) {
+  case tNUMBER:
+    *p=val;
+    break;
+  case tSYMBOL:
+    sym=findloc(str);
+    if (sym!=NULL) {
+      if (sym->ident==iLABEL) {
+        tok=tLABEL;
+        goto invalid_token;
+      } /* if */
+      if (sym->vclass!=sSTATIC && sym->ident!=iCONSTEXPR) {
+        tok=teLOCAL;
+        goto invalid_token;
+      } /* if */
+    } else {
+      sym=findglb(str,sSTATIC);
+      if (sym==NULL) {
         error(17,str);  /* undefined symbol */
         break;
       } /* if */
-      if (sym->ident==iLABEL) {
-        emit_invalid_token(teNUMBER,tLABEL);
-        break;
-      } /* if */
       if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
-        if ((sym->usage & uNATIVE)!=0 && (sym->usage & uREAD)==0 && sym->addr>=0)
-          sym->addr=ntv_funcid++;
-        markusage(sym,uREAD);
-      } else {
-        markusage(sym,uREAD|uWRITTEN);
+        tok=((sym->usage & uNATIVE)!=0) ? teNATIVE : teFUNCTN;
+        goto invalid_token;
       } /* if */
-      p[curp]=(neg!=FALSE) ? -sym->addr : sym->addr;
-      break;
-    case '(':
-      if ((emit_parsing_mode & epmEXPR)==0)
-        stgset(TRUE);
-      stgget(&index,&cidx);
-      errorset(sEXPRMARK,0);
-      ident=expression(&val,NULL,NULL,FALSE);
-      if (ident!=iCONSTEXPR)
-        error(8);       /* must be constant expression */
-      errorset(sEXPRRELEASE,0);
-      stgdel(index,cidx);
-      if ((emit_parsing_mode & epmEXPR)==0)
-        stgset(FALSE);
-      needtoken(')');
-      p[curp]=(neg!=FALSE) ? -val : val;
-      break;
-    case '-':
-      if (neg==FALSE) {
-        neg=TRUE;
-        goto fetchtok;
-      } else {
-        char ival[sNAMEMAX+2]="-";
-        strcpy(ival+1,str);
-        error(1,sc_tokens[tSYMBOL-tFIRST],ival);
+    } /* if */
+    markusage(sym,uREAD | uWRITTEN);
+    *p=sym->addr;
+    break;
+  default:
+  invalid_token:
+    emit_invalid_token(teDATA,tok);
+  } /* switch */
+}
+
+static void SC_FASTCALL emit_param_local(ucell *p)
+{
+  cell val;
+  char *str;
+  symbol *sym;
+  int tok;
+
+  tok=lex(&val,&str);
+  switch (tok) {
+  case tNUMBER:
+    *p=val;
+    break;
+  case tSYMBOL:
+    sym=findloc(str);
+    if (sym!=NULL) {
+      if (sym->ident==iLABEL) {
+        tok=tLABEL;
+        goto invalid_token;
+      } /* if */
+      if (sym->vclass==sSTATIC) {
+        tok=teDATA;
+        goto invalid_token;
+      } /* if */
+    } else {
+      sym=findglb(str,sSTATEVAR);
+      if (sym==NULL || sym->ident!=iCONSTEXPR) {
+        error(17,str);  /* undefined symbol */
         break;
       } /* if */
-    default:
-      emit_invalid_token(teNUMBER,tok);
-    } /* switch */
-  } while (++curp<numargs);
+    } /* if */
+    markusage(sym,uREAD | uWRITTEN);
+    *p=sym->addr;
+    break;
+  default:
+  invalid_token:
+    emit_invalid_token(tSYMBOL,tok);
+  } /* switch */
 }
 
-static void emit_param_data(ucell *p,int numargs)
-{
-  cell val;
-  char *str;
-  symbol *sym;
-  int curp=0;
-  int tok;
-
-  assert(numargs>0);
-  do {
-    tok=lex(&val,&str);
-    switch (tok) {
-    case tNUMBER:
-      p[curp]=val;
-      break;
-    case tSYMBOL:
-      sym=findloc(str);
-      if (sym!=NULL) {
-        if (sym->ident==iLABEL) {
-          emit_invalid_token(teDATA,tLABEL);
-          break;
-        } /* if */
-        if (sym->vclass!=sSTATIC && sym->ident!=iCONSTEXPR) {
-          emit_invalid_token(teDATA,teLOCAL);
-          break;
-        } /* if */
-      } else {
-        sym=findglb(str,sSTATIC);
-        if (sym==NULL) {
-          error(17,str);    /* undefined symbol */
-          break;
-        } /* if */
-        if (sym->ident==iFUNCTN || sym->ident==iREFFUNC) {
-          emit_invalid_token(teDATA,((sym->usage & uNATIVE)!=0) ? teNATIVE : teFUNCTN);
-          break;
-        } /* if */
-      } /* if */
-      markusage(sym,uREAD|uWRITTEN);
-      p[curp]=sym->addr;
-      break;
-    default:
-      emit_invalid_token(teDATA,tok);
-    } /* switch */
-  } while (++curp<numargs);
-}
-
-static void emit_param_local(ucell *p,int numargs)
-{
-  cell val;
-  char *str;
-  symbol *sym;
-  int curp=0;
-  int tok;
-
-  assert(numargs>0);
-  do {
-    tok=lex(&val,&str);
-    switch (tok) {
-    case tNUMBER:
-      p[curp]=val;
-      break;
-    case tSYMBOL:
-      sym=findloc(str);
-      if (sym!=NULL) {
-        if (sym->ident==iLABEL) {
-          emit_invalid_token(teLOCAL,tLABEL);
-          break;
-        } /* if */
-        if (sym->vclass==sSTATIC) {
-          emit_invalid_token(teLOCAL,teDATA);
-          break;
-        } /* if */
-      } else {
-        sym=findglb(str,sSTATEVAR);
-        if (sym==NULL || sym->ident!=iCONSTEXPR) {
-          error(17,str);    /* undefined symbol */
-          break;
-        } /* if */
-      } /* if */
-      markusage(sym,uREAD|uWRITTEN);
-      p[curp]=sym->addr;
-      break;
-    default:
-      emit_invalid_token(tSYMBOL,tok);
-    } /* switch */
-  } while (++curp<numargs);
-}
-
-static void emit_param_index(ucell *p,const cell *valid_values,int numvalues)
+static void SC_FASTCALL emit_param_index(ucell *p,const cell *valid_values,int numvalues)
 {
   cell val;
   char *str;
@@ -6072,9 +6063,7 @@ fetchtok:
       goto invalid_token;
     default:
       tok=(global==FALSE && sym->vclass!=sSTATIC) ? teLOCAL : teDATA;
-    invalid_token:
-      emit_invalid_token(teNUMBER,tok);
-      return;
+      goto invalid_token;
     } /* switch */
     markusage(sym,uREAD);
     val=(neg!=FALSE) ? -sym->addr : sym->addr;
@@ -6086,7 +6075,8 @@ fetchtok:
     } /* if */
     /* drop through */
   default:
-    emit_invalid_token(teNUMBER,tok);
+  invalid_token:
+    emit_invalid_token(teNUMERIC,tok);
     return;
   } /* switch */
 
@@ -6097,7 +6087,7 @@ fetchtok:
   error(50);    /* invalid range */
 }
 
-static void emit_param_label(ucell *p)
+static void SC_FASTCALL emit_param_label(ucell *p)
 {
   cell val;
   char *str;
@@ -6112,7 +6102,7 @@ static void emit_param_label(ucell *p)
   *p=*(ucell *)&sym->addr;
 }
 
-static void emit_param_function(ucell *p,int isnative)
+static void SC_FASTCALL emit_param_function(ucell *p,int isnative)
 {
   cell val;
   char *str;
@@ -6133,7 +6123,7 @@ static void emit_param_function(ucell *p,int isnative)
         break;
       tok=(isnative!=FALSE) ? teFUNCTN : teNATIVE;
     } else {
-      tok=(sym->ident==iCONSTEXPR) ? teNUMBER : teDATA;
+      tok=(sym->ident==iCONSTEXPR) ? teNUMERIC : teDATA;
     } /* if */
     /* drop through */
   default:
@@ -6151,41 +6141,41 @@ static void emit_param_function(ucell *p,int isnative)
   markusage(sym,uREAD);
 }
 
-static void OPHANDLER_CALL emit_noop(char *name)
+static void SC_FASTCALL emit_noop(char *name)
 {
   (void)name;
 }
 
-static void OPHANDLER_CALL emit_parm0(char *name)
+static void SC_FASTCALL emit_parm0(char *name)
 {
   outinstr(name,NULL,0);
 }
 
-static void OPHANDLER_CALL emit_parm1_any(char *name)
+static void SC_FASTCALL emit_parm1_any(char *name)
 {
   ucell p[1];
 
-  emit_param_any(p,(sizeof p / sizeof p[0]));
+  emit_param_any(&p[0]);
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_parm1_data(char *name)
+static void SC_FASTCALL emit_parm1_data(char *name)
 {
   ucell p[1];
 
-  emit_param_data(p,(sizeof p / sizeof p[0]));
+  emit_param_data(&p[0]);
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_parm1_local(char *name)
+static void SC_FASTCALL emit_parm1_local(char *name)
 {
   ucell p[1];
 
-  emit_param_local(p,(sizeof p / sizeof p[0]));
+  emit_param_local(&p[0]);
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_parm1_label(char *name)
+static void SC_FASTCALL emit_parm1_label(char *name)
 {
   ucell p[1];
 
@@ -6193,126 +6183,12 @@ static void OPHANDLER_CALL emit_parm1_label(char *name)
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_parm2_any(char *name)
-{
-  ucell p[2];
-
-  emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm2_data(char *name)
-{
-  ucell p[2];
-
-  emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm2_local(char *name)
-{
-  ucell p[2];
-
-  emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm2_data_any(char *name)
-{
-  ucell p[2];
-
-  emit_param_data(&p[0],1);
-  emit_param_any(&p[1],1);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm2_local_any(char *name)
-{
-  ucell p[2];
-
-  emit_param_local(&p[0],1);
-  emit_param_any(&p[1],1);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm3_any(char *name)
-{
-  ucell p[3];
-
-  emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm3_data(char *name)
-{
-  ucell p[3];
-
-  emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm3_local(char *name)
-{
-  ucell p[3];
-
-  emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm4_any(char *name)
-{
-  ucell p[4];
-
-  emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm4_data(char *name)
-{
-  ucell p[4];
-
-  emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm4_local(char *name)
-{
-  ucell p[4];
-
-  emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm5_any(char *name)
-{
-  ucell p[5];
-
-  emit_param_any(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm5_data(char *name)
-{
-  ucell p[5];
-
-  emit_param_data(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_parm5_local(char *name)
-{
-  ucell p[5];
-
-  emit_param_local(p,(sizeof p / sizeof p[0]));
-  outinstr(name,p,(sizeof p / sizeof p[0]));
-}
-
-static void OPHANDLER_CALL emit_do_casetbl(char *name)
+static void SC_FASTCALL emit_do_casetbl(char *name)
 {
   ucell p[2];
 
   (void)name;
-  emit_param_any(&p[0],1);
+  emit_param_any(&p[0]);
   emit_param_label(&p[1]);
   stgwrite("\tcasetbl\n");
   stgwrite("\tcase ");
@@ -6322,11 +6198,11 @@ static void OPHANDLER_CALL emit_do_casetbl(char *name)
   code_idx+=opcodes(1)+opargs(2);
 }
 
-static void OPHANDLER_CALL emit_do_case(char *name)
+static void SC_FASTCALL emit_do_case(char *name)
 {
   ucell p[2];
 
-  emit_param_any(&p[0],1);
+  emit_param_any(&p[0]);
   emit_param_label(&p[1]);
   stgwrite("\tcase ");
   outval(p[0],FALSE);
@@ -6335,7 +6211,7 @@ static void OPHANDLER_CALL emit_do_case(char *name)
   code_idx+=opargs(2);
 }
 
-static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
+static void SC_FASTCALL emit_do_lodb_strb(char *name)
 {
   static const cell valid_values[] = { 1,2,4 };
   ucell p[1];
@@ -6344,7 +6220,7 @@ static void OPHANDLER_CALL emit_do_lodb_strb(char *name)
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_do_lctrl(char *name)
+static void SC_FASTCALL emit_do_lctrl(char *name)
 {
   static const cell valid_values[] = { 0,1,2,3,4,5,6,7,8,9 };
   ucell p[1];
@@ -6353,7 +6229,7 @@ static void OPHANDLER_CALL emit_do_lctrl(char *name)
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_do_sctrl(char *name)
+static void SC_FASTCALL emit_do_sctrl(char *name)
 {
   static const cell valid_values[] = { 2,4,5,6,8,9 };
   ucell p[1];
@@ -6362,7 +6238,7 @@ static void OPHANDLER_CALL emit_do_sctrl(char *name)
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_do_call(char *name)
+static void SC_FASTCALL emit_do_call(char *name)
 {
   char *funcname=NULL;
 
@@ -6377,7 +6253,7 @@ static void OPHANDLER_CALL emit_do_call(char *name)
   code_idx+=opcodes(1)+opargs(1);
 }
 
-static void OPHANDLER_CALL emit_do_sysreq_c(char *name)
+static void SC_FASTCALL emit_do_sysreq_c(char *name)
 {
   ucell p[1];
 
@@ -6385,15 +6261,92 @@ static void OPHANDLER_CALL emit_do_sysreq_c(char *name)
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
-static void OPHANDLER_CALL emit_do_sysreq_n(char *name)
+static void SC_FASTCALL emit_do_sysreq_n(char *name)
 {
   ucell p[2];
 
   emit_param_function(&p[0],TRUE);
-  emit_param_any(&p[1],1);
+  emit_param_any(&p[1]);
   outinstr(name,p,(sizeof p / sizeof p[0]));
 }
 
+static void SC_FASTCALL emit_do_const(char *name)
+{
+  ucell p[2];
+
+  emit_param_data(&p[0]);
+  emit_param_any(&p[1]);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
+}
+
+static void SC_FASTCALL emit_do_const_s(char *name)
+{
+  ucell p[2];
+
+  emit_param_local(&p[0]);
+  emit_param_any(&p[1]);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
+}
+
+static void SC_FASTCALL emit_do_load_both(char *name)
+{
+  ucell p[2];
+  int i;
+
+  for (i=0; i<(sizeof p / sizeof p[0]); i++)
+    emit_param_data(&p[i]);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
+}
+
+static void SC_FASTCALL emit_do_load_s_both(char *name)
+{
+  ucell p[2];
+  int i;
+
+  for (i=0; i<(sizeof p / sizeof p[0]); i++)
+    emit_param_local(&p[i]);
+  outinstr(name,p,(sizeof p / sizeof p[0]));
+}
+
+static void SC_FASTCALL emit_do_pushn_c(char *name)
+{
+  ucell p[5];
+  int i,numargs;
+
+  assert(name[0]=='p' && name[1]=='u' && name[2]=='s'
+         && name[3]=='h' && '2'<=name[4] && name[4]<='5');
+  numargs=name[4]-'0';
+  for (i=0; i<numargs; i++)
+    emit_param_any(&p[i]);
+  outinstr(name,p,numargs);
+}
+
+static void SC_FASTCALL emit_do_pushn(char *name)
+{
+  ucell p[5];
+  int i,numargs;
+
+  assert(name[0]=='p' && name[1]=='u' && name[2]=='s'
+         && name[3]=='h' && '2'<=name[4] && name[4]<='5');
+  numargs=name[4]-'0';
+  for (i=0; i<numargs; i++)
+    emit_param_data(&p[i]);
+  outinstr(name,p,numargs);
+}
+
+static void SC_FASTCALL emit_do_pushn_s_adr(char *name)
+{
+  ucell p[5];
+  int i,numargs;
+
+  assert(name[0]=='p' && name[1]=='u' && name[2]=='s'
+         && name[3]=='h' && '2'<=name[4] && name[4]<='5');
+  numargs=name[4]-'0';
+  for (i=0; i<numargs; i++)
+    emit_param_data(&p[i]);
+  outinstr(name,p,numargs);
+}
+
 static EMIT_OPCODE emit_opcodelist[] = {
   {  0, NULL,         emit_noop },
   { 78, "add",        emit_parm0 },
@@ -6410,10 +6363,10 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {  0, "case",       emit_do_case },
   {130, "casetbl",    emit_do_casetbl },
   {118, "cmps",       emit_parm1_any },
-  {156, "const",      emit_parm2_data_any },
+  {156, "const",      emit_do_const },
   { 12, "const.alt",  emit_parm1_any },
   { 11, "const.pri",  emit_parm1_any },
-  {157, "const.s",    emit_parm2_local_any },
+  {157, "const.s",    emit_do_const_s },
   {114, "dec",        emit_parm1_data },
   {113, "dec.alt",    emit_parm0 },
   {116, "dec.i",      emit_parm0 },
@@ -6422,7 +6375,6 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 95, "eq",         emit_parm0 },
   {106, "eq.c.alt",   emit_parm1_any },
   {105, "eq.c.pri",   emit_parm1_any },
-/*{124, "file",       do_file }, */
   {119, "fill",       emit_parm1_any },
   {100, "geq",        emit_parm0 },
   { 99, "grtr",       emit_parm0 },
@@ -6456,13 +6408,12 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 97, "less",       emit_parm0 },
   { 25, "lidx",       emit_parm0 },
   { 26, "lidx.b",     emit_parm1_any },
-/*{125, "line",       emit_parm2_any }, */
   {  2, "load.alt",   emit_parm1_data },
-  {154, "load.both",  emit_parm2_data },
+  {154, "load.both",  emit_do_load_both },
   {  9, "load.i",     emit_parm0 },
   {  1, "load.pri",   emit_parm1_data },
   {  4, "load.s.alt", emit_parm1_local },
-  {155, "load.s.both",emit_parm2_local },
+  {155, "load.s.both",emit_do_load_s_both },
   {  3, "load.s.pri", emit_parm1_local },
   { 10, "lodb.i",     emit_do_lodb_strb },
   {  6, "lref.alt",   emit_parm1_data },
@@ -6487,22 +6438,22 @@ static EMIT_OPCODE emit_opcodelist[] = {
   { 36, "push.pri",   emit_parm0 },
   { 38, "push.r",     emit_parm1_any },
   { 41, "push.s",     emit_parm1_local },
-  {139, "push2",      emit_parm2_data },
-  {141, "push2.adr",  emit_parm2_local },
-  {138, "push2.c",    emit_parm2_any },
-  {140, "push2.s",    emit_parm2_local },
-  {143, "push3",      emit_parm3_data },
-  {145, "push3.adr",  emit_parm3_local },
-  {142, "push3.c",    emit_parm3_any },
-  {144, "push3.s",    emit_parm3_local },
-  {147, "push4",      emit_parm4_data },
-  {149, "push4.adr",  emit_parm4_local },
-  {146, "push4.c",    emit_parm4_any },
-  {148, "push4.s",    emit_parm4_local },
-  {151, "push5",      emit_parm5_data },
-  {153, "push5.adr",  emit_parm5_local },
-  {150, "push5.c",    emit_parm5_any },
-  {152, "push5.s",    emit_parm5_local },
+  {139, "push2",      emit_do_pushn },
+  {141, "push2.adr",  emit_do_pushn_s_adr },
+  {138, "push2.c",    emit_do_pushn_c },
+  {140, "push2.s",    emit_do_pushn_s_adr },
+  {143, "push3",      emit_do_pushn },
+  {145, "push3.adr",  emit_do_pushn_s_adr },
+  {142, "push3.c",    emit_do_pushn_c },
+  {144, "push3.s",    emit_do_pushn_s_adr },
+  {147, "push4",      emit_do_pushn },
+  {149, "push4.adr",  emit_do_pushn_s_adr },
+  {146, "push4.c",    emit_do_pushn_c },
+  {148, "push4.s",    emit_do_pushn_s_adr },
+  {151, "push5",      emit_do_pushn },
+  {153, "push5.adr",  emit_do_pushn_s_adr },
+  {150, "push5.c",    emit_do_pushn_c },
+  {152, "push5.s",    emit_do_pushn_s_adr },
   { 47, "ret",        emit_parm0 },
   { 48, "retn",       emit_parm0 },
   { 32, "sctrl",      emit_do_sctrl },
@@ -6522,7 +6473,6 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {101, "sless",      emit_parm0 },
   { 72, "smul",       emit_parm0 },
   { 88, "smul.c",     emit_parm1_any },
-/*{127, "srange",     emit_parm2_any }, */
   { 20, "sref.alt",   emit_parm1_data },
   { 19, "sref.pri",   emit_parm1_data },
   { 22, "sref.s.alt", emit_parm1_local },
@@ -6540,8 +6490,6 @@ static EMIT_OPCODE emit_opcodelist[] = {
   {132, "swap.alt",   emit_parm0 },
   {131, "swap.pri",   emit_parm0 },
   {129, "switch",     emit_parm1_label },
-/*{126, "symbol",     do_symbol }, */
-/*{136, "symtag",     emit_parm1_any }, */
   {123, "sysreq.c",   emit_do_sysreq_c },
   {135, "sysreq.n",   emit_do_sysreq_n },
   {122, "sysreq.pri", emit_parm0 },
diff --git a/source/compiler/sc6.c b/source/compiler/sc6.c
index 9007477..88b8c0b 100644
--- a/source/compiler/sc6.c
+++ b/source/compiler/sc6.c
@@ -42,7 +42,7 @@
 static void append_dbginfo(FILE *fout);
 
 
-typedef cell (OPHANDLER_CALL *OPCODE_PROC)(FILE *fbin,char *params,cell opcode);
+typedef cell (SC_FASTCALL *OPCODE_PROC)(FILE *fbin,char *params,cell opcode);
 
 typedef struct {
   cell opcode;
@@ -282,7 +282,7 @@ static void write_encoded(FILE *fbin,ucell *c,int num)
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
 #endif
-static cell OPHANDLER_CALL noop(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL noop(FILE *fbin,char *params,cell opcode)
 {
   return 0;
 }
@@ -290,7 +290,7 @@ static cell OPHANDLER_CALL noop(FILE *fbin,char *params,cell opcode)
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
 #endif
-static cell OPHANDLER_CALL set_currentfile(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL set_currentfile(FILE *fbin,char *params,cell opcode)
 {
   fcurrent=(short)getparam(params,NULL);
   return 0;
@@ -299,14 +299,14 @@ static cell OPHANDLER_CALL set_currentfile(FILE *fbin,char *params,cell opcode)
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
 #endif
-static cell OPHANDLER_CALL parm0(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL parm0(FILE *fbin,char *params,cell opcode)
 {
   if (fbin!=NULL)
     write_encoded(fbin,(ucell*)&opcode,1);
   return opcodes(1);
 }
 
-static cell OPHANDLER_CALL parm1(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL parm1(FILE *fbin,char *params,cell opcode)
 {
   ucell p=getparam(params,NULL);
   if (fbin!=NULL) {
@@ -316,7 +316,7 @@ static cell OPHANDLER_CALL parm1(FILE *fbin,char *params,cell opcode)
   return opcodes(1)+opargs(1);
 }
 
-static cell OPHANDLER_CALL parm2(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL parm2(FILE *fbin,char *params,cell opcode)
 {
   ucell p1=getparam(params,&params);
   ucell p2=getparam(params,NULL);
@@ -328,7 +328,7 @@ static cell OPHANDLER_CALL parm2(FILE *fbin,char *params,cell opcode)
   return opcodes(1)+opargs(2);
 }
 
-static cell OPHANDLER_CALL parm3(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL parm3(FILE *fbin,char *params,cell opcode)
 {
   ucell p1=getparam(params,&params);
   ucell p2=getparam(params,&params);
@@ -342,7 +342,7 @@ static cell OPHANDLER_CALL parm3(FILE *fbin,char *params,cell opcode)
   return opcodes(1)+opargs(3);
 }
 
-static cell OPHANDLER_CALL parm4(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL parm4(FILE *fbin,char *params,cell opcode)
 {
   ucell p1=getparam(params,&params);
   ucell p2=getparam(params,&params);
@@ -358,7 +358,7 @@ static cell OPHANDLER_CALL parm4(FILE *fbin,char *params,cell opcode)
   return opcodes(1)+opargs(4);
 }
 
-static cell OPHANDLER_CALL parm5(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL parm5(FILE *fbin,char *params,cell opcode)
 {
   ucell p1=getparam(params,&params);
   ucell p2=getparam(params,&params);
@@ -379,7 +379,7 @@ static cell OPHANDLER_CALL parm5(FILE *fbin,char *params,cell opcode)
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
 #endif
-static cell OPHANDLER_CALL do_dump(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL do_dump(FILE *fbin,char *params,cell opcode)
 {
   ucell p;
   int num=0;
@@ -395,7 +395,7 @@ static cell OPHANDLER_CALL do_dump(FILE *fbin,char *params,cell opcode)
   return num*sizeof(cell);
 }
 
-static cell OPHANDLER_CALL do_dumpn(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL do_dumpn(FILE *fbin,char *params,cell opcode)
 {
   ucell value,num,i;
 
@@ -408,7 +408,7 @@ static cell OPHANDLER_CALL do_dumpn(FILE *fbin,char *params,cell opcode)
   return num*sizeof(cell);
 }
 
-static cell OPHANDLER_CALL do_call(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL do_call(FILE *fbin,char *params,cell opcode)
 {
   char name[sNAMEMAX+2]; /* +1 for a possible leading dot */
   int i;
@@ -449,7 +449,7 @@ static cell OPHANDLER_CALL do_call(FILE *fbin,char *params,cell opcode)
   return opcodes(1)+opargs(1);
 }
 
-static cell OPHANDLER_CALL do_jump(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL do_jump(FILE *fbin,char *params,cell opcode)
 {
   int i;
   ucell p;
@@ -466,7 +466,7 @@ static cell OPHANDLER_CALL do_jump(FILE *fbin,char *params,cell opcode)
   return opcodes(1)+opargs(1);
 }
 
-static cell OPHANDLER_CALL do_switch(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL do_switch(FILE *fbin,char *params,cell opcode)
 {
   int i;
   ucell p;
@@ -486,7 +486,7 @@ static cell OPHANDLER_CALL do_switch(FILE *fbin,char *params,cell opcode)
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
 #endif
-static cell OPHANDLER_CALL do_case(FILE *fbin,char *params,cell opcode)
+static cell SC_FASTCALL do_case(FILE *fbin,char *params,cell opcode)
 {
   int i;
   ucell p,v;

From d5691209d60b6f2683a1320fd3cf7f82ceb9a5bd Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Wed, 6 Dec 2017 19:40:45 +0700
Subject: [PATCH 40/43] emit/__emit: Move the "anti-optimisation" workaround to
 'emit_parse_line()'

Conflicts:
	source/compiler/sc1.c
---
 source/compiler/sc.h  | 15 ++++++++-------
 source/compiler/sc1.c | 13 ++++++++++++-
 source/compiler/sc3.c | 14 --------------
 source/compiler/sc7.c |  2 +-
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index f2250f1..a5378fa 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -870,15 +870,16 @@ SC_VDECL FILE *outf;          /* file written to */
 
 SC_VDECL jmp_buf errbuf;      /* target of longjmp() on a fatal error */
 
-
 /*  Possible entries for "emit_parsing_mode"
- *  Bits: 0     (epmBLOCK) multiline ('{}' block) syntax
- *        1     (epmEXPR) used within an expression
- *        2     (epmGLOBAL) used outside of function
+ *  Bits: 0     (epmACTIVE) 'emit'/'__emit' parsing is active
+ *        1     (epmBLOCK) multiline ('{}' block) syntax
+ *        2     (epmEXPR) used within an expression
+ *        3     (epmGLOBAL) used outside of function
  */
-#define epmBLOCK    1
-#define epmEXPR     2
-#define epmGLOBAL   4
+#define epmACTIVE   1
+#define epmBLOCK    2
+#define epmEXPR     4
+#define epmGLOBAL   8
 SC_VDECL int emit_parsing_mode;
 
 #if !defined SC_LIGHT
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 7bc0138..b427b98 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6538,6 +6538,13 @@ SC_FUNC void emit_parse_line(void)
   symbol *sym;
   char name[MAX_INSTR_LEN];
   extern char *sc_tokens[];
+  
+  /* write the staging buffer to the output file so instructions
+   * generated by the `emit`/`__emit` operator could be written
+   * separately without getting altered by the optimizer
+   */
+  stgout(0);
+  emit_parsing_mode |= epmACTIVE;
 
   tok=tokeninfo(&val,&st);
   if (tok==tSYMBOL || (tok>tMIDDLE && tok<=tLAST)) {
@@ -6580,7 +6587,7 @@ SC_FUNC void emit_parse_line(void)
     } else {
       sym=fetchlab(st);
       if ((sym->usage & uDEFINE)!=0)
-        error(021,st);  /* symbol already defined */
+        error(21,st);   /* symbol already defined */
       setlabel((int)sym->addr);
       sym->usage|=uDEFINE;
     } /* if */
@@ -6591,6 +6598,10 @@ SC_FUNC void emit_parse_line(void)
   } else if ((emit_parsing_mode & epmEXPR)==0) {
     matchtoken(';');
   } /* if */
+
+  /* write the staging buffer again */
+  stgout(0);
+  emit_parsing_mode &= ~epmACTIVE;
 }
 
 static void doemit(void)
diff --git a/source/compiler/sc3.c b/source/compiler/sc3.c
index c516a0b..9aff411 100644
--- a/source/compiler/sc3.c
+++ b/source/compiler/sc3.c
@@ -1452,25 +1452,11 @@ static int hier2(value *lval)
   case t__EMIT: {
     cell val;
     char* st;
-    int opt_bck;
-
-    /* write the staging buffer to the output file and temporarily disable
-     * bytecode optimisation so instructions generated by the `emit`/`__emit`
-     * operator won't get altered by the optimizer
-     */
-    stgout(0);
-    opt_bck=pc_optimize;
-    pc_optimize=sOPTIMIZE_NONE;
-
-    /* parse the `emit`/`__emit` expression */
     emit_parsing_mode |= epmEXPR;
     lex(&val,&st);
     emit_parse_line();
     emit_parsing_mode &= ~epmEXPR;
     lval->ident=iEXPRESSION;
-
-    /* restore the bytecode optimisation level and return */
-    pc_optimize=opt_bck;
     return FALSE;
   } /* case */
   default:
diff --git a/source/compiler/sc7.c b/source/compiler/sc7.c
index f8d2c9d..0c1613e 100644
--- a/source/compiler/sc7.c
+++ b/source/compiler/sc7.c
@@ -1770,7 +1770,7 @@ static void stgopt(char *start,char *end,int (*outputfunc)(char *str))
 
   assert(sequences!=NULL);
   /* do not match anything if debug-level is maximum */
-  if (pc_optimize>sOPTIMIZE_NONE && sc_status==statWRITE) {
+  if (pc_optimize>sOPTIMIZE_NONE && (emit_parsing_mode & epmACTIVE)==0 && sc_status==statWRITE) {
     do {
       matches=0;
       start=debut;

From 9fbe72ee7ac3872523239150687d3237c178031f Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Wed, 6 Dec 2017 21:44:18 +0700
Subject: [PATCH 41/43] emit/__emit: Implement compatibility fallbacks for
 'sysreq.c' and 'sysreq.n'

---
 source/compiler/sc1.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index b427b98..8f2fe41 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6258,7 +6258,18 @@ static void SC_FASTCALL emit_do_sysreq_c(char *name)
   ucell p[1];
 
   emit_param_function(&p[0],TRUE);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
+
+  /* if macro instructions aren't enabled, output a 'sysreq.c' instruction,
+   * otherwise generate the following sequence for compatibility:
+   *   const.pri <funcid>
+   *   sysreq.pri
+   */
+  if (pc_optimize<=sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,1);
+  } else {
+    outinstr("const.pri",&p[0],1);
+    outinstr("sysreq.pri",NULL,0);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_sysreq_n(char *name)
@@ -6267,7 +6278,21 @@ static void SC_FASTCALL emit_do_sysreq_n(char *name)
 
   emit_param_function(&p[0],TRUE);
   emit_param_any(&p[1]);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
+
+  /* if macro instructions are enabled, output a 'sysreq.n' instruction,
+   * otherwise generate the following sequence for compatibility:
+   *   push <argsize>
+   *   sysreq.c <funcid>
+   *   stack <argsize> + <cellsize>
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,2);
+  } else {
+    outinstr("push.c",&p[1],1);
+    outinstr("sysreq.c",&p[0],1);
+    p[1]+=sizeof(cell);
+    outinstr("stack",&p[1],1);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_const(char *name)

From 54fd3aee3a623802c6d7b9b030e4b1186e285b56 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Wed, 6 Dec 2017 22:38:22 +0700
Subject: [PATCH 42/43] emit/__emit: Add fallbacks for the other macro opcodes

---
 source/compiler/sc1.c | 116 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 97 insertions(+), 19 deletions(-)

diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 8f2fe41..2bd62f4 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -6259,8 +6259,8 @@ static void SC_FASTCALL emit_do_sysreq_c(char *name)
 
   emit_param_function(&p[0],TRUE);
 
-  /* if macro instructions aren't enabled, output a 'sysreq.c' instruction,
-   * otherwise generate the following sequence for compatibility:
+  /* if macro optimisations aren't enabled, output a 'sysreq.c' instruction,
+   * otherwise generate the following sequence:
    *   const.pri <funcid>
    *   sysreq.pri
    */
@@ -6279,8 +6279,8 @@ static void SC_FASTCALL emit_do_sysreq_n(char *name)
   emit_param_function(&p[0],TRUE);
   emit_param_any(&p[1]);
 
-  /* if macro instructions are enabled, output a 'sysreq.n' instruction,
-   * otherwise generate the following sequence for compatibility:
+  /* if macro optimisations are enabled, output a 'sysreq.n' instruction,
+   * otherwise generate the following sequence:
    *   push <argsize>
    *   sysreq.c <funcid>
    *   stack <argsize> + <cellsize>
@@ -6301,7 +6301,22 @@ static void SC_FASTCALL emit_do_const(char *name)
 
   emit_param_data(&p[0]);
   emit_param_any(&p[1]);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
+
+  /* if macro optimisations are enabled, output a 'const' instruction,
+   * otherwise generate the following sequence:
+   *   push.pri
+   *   const.pri <val>
+   *   stor.pri <addr>
+   *   pop.pri
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,2);
+  } else {
+    outinstr("push.pri",NULL,0);
+    outinstr("const.pri",&p[1],1);
+    outinstr("stor.pri",&p[0],1);
+    outinstr("pop.pri",NULL,0);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_const_s(char *name)
@@ -6310,27 +6325,62 @@ static void SC_FASTCALL emit_do_const_s(char *name)
 
   emit_param_local(&p[0]);
   emit_param_any(&p[1]);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
+
+  /* if macro optimisations are enabled, output a 'const.s' instruction,
+   * otherwise generate the following sequence:
+   *   push.pri
+   *   const.pri <val>
+   *   stor.s.pri <addr>
+   *   pop.pri
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,2);
+  } else {
+    outinstr("push.pri",NULL,0);
+    outinstr("const.pri",&p[1],1);
+    outinstr("stor.s.pri",&p[0],1);
+    outinstr("pop.pri",NULL,0);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_load_both(char *name)
 {
   ucell p[2];
-  int i;
 
-  for (i=0; i<(sizeof p / sizeof p[0]); i++)
-    emit_param_data(&p[i]);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
+  emit_param_data(&p[0]);
+  emit_param_data(&p[1]);
+
+  /* if macro optimisations are enabled, output a 'load.both' instruction,
+   * otherwise generate the following sequence:
+   *   load.pri <val1>
+   *   load.alt <val2>
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,2);
+  } else {
+    outinstr("load.pri",&p[0],1);
+    outinstr("load.alt",&p[1],1);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_load_s_both(char *name)
 {
   ucell p[2];
-  int i;
 
-  for (i=0; i<(sizeof p / sizeof p[0]); i++)
-    emit_param_local(&p[i]);
-  outinstr(name,p,(sizeof p / sizeof p[0]));
+  emit_param_local(&p[0]);
+  emit_param_local(&p[1]);
+
+  /* if macro optimisations are enabled, output a 'load.s.both' instruction,
+   * otherwise generate the following sequence:
+   *   load.s.pri <val1>
+   *   load.s.alt <val2>
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,2);
+  } else {
+    outinstr("load.s.pri",&p[0],1);
+    outinstr("load.s.alt",&p[1],1);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_pushn_c(char *name)
@@ -6343,7 +6393,16 @@ static void SC_FASTCALL emit_do_pushn_c(char *name)
   numargs=name[4]-'0';
   for (i=0; i<numargs; i++)
     emit_param_any(&p[i]);
-  outinstr(name,p,numargs);
+
+  /* if macro optimisations are enabled, output a 'push<N>.c' instruction,
+   * otherwise generate a sequence of <N> 'push.c' instructions
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,numargs);
+  } else {
+    for (i=0; i<numargs; i++)
+      outinstr("push.c",&p[i],1);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_pushn(char *name)
@@ -6356,7 +6415,16 @@ static void SC_FASTCALL emit_do_pushn(char *name)
   numargs=name[4]-'0';
   for (i=0; i<numargs; i++)
     emit_param_data(&p[i]);
-  outinstr(name,p,numargs);
+
+  /* if macro optimisations are enabled, output a 'push<N>' instruction,
+   * otherwise generate a sequence of <N> 'push' instructions
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,numargs);
+  } else {
+    for (i=0; i<numargs; i++)
+      outinstr("push",&p[i],1);
+  } /* if */
 }
 
 static void SC_FASTCALL emit_do_pushn_s_adr(char *name)
@@ -6365,11 +6433,21 @@ static void SC_FASTCALL emit_do_pushn_s_adr(char *name)
   int i,numargs;
 
   assert(name[0]=='p' && name[1]=='u' && name[2]=='s'
-         && name[3]=='h' && '2'<=name[4] && name[4]<='5');
+         && name[3]=='h' && '2'<=name[4] && name[4]<='5' && name[5]=='.');
   numargs=name[4]-'0';
   for (i=0; i<numargs; i++)
-    emit_param_data(&p[i]);
-  outinstr(name,p,numargs);
+    emit_param_local(&p[i]);
+
+  /* if macro optimisations are enabled, output a 'push<N>.s/.adr' instruction,
+   * otherwise generate a sequence of <N> 'push.s/.adr' instructions
+   */
+  if (pc_optimize>sOPTIMIZE_NOMACRO) {
+    outinstr(name,p,numargs);
+  } else {
+    name=(name[6]=='s') ? "push.s" : "push.adr";
+    for (i=0; i<numargs; i++)
+      outinstr(name,&p[i],1);
+  } /* if */
 }
 
 static EMIT_OPCODE emit_opcodelist[] = {

From 939c06011d3164c34f5b63a8e087ba0b08264966 Mon Sep 17 00:00:00 2001
From: Daniel_Cortez <gromovstanislav@yandex.ru>
Date: Sun, 10 Dec 2017 03:16:12 +0700
Subject: [PATCH 43/43] emit/__emit: Another syntax change

---
 source/compiler/sc.h     | 19 +++++----
 source/compiler/sc1.c    | 86 ++++++++++++++++------------------------
 source/compiler/sc3.c    | 16 ++++++--
 source/compiler/sc7.c    |  4 +-
 source/compiler/scvars.c |  3 +-
 5 files changed, 61 insertions(+), 67 deletions(-)

diff --git a/source/compiler/sc.h b/source/compiler/sc.h
index a5378fa..89e08ed 100644
--- a/source/compiler/sc.h
+++ b/source/compiler/sc.h
@@ -870,17 +870,16 @@ SC_VDECL FILE *outf;          /* file written to */
 
 SC_VDECL jmp_buf errbuf;      /* target of longjmp() on a fatal error */
 
-/*  Possible entries for "emit_parsing_mode"
- *  Bits: 0     (epmACTIVE) 'emit'/'__emit' parsing is active
- *        1     (epmBLOCK) multiline ('{}' block) syntax
- *        2     (epmEXPR) used within an expression
- *        3     (epmGLOBAL) used outside of function
+/*  Possible entries for "emit_flags"
+ *  Bits: 0     (epmBLOCK) multiline ('{}' block) syntax
+ *        1     (epmEXPR) used within an expression
+ *        2     (epmGLOBAL) used outside of a function
  */
-#define epmACTIVE   1
-#define epmBLOCK    2
-#define epmEXPR     4
-#define epmGLOBAL   8
-SC_VDECL int emit_parsing_mode;
+#define efBLOCK         1
+#define efEXPR          2
+#define efGLOBAL        4
+SC_VDECL int emit_flags;
+SC_VDECL int emit_stgbuf_idx;
 
 #if !defined SC_LIGHT
   SC_VDECL int sc_makereport; /* generate a cross-reference report */
diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 2bd62f4..545725b 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -895,7 +895,8 @@ static void resetglobals(void)
   sc_curstates=0;
   pc_memflags=0;
   pc_naked=FALSE;
-  emit_parsing_mode=0;
+  emit_flags=0;
+  emit_stgbuf_idx=-1;
 }
 
 static void initglobals(void)
@@ -1652,10 +1653,11 @@ static void parse(void)
       break;
     case tEMIT:
     case t__EMIT:
-      emit_parsing_mode |= epmGLOBAL;
+      emit_flags |= efGLOBAL;
       lex(&val,&str);
       emit_parse_line();
-      emit_parsing_mode &= ~epmGLOBAL;
+      needtoken(';');
+      emit_flags &= ~efGLOBAL;
       break;
     case tNEW:
       if (getclassspec(tok,&fpublic,&fstatic,&fstock,&fconst))
@@ -5100,11 +5102,10 @@ static void statement(int *lastindent,int allow_decl)
   errorset(sRESET,0);
 
   tok=lex(&val,&st);
-  if (tok==tEMIT || tok==t__EMIT) {
-    doemit();
-    return;
-  } else if ((emit_parsing_mode & epmBLOCK)!=0) {
+  if ((emit_flags & efBLOCK)!=0) {
     emit_parse_line();
+    if (matchtoken('}'))
+      emit_flags &= ~efBLOCK;
     return;
   } /* if */
   if (tok!='{') {
@@ -5213,6 +5214,21 @@ static void statement(int *lastindent,int allow_decl)
     matchtoken(tSTATIC);
     decl_enum(sLOCAL,FALSE);
     break;
+  case tEMIT:
+  case t__EMIT: {
+    extern char *sc_tokens[];
+    const char *bck_lptr=lptr-strlen(sc_tokens[tok-tFIRST]);
+    if (matchtoken('{')) {
+      lexpush();
+      emit_flags |= efBLOCK;
+      lastst=tEMIT;
+      break;
+    } /* if */
+    lptr=bck_lptr;
+    lexclr(FALSE);
+    tok=lex(&val,&st);
+  } /* case */
+  /* drop through */
   default:          /* non-empty expression */
     sc_allowproccall=optproccall;
     lexpush();      /* analyze token later */
@@ -5908,7 +5924,7 @@ fetchtok:
     *p=(neg!=FALSE) ? -sym->addr : sym->addr;
     break;
   case '(':
-    if ((emit_parsing_mode & epmEXPR)==0)
+    if ((emit_flags & efEXPR)==0)
       stgset(TRUE);
     stgget(&index,&cidx);
     errorset(sEXPRMARK,0);
@@ -5917,7 +5933,7 @@ fetchtok:
       error(8);         /* must be constant expression */
     errorset(sEXPRRELEASE,0);
     stgdel(index,cidx);
-    if ((emit_parsing_mode & epmEXPR)==0)
+    if ((emit_flags & efEXPR)==0)
       stgset(FALSE);
     needtoken(')');
     *p=(neg!=FALSE) ? -val : val;
@@ -6641,13 +6657,6 @@ SC_FUNC void emit_parse_line(void)
   symbol *sym;
   char name[MAX_INSTR_LEN];
   extern char *sc_tokens[];
-  
-  /* write the staging buffer to the output file so instructions
-   * generated by the `emit`/`__emit` operator could be written
-   * separately without getting altered by the optimizer
-   */
-  stgout(0);
-  emit_parsing_mode |= epmACTIVE;
 
   tok=tokeninfo(&val,&st);
   if (tok==tSYMBOL || (tok>tMIDDLE && tok<=tLAST)) {
@@ -6670,21 +6679,9 @@ SC_FUNC void emit_parse_line(void)
     if (emit_opcodelist[i].name==NULL && *name!='\0')
       error(104,name); /* invalid assembler instruction */
     emit_opcodelist[i].func(name);
-
-    if ((emit_parsing_mode & epmEXPR)==0) {
-      /* make sure the string only contains whitespaces
-       * and/or an optional trailing '}' or ';'
-       */
-      while (*lptr<=' ' && *lptr!='\0')
-        lptr++;
-      if (*lptr!='\0' && *lptr!='}' && (*lptr!=';' || (emit_parsing_mode & epmBLOCK)!=0))
-        error(38);  /* extra characters on line */
-    } /* if */
   } else if (tok==tLABEL) {
-    if ((emit_parsing_mode & epmEXPR)!=0) {
+    if ((emit_flags & (efEXPR | efGLOBAL))!=0) {
       error(29);        /* invalid expression, assumed zero */
-    } else if ((emit_parsing_mode & epmGLOBAL)!=0) {
-      error(11);        /* invalid outside functions */
     } else if (find_constval(&tagname_tab,st,0)!=NULL) {
       error(221,st);    /* label name shadows tagname */
     } else {
@@ -6695,29 +6692,16 @@ SC_FUNC void emit_parse_line(void)
       sym->usage|=uDEFINE;
     } /* if */
   } /* if */
-  if ((emit_parsing_mode & epmBLOCK)!=0) {
-    if (matchtoken('}'))
-      emit_parsing_mode &= ~epmBLOCK;
-  } else if ((emit_parsing_mode & epmEXPR)==0) {
-    matchtoken(';');
-  } /* if */
 
-  /* write the staging buffer again */
-  stgout(0);
-  emit_parsing_mode &= ~epmACTIVE;
-}
-
-static void doemit(void)
-{
-  cell val;
-  char *st;
-
-  if (matchtoken('{')) {
-    lexpush();
-    emit_parsing_mode |= epmBLOCK;
-  } else {
-    lex(&val,&st);
-    emit_parse_line();
+  if ((emit_flags & (efEXPR | efGLOBAL))==0) {
+    assert((emit_flags & efBLOCK)!=0);
+    /* make sure the string only contains whitespaces
+     * and an optional trailing '}'
+     */
+    while (*lptr<=' ' && *lptr!='\0')
+      lptr++;
+    if (*lptr!='\0' && *lptr!='}')
+      error(38);  /* extra characters on line */
   } /* if */
 }
 
diff --git a/source/compiler/sc3.c b/source/compiler/sc3.c
index 9aff411..2216597 100644
--- a/source/compiler/sc3.c
+++ b/source/compiler/sc3.c
@@ -1452,11 +1452,19 @@ static int hier2(value *lval)
   case t__EMIT: {
     cell val;
     char* st;
-    emit_parsing_mode |= epmEXPR;
-    lex(&val,&st);
-    emit_parse_line();
-    emit_parsing_mode &= ~epmEXPR;
+    int block_syntax=matchtoken('(');
+    emit_flags |= efEXPR;
+    if (emit_stgbuf_idx==-1)
+      emit_stgbuf_idx=stgidx;
+    do {
+      lex(&val,&st);
+      emit_parse_line();
+    } while ((block_syntax!=0) && matchtoken(','));
+    if (block_syntax!=0)
+      needtoken(')');
+    emit_flags &= ~efEXPR;
     lval->ident=iEXPRESSION;
+    pc_sideeffect=TRUE;
     return FALSE;
   } /* case */
   default:
diff --git a/source/compiler/sc7.c b/source/compiler/sc7.c
index 0c1613e..07a25b5 100644
--- a/source/compiler/sc7.c
+++ b/source/compiler/sc7.c
@@ -1437,6 +1437,8 @@ SC_FUNC void stgout(int index)
         filewrite(stgpipe+idx);
     } /* if */
   } /* if */
+  if (stgidx<=emit_stgbuf_idx)
+    emit_stgbuf_idx=-1;
   pipeidx=0;  /* reset second pipe */
 }
 
@@ -1770,7 +1772,7 @@ static void stgopt(char *start,char *end,int (*outputfunc)(char *str))
 
   assert(sequences!=NULL);
   /* do not match anything if debug-level is maximum */
-  if (pc_optimize>sOPTIMIZE_NONE && (emit_parsing_mode & epmACTIVE)==0 && sc_status==statWRITE) {
+  if (pc_optimize>sOPTIMIZE_NONE && sc_status==statWRITE && emit_stgbuf_idx==-1) {
     do {
       matches=0;
       start=debut;
diff --git a/source/compiler/scvars.c b/source/compiler/scvars.c
index 2038ad8..5055a15 100644
--- a/source/compiler/scvars.c
+++ b/source/compiler/scvars.c
@@ -105,7 +105,8 @@ SC_VDEFINE FILE *outf    = NULL;   /* (intermediate) text file written to */
 
 SC_VDEFINE jmp_buf errbuf;
 
-SC_VDEFINE int emit_parsing_mode=0;
+SC_VDEFINE int emit_flags;
+SC_VDEFINE int emit_stgbuf_idx;
 
 #if !defined SC_LIGHT
   SC_VDEFINE int sc_makereport=FALSE; /* generate a cross-reference report */