From ce23e95d0bd6b1d7a0c25d8fb2982cb267d57989 Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Fri, 21 Jun 2013 23:40:51 +0000 Subject: [PATCH] Remove a ton of dead code and document the one really insane case. --- ast.c | 6 +++++- ir.c | 21 ++++++++++++++++++++- main.c | 3 --- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ast.c b/ast.c index 5c42a30..a23aa75 100644 --- a/ast.c +++ b/ast.c @@ -2934,9 +2934,13 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value { ir_block *ontrue, *onfalse; if (bprecond) ontrue = bprecond; - else if (bbody) ontrue = bbody; + else ontrue = bbody; /* can never be null */ + + /* all of this is dead code else if (bincrement) ontrue = bincrement; else ontrue = bpostcond; + */ + onfalse = bout; if (self->post_not) { tmpblock = ontrue; diff --git a/ir.c b/ir.c index 08cedff..09fa186 100644 --- a/ir.c +++ b/ir.c @@ -1800,14 +1800,33 @@ ir_value* ir_block_create_binop(ir_block *self, lex_ctx ctx, ot = TYPE_POINTER; break; #endif + /* + * after the following default case, the value of opcode can never + * be 1, 2, 3, 4, 5, 6, 7, 8, 9, 62, 63, 64, 65 + */ default: /* ranges: */ /* boolean operations result in floats */ + + /* + * opcode >= 10 takes true branch opcode is at least 10 + * opcode <= 23 takes false branch opcode is at least 24 + */ if (opcode >= INSTR_EQ_F && opcode <= INSTR_GT) ot = TYPE_FLOAT; + + /* + * At condition "opcode <= 23", the value of "opcode" must be + * at least 24. + * At condition "opcode <= 23", the value of "opcode" cannot be + * equal to any of {1, 2, 3, 4, 5, 6, 7, 8, 9, 62, 63, 64, 65}. + * The condition "opcode <= 23" cannot be true. + * + * Thus ot=2 (TYPE_FLOAT) can never be true + */ +#if 0 else if (opcode >= INSTR_LE && opcode <= INSTR_GT) ot = TYPE_FLOAT; -#if 0 else if (opcode >= INSTR_LE_I && opcode <= INSTR_EQ_FI) ot = TYPE_FLOAT; #endif diff --git a/main.c b/main.c index ab9520a..feb8aa3 100644 --- a/main.c +++ b/main.c @@ -697,9 +697,6 @@ int main(int argc, char **argv) { mem_d(line); } - if (retval) - goto cleanup; - if (vec_size(items)) { if (!OPTS_OPTION_BOOL(OPTION_QUIET) && !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) -- 2.39.2