Faster hashing reaching 16 GB/s on Phenom II X4.

[xonotic/gmqcc.git] / ast.c

diff --git a/ast.c b/ast.c
index 7b2da4d872fd578361c50af6ae6e231e4ea2a626..e10bbed51712ecea27d544b466517ecf5ec99749 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -442,17 +442,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];
+            }
         }
     }
 
@@ -1192,7 +1195,6 @@ ast_function* ast_function_new(lex_ctx_t ctx, const char *name, ast_value *vtype
     if (!vtype) {
         compile_error(ast_ctx(self), "internal error: ast_function_new condition 0");
         goto cleanup;
-    } else if (vtype->hasvalue || vtype->expression.vtype != TYPE_FUNCTION) {
     } else if (vtype->hasvalue || vtype->expression.vtype != TYPE_FUNCTION) {
         compile_error(ast_ctx(self), "internal error: ast_function_new condition %i %i type=%i (probably 2 bodies?)",
                  (int)!vtype,
@@ -1222,6 +1224,9 @@ ast_function* ast_function_new(lex_ctx_t ctx, const char *name, ast_value *vtype
     self->fixedparams      = NULL;
     self->return_value     = NULL;
 
+    self->static_names     = NULL;
+    self->static_count     = 0;
+
     return self;
 
 cleanup:
@@ -1243,6 +1248,9 @@ void ast_function_delete(ast_function *self)
          */
         ast_unref(self->vtype);
     }
+    for (i = 0; i < vec_size(self->static_names); ++i)
+        mem_d(self->static_names[i]);
+    vec_free(self->static_names);
     for (i = 0; i < vec_size(self->blocks); ++i)
         ast_delete(self->blocks[i]);
     vec_free(self->blocks);