darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-30 15:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix -fshort-logic to cast to true boolean values

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-12-22 20:05:15 +01:00
parent 96ddc217da
commit eb952f1199
5 changed files with 103 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
ast.c
View file

@ -1699,7 +1699,7 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
return true; return true;
} }
if (OPTS_FLAG(SHORT_LOGIC) && if ((OPTS_FLAG(SHORT_LOGIC) || OPTS_FLAG(PERL_LOGIC)) &&
(self->op == INSTR_AND || self->op == INSTR_OR)) (self->op == INSTR_AND || self->op == INSTR_OR))
{ {
/* short circuit evaluation */ /* short circuit evaluation */
@ -1750,12 +1750,50 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
vec_push(func->ir_func->blocks, merge); vec_push(func->ir_func->blocks, merge);
func->curblock = merge; func->curblock = merge;
phi = ir_block_create_phi(func->curblock, ast_ctx(self), ast_function_label(func, "sce_value"), TYPE_FLOAT); phi = ir_block_create_phi(func->curblock, ast_ctx(self),
ast_function_label(func, "sce_value"),
self->expression.vtype);
ir_phi_add(phi, from_left, left); ir_phi_add(phi, from_left, left);
ir_phi_add(phi, from_right, right); ir_phi_add(phi, from_right, right);
*out = ir_phi_value(phi); *out = ir_phi_value(phi);
if (!*out) if (!*out)
return false; return false;
if (!OPTS_FLAG(PERL_LOGIC)) {
/* cast-to-bool */
if (OPTS_FLAG(CORRECT_LOGIC) && (*out)->vtype == TYPE_VECTOR) {
*out = ir_block_create_unary(func->curblock, ast_ctx(self),
ast_function_label(func, "sce_bool_v"),
INSTR_NOT_V, *out);
if (!*out)
return false;
*out = ir_block_create_unary(func->curblock, ast_ctx(self),
ast_function_label(func, "sce_bool"),
INSTR_NOT_F, *out);
if (!*out)
return false;
}
else if (OPTS_FLAG(FALSE_EMPTY_STRINGS) && (*out)->vtype == TYPE_STRING) {
*out = ir_block_create_unary(func->curblock, ast_ctx(self),
ast_function_label(func, "sce_bool_s"),
INSTR_NOT_S, *out);
if (!*out)
return false;
*out = ir_block_create_unary(func->curblock, ast_ctx(self),
ast_function_label(func, "sce_bool"),
INSTR_NOT_F, *out);
if (!*out)
return false;
}
else {
*out = ir_block_create_binop(func->curblock, ast_ctx(self),
ast_function_label(func, "sce_bool"),
INSTR_AND, *out, *out);
if (!*out)
return false;
}
}
self->expression.outr = *out; self->expression.outr = *out;
return true; return true;
} }

14
tests/correct-vs-short-1.tmpl Normal file
View file

@ -0,0 +1,14 @@
I: correct-vs-short.qc
D: correct-logic vs short-logic without perl-logic
T: -execute
C: -std=fteqcc
M: X & | B
M: 0 0 0, 0 0 0 :: 0 0 0
M: 0 0 0, 5 0 0 :: 0 2 1
M: 5 0 0, 0 0 0 :: 0 2 1
M: 5 0 0, 5 0 0 :: 2 2 2
M: Y & | B
M: 0 0 0, 0 0 0 :: 0 0 0
M: 0 0 0, 0 5 0 :: 0 0 0
M: 0 5 0, 0 0 0 :: 0 0 0
M: 0 5 0, 0 5 0 :: 0 0 0

14
tests/correct-vs-short-2.tmpl Normal file
View file

@ -0,0 +1,14 @@
I: correct-vs-short.qc
D: correct-logic vs short-logic without perl-logic
T: -execute
C: -std=fteqcc -fcorrect-logic
M: X & | B
M: 0 0 0, 0 0 0 :: 0 0 0
M: 0 0 0, 5 0 0 :: 0 2 1
M: 5 0 0, 0 0 0 :: 0 2 1
M: 5 0 0, 5 0 0 :: 2 2 2
M: Y & | B
M: 0 0 0, 0 0 0 :: 0 0 0
M: 0 0 0, 0 5 0 :: 0 2 1
M: 0 5 0, 0 0 0 :: 0 2 1
M: 0 5 0, 0 5 0 :: 2 2 2

14
tests/correct-vs-short-3.tmpl Normal file
View file

@ -0,0 +1,14 @@
I: correct-vs-short.qc
D: correct-logic vs short-logic without perl-logic
T: -execute
C: -std=fteqcc -fcorrect-logic -fshort-logic
M: X & | B
M: 0 0 0, 0 0 0 :: 0 0 0
M: 0 0 0, 5 0 0 :: 0 2 1
M: 5 0 0, 0 0 0 :: 0 2 1
M: 5 0 0, 5 0 0 :: 2 2 2
M: Y & | B
M: 0 0 0, 0 0 0 :: 0 0 0
M: 0 0 0, 0 5 0 :: 0 2 1
M: 0 5 0, 0 0 0 :: 0 2 1
M: 0 5 0, 0 5 0 :: 2 2 2

21
tests/correct-vs-short.qc Normal file
View file

@ -0,0 +1,21 @@
void print(...) = #1;
string ftos (float) = #2;
void test(vector a, vector b) {
print(ftos((a && b) + (a && b)), " ");
print(ftos((a || b) + (a || b)), " ");
print(ftos((a && b) + (a || b)), "\n");
}
void main() {
print("X & | B\n");
print("0 0 0, 0 0 0 :: "); test('0 0 0', '0 0 0');
print("0 0 0, 5 0 0 :: "); test('0 0 0', '5 0 0');
print("5 0 0, 0 0 0 :: "); test('5 0 0', '0 0 0');
print("5 0 0, 5 0 0 :: "); test('5 0 0', '5 0 0');
print("Y & | B\n");
print("0 0 0, 0 0 0 :: "); test('0 0 0', '0 0 0');
print("0 0 0, 0 5 0 :: "); test('0 0 0', '0 5 0');
print("0 5 0, 0 0 0 :: "); test('0 5 0', '0 0 0');
print("0 5 0, 0 5 0 :: "); test('0 5 0', '0 5 0');
}