Not an assembler instruction, but virtual instruction used by the IR.

diff --git a/ast.c b/ast.c
index 3a4f1d7b2782f39983174d686a889a9f1e497dae..7f6841fb96aea414e5d7f6afa78922b4f7d995f3 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -2834,7 +2834,7 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va
         return true;
 
     cmpinstr = type_eq_instr[irop->vtype];
         return true;
 
     cmpinstr = type_eq_instr[irop->vtype];

-    if (cmpinstr >= AINSTR_END) {
+    if (cmpinstr >= VINSTR_END) {

         ast_type_to_string(self->operand, typestr, sizeof(typestr));
         compile_error(ast_ctx(self), "invalid type to perform a switch on: %s", typestr);
         return false;
         ast_type_to_string(self->operand, typestr, sizeof(typestr));
         compile_error(ast_ctx(self), "invalid type to perform a switch on: %s", typestr);
         return false;

diff --git a/gmqcc.h b/gmqcc.h
index fef63629b8a17b7c28ed5560a4f420c66f5fdb80..e9d2ad57894aaf75dfcd6db915ec77ff2021b7d2 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -683,17 +683,11 @@ enum {
     INSTR_BITAND,
     INSTR_BITOR,
 
     INSTR_BITAND,
     INSTR_BITOR,
 

-    /*
-     * Virtual instructions used by the assembler
-     * keep at the end but before virtual instructions
-     * for the IR below.
-     */
-    AINSTR_END,
-

     /*
      * Virtual instructions used by the IR
      * Keep at the end!
      */
     /*
      * Virtual instructions used by the IR
      * Keep at the end!
      */

+    VINSTR_END,

     VINSTR_PHI,
     VINSTR_JUMP,
     VINSTR_COND,
     VINSTR_PHI,
     VINSTR_JUMP,
     VINSTR_COND,

diff --git a/ir.c b/ir.c
index 0d7d90e459caee83b55e7e0937e9c7453d853af9..5d8085a18947e6fddbf3998b565afe71394c5eaa 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -83,11 +83,11 @@ uint16_t type_store_instr[TYPE_COUNT] = {
 
     INSTR_STORE_V, /* variant, should never be accessed */
 
 
     INSTR_STORE_V, /* variant, should never be accessed */
 

-    AINSTR_END, /* struct */
-    AINSTR_END, /* union  */
-    AINSTR_END, /* array  */
-    AINSTR_END, /* nil    */
-    AINSTR_END, /* noexpr */
+    VINSTR_END, /* struct */
+    VINSTR_END, /* union  */
+    VINSTR_END, /* array  */
+    VINSTR_END, /* nil    */
+    VINSTR_END, /* noexpr */

 };
 
 uint16_t field_store_instr[TYPE_COUNT] = {
 };
 
 uint16_t field_store_instr[TYPE_COUNT] = {


@@ -107,11 +107,11 @@ uint16_t field_store_instr[TYPE_COUNT] = {
 
     INSTR_STORE_V, /* variant, should never be accessed */
 
 
     INSTR_STORE_V, /* variant, should never be accessed */
 

-    AINSTR_END, /* struct */
-    AINSTR_END, /* union  */
-    AINSTR_END, /* array  */
-    AINSTR_END, /* nil    */
-    AINSTR_END, /* noexpr */
+    VINSTR_END, /* struct */
+    VINSTR_END, /* union  */
+    VINSTR_END, /* array  */
+    VINSTR_END, /* nil    */
+    VINSTR_END, /* noexpr */

 };
 
 uint16_t type_storep_instr[TYPE_COUNT] = {
 };
 
 uint16_t type_storep_instr[TYPE_COUNT] = {


@@ -131,11 +131,11 @@ uint16_t type_storep_instr[TYPE_COUNT] = {
 
     INSTR_STOREP_V, /* variant, should never be accessed */
 
 
     INSTR_STOREP_V, /* variant, should never be accessed */
 

-    AINSTR_END, /* struct */
-    AINSTR_END, /* union  */
-    AINSTR_END, /* array  */
-    AINSTR_END, /* nil    */
-    AINSTR_END, /* noexpr */
+    VINSTR_END, /* struct */
+    VINSTR_END, /* union  */
+    VINSTR_END, /* array  */
+    VINSTR_END, /* nil    */
+    VINSTR_END, /* noexpr */

 };
 
 uint16_t type_eq_instr[TYPE_COUNT] = {
 };
 
 uint16_t type_eq_instr[TYPE_COUNT] = {


@@ -155,11 +155,11 @@ uint16_t type_eq_instr[TYPE_COUNT] = {
 
     INSTR_EQ_V, /* variant, should never be accessed */
 
 
     INSTR_EQ_V, /* variant, should never be accessed */
 

-    AINSTR_END, /* struct */
-    AINSTR_END, /* union  */
-    AINSTR_END, /* array  */
-    AINSTR_END, /* nil    */
-    AINSTR_END, /* noexpr */
+    VINSTR_END, /* struct */
+    VINSTR_END, /* union  */
+    VINSTR_END, /* array  */
+    VINSTR_END, /* nil    */
+    VINSTR_END, /* noexpr */

 };
 
 uint16_t type_ne_instr[TYPE_COUNT] = {
 };
 
 uint16_t type_ne_instr[TYPE_COUNT] = {


@@ -179,11 +179,11 @@ uint16_t type_ne_instr[TYPE_COUNT] = {
 
     INSTR_NE_V, /* variant, should never be accessed */
 
 
     INSTR_NE_V, /* variant, should never be accessed */
 

-    AINSTR_END, /* struct */
-    AINSTR_END, /* union  */
-    AINSTR_END, /* array  */
-    AINSTR_END, /* nil    */
-    AINSTR_END, /* noexpr */
+    VINSTR_END, /* struct */
+    VINSTR_END, /* union  */
+    VINSTR_END, /* array  */
+    VINSTR_END, /* nil    */
+    VINSTR_END, /* noexpr */

 };
 
 uint16_t type_not_instr[TYPE_COUNT] = {
 };
 
 uint16_t type_not_instr[TYPE_COUNT] = {


@@ -203,11 +203,11 @@ uint16_t type_not_instr[TYPE_COUNT] = {
 
     INSTR_NOT_V, /* variant, should never be accessed */
 
 
     INSTR_NOT_V, /* variant, should never be accessed */
 

-    AINSTR_END, /* struct */
-    AINSTR_END, /* union  */
-    AINSTR_END, /* array  */
-    AINSTR_END, /* nil    */
-    AINSTR_END, /* noexpr */
+    VINSTR_END, /* struct */
+    VINSTR_END, /* union  */
+    VINSTR_END, /* array  */
+    VINSTR_END, /* nil    */
+    VINSTR_END, /* noexpr */

 };
 
 /* protos */
 };
 
 /* protos */

diff --git a/parser.c b/parser.c
index 1bdddf3e386837d1b121ce59056d338ca73ff6a6..bfd8e845ddfc1c320df6e5df1b472953f12107aa 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -1101,7 +1101,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
                 }
                 else
                     assignop = type_storep_instr[exprs[0]->expression.vtype];
                 }
                 else
                     assignop = type_storep_instr[exprs[0]->expression.vtype];

-                if (assignop == AINSTR_END || !ast_compare_type(field->expression.next, exprs[1]))
+                if (assignop == VINSTR_END || !ast_compare_type(field->expression.next, exprs[1]))

                 {
                     ast_type_to_string(field->expression.next, ty1, sizeof(ty1));
                     ast_type_to_string(exprs[1], ty2, sizeof(ty2));
                 {
                     ast_type_to_string(field->expression.next, ty1, sizeof(ty1));
                     ast_type_to_string(exprs[1], ty2, sizeof(ty2));


@@ -1128,7 +1128,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
                     assignop = type_store_instr[exprs[0]->expression.vtype];
                 }
 
                     assignop = type_store_instr[exprs[0]->expression.vtype];
                 }
 

-                if (assignop == AINSTR_END) {
+                if (assignop == VINSTR_END) {

                     ast_type_to_string(exprs[0], ty1, sizeof(ty1));
                     ast_type_to_string(exprs[1], ty2, sizeof(ty2));
                     compile_error(ctx, "invalid types in assignment: cannot assign %s to %s", ty2, ty1);
                     ast_type_to_string(exprs[0], ty1, sizeof(ty1));
                     ast_type_to_string(exprs[1], ty2, sizeof(ty2));
                     compile_error(ctx, "invalid types in assignment: cannot assign %s to %s", ty2, ty1);