X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=ast.c;h=d7e3d7a198cae3df58a8e2c0e0d87372e534e074;hb=24763aad65b8a6cb7fda9e038ee058b2ea02b875;hp=238d00a8e9455ec7e3770f8a2b1426887cff1287;hpb=ac7e1a557d6dde0fc201e74c23446a65d5b8a142;p=xonotic%2Fgmqcc.git

diff --git a/ast.c b/ast.c
index 238d00a..d7e3d7a 100644
--- a/ast.c
+++ b/ast.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013
+ * Copyright (C) 2012, 2013, 2014
  *     Wolfgang Bumiller
  *     Dale Weiler
  *
@@ -113,8 +113,10 @@ static void ast_expression_init(ast_expression *self,
     self->outr     = NULL;
     self->params   = NULL;
     self->count    = 0;
-    self->flags    = 0;
     self->varparam = NULL;
+    self->flags    = 0;
+    if (OPTS_OPTION_BOOL(OPTION_COVERAGE))
+        self->flags |= AST_FLAG_BLOCK_COVERAGE;
 }
 
 static void ast_expression_delete(ast_expression *self)
@@ -442,17 +444,20 @@ ast_binary* ast_binary_new(lex_ctx_t ctx, int op,
     ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_binary_codegen);
 
     if (ast_istype(right, ast_unary) && OPTS_OPTIMIZATION(OPTIM_PEEPHOLE)) {
-        ast_expression *normal = ((ast_unary*)right)->operand;
+        ast_unary      *unary  = ((ast_unary*)right);
+        ast_expression *normal = unary->operand;
 
         /* make a-(-b) => a + b */
-        if (op == INSTR_SUB_F) {
-            op = INSTR_ADD_F;
-            right = normal;
-            ++opts_optimizationcount[OPTIM_PEEPHOLE];
-        } else if (op == INSTR_SUB_V) {
-            op = INSTR_ADD_V;
-            right = normal;
-            ++opts_optimizationcount[OPTIM_PEEPHOLE];
+        if (unary->op == VINSTR_NEG_F || unary->op == VINSTR_NEG_V) {
+            if (op == INSTR_SUB_F) {
+                op = INSTR_ADD_F;
+                right = normal;
+                ++opts_optimizationcount[OPTIM_PEEPHOLE];
+            } else if (op == INSTR_SUB_V) {
+                op = INSTR_ADD_V;
+                right = normal;
+                ++opts_optimizationcount[OPTIM_PEEPHOLE];
+            }
         }
     }
 
@@ -1427,6 +1432,8 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
             self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
         if (self->expression.flags & AST_FLAG_ERASEABLE)
             self->ir_v->flags |= IR_FLAG_ERASEABLE;
+        if (self->expression.flags & AST_FLAG_BLOCK_COVERAGE)
+            func->flags |= IR_FLAG_BLOCK_COVERAGE;
         /* The function is filled later on ast_function_codegen... */
         return true;
     }