darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-20 18:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cleanup' of git://github.com/graphitemaster/gmqcc into cleanup

Browse source
This commit is contained in:
Wolfgang Bumiller 2015-02-01 12:13:59 +01:00
commit fab640da4c
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fold.cpp
View file

@ -1338,11 +1338,15 @@ ast_expression *fold::op_cmp(ast_value *a, ast_value *b, bool ne) {
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)];
} if (isvector(a) && isvector(b)) {
return (ast_expression*)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);
return (ast_expression*)m_imm_float[!(ne ? vec3_cmp(la, lb) : !vec3_cmp(la, lb))];
bool compare = vec3_cmp(la, lb);
return (ast_expression*)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 nullptr;

4
ir.cpp
View file

@ -3436,6 +3436,8 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc
{
ir_value_code_setaddr(global, self->m_code->globals.size());
if (global->m_hasvalue) {
if (global->m_cvq == CV_CONST && global->m_reads.empty())
return true;
iptr = (int32_t*)&global->m_constval.ivec[0];
self->m_code->globals.push_back(*iptr);
} else {
@ -3451,6 +3453,8 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc
{
ir_value_code_setaddr(global, self->m_code->globals.size());
if (global->m_hasvalue) {
if (global->m_cvq == CV_CONST && global->m_reads.empty())
return true;
uint32_t load = code_genstring(self->m_code.get(), global->m_constval.vstring);
self->m_code->globals.push_back(load);
} else {