compile_error(ctx, "arithmetic overflow in `%s' component", vec);
if (state->exceptionflags & SFLOAT_UNDERFLOW)
compile_error(ctx, "arithmetic underflow in `%s' component", vec);
- return;
+ return;
}
if (state->exceptionflags & SFLOAT_DIVBYZERO)
compile_error(ctx, "division by zero");
* This file is thus, split into two parts.
*/
-#define isfloat(X) (((ast_expression*)(X))->m_vtype == TYPE_FLOAT)
-#define isvector(X) (((ast_expression*)(X))->m_vtype == TYPE_VECTOR)
-#define isstring(X) (((ast_expression*)(X))->m_vtype == TYPE_STRING)
-#define isarray(X) (((ast_expression*)(X))->m_vtype == TYPE_ARRAY)
+#define isfloat(X) (((X))->m_vtype == TYPE_FLOAT)
+#define isvector(X) (((X))->m_vtype == TYPE_VECTOR)
+#define isstring(X) (((X))->m_vtype == TYPE_STRING)
+#define isarray(X) (((X))->m_vtype == TYPE_ARRAY)
#define isfloats(X,Y) (isfloat (X) && isfloat (Y))
/*
/* Handy macros to determine if an ast_value can be constant folded. */
#define fold_can_1(X) \
- (ast_istype(((ast_expression*)(X)), ast_value) && (X)->m_hasvalue && ((X)->m_cvq == CV_CONST) && \
- ((ast_expression*)(X))->m_vtype != TYPE_FUNCTION)
+ (ast_istype(((X)), ast_value) && (X)->m_hasvalue && ((X)->m_cvq == CV_CONST) && \
+ ((X))->m_vtype != TYPE_FUNCTION)
#define fold_can_2(X, Y) (fold_can_1(X) && fold_can_1(Y))
// generate globals for immediate folded values
ast_value *cur;
for (auto &it : m_imm_float)
- if (!ast_global_codegen((cur = it), ir, false)) goto err;
+ if (!(cur = it)->generateGlobal(ir, false)) goto err;
for (auto &it : m_imm_vector)
- if (!ast_global_codegen((cur = it), ir, false)) goto err;
+ if (!(cur = it)->generateGlobal(ir, false)) goto err;
for (auto &it : m_imm_string)
- if (!ast_global_codegen((cur = it), ir, false)) goto err;
+ if (!(cur = it)->generateGlobal(ir, false)) goto err;
return true;
err:
- con_out("failed to generate global %s\n", cur->m_name);
+ con_out("failed to generate global %s\n", cur->m_name.c_str());
delete ir;
return false;
}
ast_expression *fold::constgen_float(qcfloat_t value, bool inexact) {
for (auto &it : m_imm_float)
if (!memcmp(&it->m_constval.vfloat, &value, sizeof(qcfloat_t)))
- return (ast_expression*)it;
+ return it;
- ast_value *out = ast_value_new(ctx(), "#IMMEDIATE", TYPE_FLOAT);
+ ast_value *out = new ast_value(ctx(), "#IMMEDIATE", TYPE_FLOAT);
out->m_cvq = CV_CONST;
out->m_hasvalue = true;
out->m_inexact = inexact;
m_imm_float.push_back(out);
- return (ast_expression*)out;
+ return out;
}
ast_expression *fold::constgen_vector(vec3_t value) {
for (auto &it : m_imm_vector)
if (vec3_cmp(it->m_constval.vvec, value))
- return (ast_expression*)it;
+ return it;
- ast_value *out = ast_value_new(ctx(), "#IMMEDIATE", TYPE_VECTOR);
+ ast_value *out = new ast_value(ctx(), "#IMMEDIATE", TYPE_VECTOR);
out->m_cvq = CV_CONST;
out->m_hasvalue = true;
out->m_constval.vvec = value;
m_imm_vector.push_back(out);
- return (ast_expression*)out;
+ return out;
}
ast_expression *fold::constgen_string(const char *str, bool translate) {
size_t hash = util_hthash(table, str);
if ((out = (ast_value*)util_htgeth(table, str, hash)))
- return (ast_expression*)out;
+ return out;
if (translate) {
char name[32];
util_snprintf(name, sizeof(name), "dotranslate_%zu", m_parser->translated++);
- out = ast_value_new(ctx(), name, TYPE_STRING);
+ out = new ast_value(ctx(), name, TYPE_STRING);
out->m_flags |= AST_FLAG_INCLUDE_DEF; /* def needs to be included for translatables */
} else {
- out = ast_value_new(ctx(), "#IMMEDIATE", TYPE_STRING);
+ out = new ast_value(ctx(), "#IMMEDIATE", TYPE_STRING);
}
out->m_cvq = CV_CONST;
m_imm_string.push_back(out);
util_htseth(table, str, hash, out);
- return (ast_expression*)out;
+ return out;
+}
+
+ast_expression *fold::constgen_string(const std::string &str, bool translate) {
+ return constgen_string(str.c_str(), translate);
}
typedef union {
if (!y && !z) {
ast_expression *out;
++opts_optimizationcount[OPTIM_VECTOR_COMPONENTS];
- out = (ast_expression*)ast_member_new(ctx(), (ast_expression*)sel, set[0]-'x', nullptr);
+ out = ast_member::make(ctx(), sel, set[0]-'x', "");
out->m_keep_node = false;
((ast_member*)out)->m_rvalue = true;
if (x != -1.0f)
- return (ast_expression*)ast_binary_new(ctx(), INSTR_MUL_F, constgen_float(x, false), out);
+ return new ast_binary(ctx(), INSTR_MUL_F, constgen_float(x, false), out);
}
return nullptr;
}
bool inexact = check_except_float(&sfloat_div, a, b);
return constgen_float(immvalue_float(a) / immvalue_float(b), inexact);
} else if (fold_can_1(b)) {
- return (ast_expression*)ast_binary_new(
+ return new ast_binary(
ctx(),
INSTR_MUL_F,
- (ast_expression*)a,
+ a,
constgen_float(1.0f / immvalue_float(b), false)
);
}
if (fold_can_2(a, b)) {
return constgen_vector(vec3_mulvf(ctx(), immvalue_vector(a), 1.0f / immvalue_float(b)));
} else {
- return (ast_expression*)ast_binary_new(
+ return new ast_binary(
ctx(),
INSTR_MUL_VF,
- (ast_expression*)a,
+ a,
(fold_can_1(b))
- ? (ast_expression*)constgen_float(1.0f / immvalue_float(b), false)
- : (ast_expression*)ast_binary_new(
- ctx(),
- INSTR_DIV_F,
- (ast_expression*)m_imm_float[1],
- (ast_expression*)b
+ ? constgen_float(1.0f / immvalue_float(b), false)
+ : new ast_binary(ctx(),
+ INSTR_DIV_F,
+ m_imm_float[1],
+ b
)
);
}
if (fold_can_2(a, b)) {
if (OPTS_FLAG(PERL_LOGIC)) {
if (expr)
- return immediate_true(a) ? (ast_expression*)a : (ast_expression*)b;
+ return immediate_true(a) ? a : b;
else
- return immediate_true(a) ? (ast_expression*)b : (ast_expression*)a;
+ return immediate_true(a) ? b : a;
} else {
return constgen_float(
((expr) ? (immediate_true(a) || immediate_true(b))
ast_expression *fold::op_tern(ast_value *a, ast_value *b, ast_value *c) {
if (fold_can_1(a)) {
return immediate_true(a)
- ? (ast_expression*)b
- : (ast_expression*)c;
+ ? b
+ : c;
}
return nullptr;
}
ast_expression *fold::op_lteqgt(ast_value *a, ast_value *b) {
if (fold_can_2(a,b)) {
check_inexact_float(a, b);
- if (immvalue_float(a) < immvalue_float(b)) return (ast_expression*)m_imm_float[2];
- if (immvalue_float(a) == immvalue_float(b)) return (ast_expression*)m_imm_float[0];
- if (immvalue_float(a) > immvalue_float(b)) return (ast_expression*)m_imm_float[1];
+ if (immvalue_float(a) < immvalue_float(b)) return m_imm_float[2];
+ if (immvalue_float(a) == immvalue_float(b)) return m_imm_float[0];
+ if (immvalue_float(a) > immvalue_float(b)) return m_imm_float[1];
}
return nullptr;
}
ast_expression *fold::op_ltgt(ast_value *a, ast_value *b, bool lt) {
if (fold_can_2(a, b)) {
check_inexact_float(a, b);
- return (lt) ? (ast_expression*)m_imm_float[!!(immvalue_float(a) < immvalue_float(b))]
- : (ast_expression*)m_imm_float[!!(immvalue_float(a) > immvalue_float(b))];
+ return (lt) ? m_imm_float[!!(immvalue_float(a) < immvalue_float(b))]
+ : m_imm_float[!!(immvalue_float(a) > immvalue_float(b))];
}
return nullptr;
}
float la = immvalue_float(a);
float lb = immvalue_float(b);
check_inexact_float(a, b);
- return (ast_expression*)m_imm_float[ne ? la != lb : la == lb];
+ return m_imm_float[ne ? la != lb : la == lb];
} else if (isvector(a) && isvector(b)) {
vec3_t la = immvalue_vector(a);
vec3_t lb = immvalue_vector(b);
bool compare = vec3_cmp(la, lb);
- return (ast_expression*)m_imm_float[ne ? !compare : compare];
+ return m_imm_float[ne ? !compare : compare];
} else if (isstring(a) && isstring(b)) {
bool compare = !strcmp(immvalue_string(a), immvalue_string(b));
- return (ast_expression*)m_imm_float[ne ? !compare : compare];
+ return m_imm_float[ne ? !compare : compare];
}
}
return nullptr;
ast_expression *ret = superfluous(left, right, op);
if (ret)
return ret;
- return (ast_expression*)ast_binary_new(ctx, op, left, right);
+ return new ast_binary(ctx, op, left, right);
}
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;
ir_block *elide;
ir_value *dummy;
bool istrue = (immvalue_float(condval) != 0.0f && branch->m_on_true);
return true;
}
- if (!(elide = ir_function_create_block(branch->m_context, func->m_ir_func, ast_function_label(func, ((istrue) ? "ontrue" : "onfalse")))))
+ if (!(elide = ir_function_create_block(branch->m_context, func->m_ir_func, func->makeLabel((istrue) ? "ontrue" : "onfalse"))))
return false;
- if (!(*(cgen = path->m_codegen))((ast_expression*)path, func, false, &dummy))
+ if (!path->codegen(func, false, &dummy))
return false;
if (!ir_block_create_jump(func->m_curblock, branch->m_context, elide))
return false;
projects / xonotic / gmqcc.git / blobdiff