From 6d8d7ee923a5773456f986bca60c7f5ea96c9d41 Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Mon, 14 Oct 2013 22:31:37 -0400 Subject: [PATCH] Make divVerent happy about handling divison by zero/inf/nan and negitive versions. This code now assumes IEEE 754. --- fold.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/fold.c b/fold.c index ffa0f65..c4b474b 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; } @@ -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) { -- 2.39.2