remove trailing \n from 2 error messages

[xonotic/gmqcc.git] / ir.c

diff --git a/ir.c b/ir.c
index 266651d03557e4a6a54ed3c054583d5e2787116a..dcf03e0f2905397a839542194e2b1c58b820fc20 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -177,7 +177,7 @@ void ir_builder_delete(ir_builder* self)
     for (i = 0; i != self->globals_count; ++i) {
         ir_value_delete(self->globals[i]);
     }
-    MEM_VECTOR_CLEAR(self, fields);
+    MEM_VECTOR_CLEAR(self, globals);
     for (i = 0; i != self->fields_count; ++i) {
         ir_value_delete(self->fields[i]);
     }
@@ -977,7 +977,7 @@ bool ir_values_overlap(const ir_value *a, const ir_value *b)
             if (++la == enda)
                 break;
         }
-        else if (lb->start < la->start)
+        else /* if (lb->start < la->start)  actually <= */
         {
             /* order: B A, move B forward
              * check if we hit the end with B
@@ -1077,11 +1077,11 @@ bool ir_block_create_return(ir_block *self, ir_value *v)
     if (!in)
         return false;
 
-    if (!ir_instr_op(in, 0, v, false) ||
-        !ir_block_instr_add(self, in) )
-    {
+    if (v && !ir_instr_op(in, 0, v, false))
+        return false;
+
+    if (!ir_block_instr_add(self, in))
         return false;
-    }
     return true;
 }
 
@@ -1446,11 +1446,12 @@ ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_va
 
     switch (outype)
     {
-        case TYPE_FLOAT:   op = INSTR_LOAD_F;   break;
-        case TYPE_VECTOR:  op = INSTR_LOAD_V;   break;
-        case TYPE_STRING:  op = INSTR_LOAD_S;   break;
-        case TYPE_FIELD:   op = INSTR_LOAD_FLD; break;
-        case TYPE_ENTITY:  op = INSTR_LOAD_ENT; break;
+        case TYPE_FLOAT:    op = INSTR_LOAD_F;   break;
+        case TYPE_VECTOR:   op = INSTR_LOAD_V;   break;
+        case TYPE_STRING:   op = INSTR_LOAD_S;   break;
+        case TYPE_FIELD:    op = INSTR_LOAD_FLD; break;
+        case TYPE_ENTITY:   op = INSTR_LOAD_ENT; break;
+        case TYPE_FUNCTION: op = INSTR_LOAD_FNC; break;
 #if 0
         case TYPE_POINTER: op = INSTR_LOAD_I;   break;
         case TYPE_INTEGER: op = INSTR_LOAD_I;   break;
@@ -2342,13 +2343,13 @@ tailcall:
 
             if (ontrue->generated) {
                 stmt.opcode = INSTR_IF;
-                stmt.o2.s1 = (ontrue->code_start-1) - code_statements_elements;
+                stmt.o2.s1 = (ontrue->code_start) - code_statements_elements;
                 if (code_statements_add(stmt) < 0)
                     return false;
             }
             if (onfalse->generated) {
                 stmt.opcode = INSTR_IFNOT;
-                stmt.o2.s1 = (onfalse->code_start-1) - code_statements_elements;
+                stmt.o2.s1 = (onfalse->code_start) - code_statements_elements;
                 if (code_statements_add(stmt) < 0)
                     return false;
             }
@@ -2698,7 +2699,7 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field)
         }
 
         name[0] = '.';
-        strcpy(name+1, field->name); /* no strncpy - we used strlen above */
+        memcpy(name+1, field->name, len); /* no strncpy - we used strlen above */
         name[len+1] = 0;
 
         def.name = code_genstring(name);
@@ -2773,6 +2774,12 @@ bool ir_builder_generate(ir_builder *self, const char *filename)
 
 #define IND_BUFSZ 1024
 
+#ifdef WIN32
+# define strncat(dst, src, sz) strncat_s(dst, sz, src, _TRUNCATE)
+#else
+# define strncat strncat
+#endif
+
 const char *qc_opname(int op)
 {
     if (op < 0) return "<INVALID>";