mirror of
https://github.com/DarkPlacesEngine/gmqcc.git
synced 2024-11-27 22:22:17 +00:00
Make divVerent happy about handling divison by zero/inf/nan and negitive versions. This code now assumes IEEE 754.
This commit is contained in:
parent
c8413a9a04
commit
6d8d7ee923
1 changed files with 5 additions and 33 deletions
38
fold.c
38
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)
|
((ast_expression*)(X))->vtype != TYPE_FUNCTION)
|
||||||
|
|
||||||
#define fold_can_2(X, Y) (fold_can_1(X) && fold_can_1(Y))
|
#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_float(E) ((E)->constval.vfloat)
|
||||||
#define fold_immvalue_vector(E) ((E)->constval.vvec)
|
#define fold_immvalue_vector(E) ((E)->constval.vvec)
|
||||||
#define fold_immvalue_string(E) ((E)->constval.vstring)
|
#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_init(parser_t *parser) {
|
||||||
fold_t *fold = (fold_t*)mem_a(sizeof(fold_t));
|
fold_t *fold = (fold_t*)mem_a(sizeof(fold_t));
|
||||||
fold->parser = parser;
|
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, 0.0f);
|
||||||
(void)fold_constgen_float (fold, 1.0f);
|
(void)fold_constgen_float (fold, 1.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(0.0f, 0.0f, 0.0f));
|
||||||
(void)fold_constgen_vector(fold, vec3_create(-1.0f, -1.0f, -1.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;
|
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) {
|
static GMQCC_INLINE ast_expression *fold_op_div(fold_t *fold, ast_value *a, ast_value *b) {
|
||||||
if (isfloat(a)) {
|
if (isfloat(a)) {
|
||||||
if (fold_can_2(a, b)) {
|
if (fold_can_2(a, b)) {
|
||||||
if (fold_can_div(b))
|
return fold_constgen_float(fold, fold_immvalue_float(a) / fold_immvalue_float(b));
|
||||||
return fold_constgen_float(fold, fold_immvalue_float(a) / fold_immvalue_float(b));
|
|
||||||
else
|
|
||||||
return (ast_expression*)fold->imm_float[3]; /* inf */
|
|
||||||
} else if (fold_can_1(b)) {
|
} else if (fold_can_1(b)) {
|
||||||
return (ast_expression*)ast_binary_new(
|
return (ast_expression*)ast_binary_new(
|
||||||
fold_ctx(fold),
|
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)) {
|
} else if (isvector(a)) {
|
||||||
if (fold_can_2(a, b)) {
|
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)));
|
||||||
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 */
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return (ast_expression*)ast_binary_new(
|
return (ast_expression*)ast_binary_new(
|
||||||
fold_ctx(fold),
|
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) {
|
static GMQCC_INLINE ast_expression *fold_op_mod(fold_t *fold, ast_value *a, ast_value *b) {
|
||||||
if (fold_can_2(a, b)) {
|
return (fold_can_2(a, b))
|
||||||
if (fold_can_div(b))
|
? fold_constgen_float(fold, fmod(fold_immvalue_float(a), fold_immvalue_float(b)))
|
||||||
return fold_constgen_float(fold, (qcfloat_t)(((qcint_t)fold_immvalue_float(a)) % ((qcint_t)fold_immvalue_float(b))));
|
: NULL;
|
||||||
else
|
|
||||||
return (ast_expression*)fold->imm_float[3]; /* inf */
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static GMQCC_INLINE ast_expression *fold_op_bor(fold_t *fold, ast_value *a, ast_value *b) {
|
static GMQCC_INLINE ast_expression *fold_op_bor(fold_t *fold, ast_value *a, ast_value *b) {
|
||||||
|
|
Loading…
Reference in a new issue