X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=fold.c;h=0128dece56cf030039463c7c0619c482a3ac455e;hp=d485ed23f1dba4c9957f4635773983b8467fc75b;hb=892746056e1082aad991c5287b511d72534542c9;hpb=151606e25558ec8f8f211db5aba4c4fa66948731 diff --git a/fold.c b/fold.c index d485ed2..0128dec 100644 --- a/fold.c +++ b/fold.c @@ -209,25 +209,11 @@ static GMQCC_INLINE bool fold_immediate_true(fold_t *fold, ast_value *v) { ((ast_expression*)(X))->vtype != TYPE_FUNCTION) #define fold_can_2(X, Y) (fold_can_1(X) && fold_can_1(Y)) -#define fold_can_div(X) (fold_immvalue_float(X) != 0.0f) #define fold_immvalue_float(E) ((E)->constval.vfloat) #define fold_immvalue_vector(E) ((E)->constval.vvec) #define fold_immvalue_string(E) ((E)->constval.vstring) -#ifdef INFINITY -# define fold_infinity_float INFINITY -#else -# define fold_infinity_float (1.0 / 0.0) -#endif /*! INFINITY */ - -#define fold_infinity_vector \ - vec3_create( \ - fold_infinity_float, \ - fold_infinity_float, \ - fold_infinity_float \ - ) - fold_t *fold_init(parser_t *parser) { fold_t *fold = (fold_t*)mem_a(sizeof(fold_t)); fold->parser = parser; @@ -244,11 +230,9 @@ fold_t *fold_init(parser_t *parser) { (void)fold_constgen_float (fold, 0.0f); (void)fold_constgen_float (fold, 1.0f); (void)fold_constgen_float (fold, -1.0f); - (void)fold_constgen_float (fold, fold_infinity_float); /* +inf */ (void)fold_constgen_vector(fold, vec3_create(0.0f, 0.0f, 0.0f)); (void)fold_constgen_vector(fold, vec3_create(-1.0f, -1.0f, -1.0f)); - (void)fold_constgen_vector(fold, fold_infinity_vector); /* +inf */ return fold; } @@ -295,7 +279,7 @@ ast_expression *fold_constgen_float(fold_t *fold, qcfloat_t value) { size_t i; for (i = 0; i < vec_size(fold->imm_float); i++) { - if (fold->imm_float[i]->constval.vfloat == value) + if (!memcmp(&fold->imm_float[i]->constval.vfloat, &value, sizeof(qcfloat_t))) return (ast_expression*)fold->imm_float[i]; } @@ -338,7 +322,7 @@ ast_expression *fold_constgen_string(fold_t *fold, const char *str, bool transla if (translate) { char name[32]; - platform_snprintf(name, sizeof(name), "dotranslate_%lu", (unsigned long)(fold->parser->translated++)); + util_snprintf(name, sizeof(name), "dotranslate_%lu", (unsigned long)(fold->parser->translated++)); out = ast_value_new(parser_ctx(fold->parser), name, TYPE_STRING); out->expression.flags |= AST_FLAG_INCLUDE_DEF; /* def needs to be included for translatables */ } else @@ -479,10 +463,7 @@ static GMQCC_INLINE ast_expression *fold_op_mul(fold_t *fold, ast_value *a, ast_ static GMQCC_INLINE ast_expression *fold_op_div(fold_t *fold, ast_value *a, ast_value *b) { if (isfloat(a)) { if (fold_can_2(a, b)) { - if (fold_can_div(b)) - return fold_constgen_float(fold, fold_immvalue_float(a) / fold_immvalue_float(b)); - else - return (ast_expression*)fold->imm_float[3]; /* inf */ + return fold_constgen_float(fold, fold_immvalue_float(a) / fold_immvalue_float(b)); } else if (fold_can_1(b)) { return (ast_expression*)ast_binary_new( fold_ctx(fold), @@ -493,12 +474,7 @@ static GMQCC_INLINE ast_expression *fold_op_div(fold_t *fold, ast_value *a, ast_ } } else if (isvector(a)) { if (fold_can_2(a, b)) { - if (fold_can_div(b)) { - return fold_constgen_vector(fold, vec3_mulvf(fold_immvalue_vector(a), 1.0f / fold_immvalue_float(b))); - } - else { - return (ast_expression*)fold->imm_vector[2]; /* inf */ - } + return fold_constgen_vector(fold, vec3_mulvf(fold_immvalue_vector(a), 1.0f / fold_immvalue_float(b))); } else { return (ast_expression*)ast_binary_new( fold_ctx(fold), @@ -519,13 +495,9 @@ static GMQCC_INLINE ast_expression *fold_op_div(fold_t *fold, ast_value *a, ast_ } static GMQCC_INLINE ast_expression *fold_op_mod(fold_t *fold, ast_value *a, ast_value *b) { - if (fold_can_2(a, b)) { - if (fold_can_div(b)) - return fold_constgen_float(fold, (qcfloat_t)(((qcint_t)fold_immvalue_float(a)) % ((qcint_t)fold_immvalue_float(b)))); - else - return (ast_expression*)fold->imm_float[3]; /* inf */ - } - return NULL; + return (fold_can_2(a, b)) + ? fold_constgen_float(fold, fmod(fold_immvalue_float(a), fold_immvalue_float(b))) + : NULL; } static GMQCC_INLINE ast_expression *fold_op_bor(fold_t *fold, ast_value *a, ast_value *b) { @@ -762,13 +734,18 @@ static GMQCC_INLINE ast_expression *fold_intrin_fabs(fold_t *fold, ast_value *va } ast_expression *fold_intrin(fold_t *fold, const char *intrin, ast_expression **arg) { - if (!strcmp(intrin, "mod")) return fold_intrin_mod (fold, (ast_value*)arg[0], (ast_value*)arg[1]); - if (!strcmp(intrin, "pow")) return fold_intrin_pow (fold, (ast_value*)arg[0], (ast_value*)arg[1]); - if (!strcmp(intrin, "exp")) return fold_intrin_exp (fold, (ast_value*)arg[0]); - if (!strcmp(intrin, "isnan")) return fold_intrin_isnan(fold, (ast_value*)arg[0]); - if (!strcmp(intrin, "fabs")) return fold_intrin_fabs (fold, (ast_value*)arg[0]); + ast_expression *ret = NULL; - return NULL; + if (!strcmp(intrin, "mod")) ret = fold_intrin_mod (fold, (ast_value*)arg[0], (ast_value*)arg[1]); + if (!strcmp(intrin, "pow")) ret = fold_intrin_pow (fold, (ast_value*)arg[0], (ast_value*)arg[1]); + if (!strcmp(intrin, "exp")) ret = fold_intrin_exp (fold, (ast_value*)arg[0]); + if (!strcmp(intrin, "isnan")) ret = fold_intrin_isnan(fold, (ast_value*)arg[0]); + if (!strcmp(intrin, "fabs")) ret = fold_intrin_fabs (fold, (ast_value*)arg[0]); + + if (ret) + ++opts_optimizationcount[OPTIM_CONST_FOLD]; + + return ret; } /* @@ -796,42 +773,59 @@ ast_expression *fold_intrin(fold_t *fold, const char *intrin, ast_expression **a #define fold_can_1(X) ((X)->hasvalue && (X)->cvq == CV_CONST) /*#define fold_can_2(X,Y) (fold_can_1(X) && fold_can_1(Y))*/ -ast_expression *fold_superfluous(ast_expression *left, ast_expression *right, int op) { +static ast_expression *fold_superfluous(ast_expression *left, ast_expression *right, int op) { + ast_expression *swapped = NULL; /* using this as bool */ ast_value *load; - if (!ast_istype(left, ast_value) || !fold_can_1((load = (ast_value*)right))) + if (!ast_istype(right, ast_value) || !fold_can_1((load = (ast_value*)right))) { + swapped = left; + left = right; + right = swapped; + } + + if (!ast_istype(right, ast_value) || !fold_can_1((load = (ast_value*)right))) return NULL; switch (op) { - case INSTR_MUL_F: case INSTR_DIV_F: + if (swapped) + return NULL; + case INSTR_MUL_F: if (fold_immvalue_float(load) == 1.0f) { ++opts_optimizationcount[OPTIM_PEEPHOLE]; - return (ast_expression*)left; + ast_unref(right); + return left; } break; - case INSTR_ADD_F: case INSTR_SUB_F: + if (swapped) + return NULL; + case INSTR_ADD_F: if (fold_immvalue_float(load) == 0.0f) { ++opts_optimizationcount[OPTIM_PEEPHOLE]; - return (ast_expression*)left; + ast_unref(right); + return left; } break; case INSTR_MUL_V: if (vec3_cmp(fold_immvalue_vector(load), vec3_create(1, 1, 1))) { ++opts_optimizationcount[OPTIM_PEEPHOLE]; - return (ast_expression*)left; + ast_unref(right); + return left; } break; - case INSTR_ADD_V: case INSTR_SUB_V: + if (swapped) + return NULL; + case INSTR_ADD_V: if (vec3_cmp(fold_immvalue_vector(load), vec3_create(0, 0, 0))) { ++opts_optimizationcount[OPTIM_PEEPHOLE]; - return (ast_expression*)left; + ast_unref(right); + return left; } break; } @@ -839,6 +833,13 @@ ast_expression *fold_superfluous(ast_expression *left, ast_expression *right, in return NULL; } +ast_expression *fold_binary(lex_ctx_t ctx, int op, ast_expression *left, ast_expression *right) { + ast_expression *ret = fold_superfluous(left, right, op); + if (ret) + return ret; + return (ast_expression*)ast_binary_new(ctx, op, left, right); +} + static GMQCC_INLINE int fold_cond(ir_value *condval, ast_function *func, ast_ifthen *branch) { if (isfloat(condval) && fold_can_1(condval) && OPTS_OPTIMIZATION(OPTIM_CONST_FOLD_DCE)) { ast_expression_codegen *cgen;