Merge pull request #175 from DrXiao/frontend/fix-log-or

Fix bad logical-or implementation

Author: jserv

src/arm-codegen.c

@@ -106,7 +106,6 @@ void update_elf_offset(ph2_ir_t *ph2_ir)
     case OP_geq:
     case OP_leq:
     case OP_log_not:
-    case OP_log_or:
         elf_offset += 12;
         return;
     case OP_branch:
@@ -118,9 +117,6 @@ void update_elf_offset(ph2_ir_t *ph2_ir)
     case OP_return:
         elf_offset += 24;
         return;
-    case OP_log_and:
-        elf_offset += 28;
-        return;
     default:
         printf("Unknown opcode\n");
         abort();
@@ -424,11 +420,6 @@ void emit_ph2_ir(ph2_ir_t *ph2_ir)
         emit(__mov_i(__NE, rd, 0));
         emit(__mov_i(__EQ, rd, 1));
         return;
-    case OP_log_or:
-        emit(__or_r(__AL, rd, rn, rm));
-        emit(__teq(rd));
-        emit(__mov_i(__NE, rd, 1));
-        return;
     default:
         printf("Unknown opcode\n");
         abort();

src/defs.h

@@ -23,7 +23,7 @@
 #define MAX_FUNC_TRIES 2160
 #define MAX_BLOCKS 2048
 #define MAX_TYPES 64
-#define MAX_IR_INSTR 40000
+#define MAX_IR_INSTR 50000
 #define MAX_BB_PRED 128
 #define MAX_BB_DOM_SUCC 64
 #define MAX_BB_RDOM_SUCC 256
@@ -190,7 +190,7 @@ struct var {
     struct insn *last_assign;
     int consumed;
     bool is_ternary_ret;
-    bool is_log_and_ret;
+    bool is_logical_ret;
     bool is_const; /* whether a constant representaion or not */
 };