Utilize bool when possible

Author: jserv

src/arm-codegen.c

@@ -159,7 +159,7 @@ void cfg_flatten()
                 if (insn->op == OP_branch) {
                     /* In SSA, we index 'else_bb' first, and then 'then_bb' */
                     if (insn->else_bb != bb->rpo_next)
-                        flatten_ir->is_branch_detached = 1;
+                        flatten_ir->is_branch_detached = true;
                 }
 
                 update_elf_offset(flatten_ir);

src/defs.h

@@ -160,8 +160,8 @@ struct var {
     char type_name[MAX_TYPE_LEN];
     char var_name[MAX_VAR_LEN];
     int is_ptr;
-    int is_func;
-    int is_global;
+    bool is_func;
+    bool is_global;
     int array_size;
     int offset;   /* offset from stack or frame, index 0 is reserved */
     int init_val; /* for global initialization */
@@ -174,21 +174,21 @@ struct var {
     rename_t rename;
     ref_block_list_t ref_block_list; /* blocks which kill variable */
     int consumed;
-    int is_ternary_ret;
-    int is_const; /* whether a constant representaion or not */
+    bool is_ternary_ret;
+    bool is_const; /* whether a constant representaion or not */
 };
 
 typedef struct var var_t;
 
 typedef struct {
     char name[MAX_VAR_LEN];
-    int is_variadic;
+    bool is_variadic;
     int start_source_idx;
     var_t param_defs[MAX_PARAMS];
     int num_param_defs;
     int params[MAX_PARAMS];
     int num_params;
-    int disabled;
+    bool disabled;
 } macro_t;
 
 typedef struct fn fn_t;
@@ -246,7 +246,7 @@ struct ph2_ir {
     basic_block_t *then_bb;
     basic_block_t *else_bb;
     struct ph2_ir *next;
-    int is_branch_detached;
+    bool is_branch_detached;
 };
 
 typedef struct ph2_ir ph2_ir_t;
@@ -267,16 +267,16 @@ typedef struct type type_t;
 typedef struct {
     int size;
     int is_ptr;
-    int is_func;
-    int is_reference;
+    bool is_func;
+    bool is_reference;
     type_t *type;
 } lvalue_t;
 
 /* alias for #defines */
 typedef struct {
     char alias[MAX_VAR_LEN];
     char value[MAX_VAR_LEN];
-    int disabled;
+    bool disabled;
 } alias_t;
 
 /* constants for enums */

src/globals.c

@@ -227,7 +227,7 @@ void add_alias(char *alias, char *value)
     alias_t *al = &ALIASES[aliases_idx++];
     strcpy(al->alias, alias);
     strcpy(al->value, value);
-    al->disabled = 0;
+    al->disabled = false;
 }
 
 char *find_alias(char alias[])
@@ -239,22 +239,22 @@ char *find_alias(char alias[])
     return NULL;
 }
 
-int remove_alias(char *alias)
+bool remove_alias(char *alias)
 {
     for (int i = 0; i < aliases_idx; i++) {
         if (!ALIASES[i].disabled && !strcmp(alias, ALIASES[i].alias)) {
-            ALIASES[i].disabled = 1;
-            return 1;
+            ALIASES[i].disabled = true;
+            return true;
         }
     }
-    return 0;
+    return false;
 }
 
 macro_t *add_macro(char *name)
 {
     macro_t *ma = &MACROS[macros_idx++];
     strcpy(ma->name, name);
-    ma->disabled = 0;
+    ma->disabled = false;
     return ma;
 }
 
@@ -267,15 +267,15 @@ macro_t *find_macro(char *name)
     return NULL;
 }
 
-int remove_macro(char *name)
+bool remove_macro(char *name)
 {
     for (int i = 0; i < macros_idx; i++) {
         if (!MACROS[i].disabled && !strcmp(name, MACROS[i].name)) {
-            MACROS[i].disabled = 1;
-            return 1;
+            MACROS[i].disabled = true;
+            return true;
         }
     }
-    return 0;
+    return false;
 }
 
 void error(char *msg);
@@ -401,7 +401,7 @@ var_t *find_var(char *token, block_t *parent)
 int size_var(var_t *var)
 {
     int size;
-    if (var->is_ptr > 0 || var->is_func > 0) {
+    if (var->is_ptr > 0 || var->is_func) {
         size = 4;
     } else {
         type_t *type = find_type(var->type_name, 0);

src/parser.c

@@ -402,7 +402,7 @@ bool read_preproc_directive()
                 lex_accept(T_comma);
             }
             if (lex_accept(T_elipsis))
-                macro->is_variadic = 1;
+                macro->is_variadic = true;
 
             macro->start_source_idx = source_idx;
             skip_macro_body();
@@ -513,7 +513,7 @@ void read_inner_var_decl(var_t *vd, int anon, int is_param)
         lex_ident(T_identifier, vd->var_name);
         lex_expect(T_close_bracket);
         read_parameter_list_decl(&func, 1);
-        vd->is_func = 1;
+        vd->is_func = true;
     } else {
         if (anon == 0) {
             lex_ident(T_identifier, vd->var_name);
@@ -546,7 +546,7 @@ void read_inner_var_decl(var_t *vd, int anon, int is_param)
         } else {
             vd->array_size = 0;
         }
-        vd->is_func = 0;
+        vd->is_func = false;
     }
 }
 
@@ -772,7 +772,7 @@ void read_expr_operand(block_t *parent, basic_block_t **bb)
         var_t *var = find_var(token, parent);
         read_lvalue(&lvalue, var, parent, bb, 0, OP_generic);
 
-        if (lvalue.is_reference == 0) {
+        if (!lvalue.is_reference) {
             ph1_ir = add_ph1_ir(OP_address_of);
             ph1_ir->src0 = opstack_pop();
             vd = require_var(parent);
@@ -950,7 +950,7 @@ void read_expr_operand(block_t *parent, basic_block_t **bb)
             } else {
                 /* indirective function pointer assignment */
                 vd = require_var(parent);
-                vd->is_func = 1;
+                vd->is_func = true;
                 strcpy(vd->var_name, token);
                 opstack_push(vd);
             }
@@ -1054,13 +1054,13 @@ void read_lvalue(lvalue_t *lvalue,
     lvalue->size = get_size(var, lvalue->type);
     lvalue->is_ptr = var->is_ptr;
     lvalue->is_func = var->is_func;
-    lvalue->is_reference = 0;
+    lvalue->is_reference = false;
 
     opstack_push(var);
 
     if (lex_peek(T_open_square, NULL) || lex_peek(T_arrow, NULL) ||
         lex_peek(T_dot, NULL))
-        lvalue->is_reference = 1;
+        lvalue->is_reference = true;
 
     while (lex_peek(T_open_square, NULL) || lex_peek(T_arrow, NULL) ||
            lex_peek(T_dot, NULL)) {
@@ -1110,7 +1110,7 @@ void read_lvalue(lvalue_t *lvalue,
             lex_expect(T_close_square);
             is_address_got = 1;
             is_member = 1;
-            lvalue->is_reference = 1;
+            lvalue->is_reference = true;
         } else {
             char token[MAX_ID_LEN];
 
@@ -1159,7 +1159,7 @@ void read_lvalue(lvalue_t *lvalue,
              * its value.
              */
             if (var->array_size > 0)
-                lvalue->is_reference = 0;
+                lvalue->is_reference = false;
 
             /* move pointer to offset of structure */
             ph1_ir = add_ph1_ir(OP_load_constant);
@@ -1421,7 +1421,7 @@ void read_ternary_operation(block_t *parent, basic_block_t **bb)
     strcpy(vd->var_name, end_label);
     ph1_ir->src0 = vd;
 
-    var->is_ternary_ret = 1;
+    var->is_ternary_ret = true;
     opstack_push(var);
     bb[0] = end_ternary;
 }
@@ -2692,7 +2692,7 @@ void read_func_body(func_t *fdef, fn_t *fn)
 void read_global_decl(block_t *block)
 {
     var_t *var = require_var(block);
-    var->is_global = 1;
+    var->is_global = true;
 
     /* new function, or variables under parent */
     read_full_var_decl(var, 0, 0);
@@ -2701,7 +2701,7 @@ void read_global_decl(block_t *block)
         /* function */
         func_t *fd = add_func(var->var_name);
         memcpy(&fd->return_def, var, sizeof(var_t));
-        var->is_global = 0;
+        var->is_global = false;
         block->next_local--;
 
         read_parameter_list_decl(fd, 0);

src/peephole.c

@@ -5,7 +5,7 @@
  * file "LICENSE" for information on usage and redistribution of this file.
  */
 
-int is_fusible_insn(ph2_ir_t *ph2_ir)
+bool is_fusible_insn(ph2_ir_t *ph2_ir)
 {
     switch (ph2_ir->op) {
     case OP_add:
@@ -25,9 +25,9 @@ int is_fusible_insn(ph2_ir_t *ph2_ir)
     case OP_load:
     case OP_global_load:
     case OP_load_data_address:
-        return 1;
+        return true;
     default:
-        return 0;
+        return false;
     }
 }
 

src/reg-alloc.c

@@ -12,13 +12,13 @@
  * dead variable and does NOT wrtie it back to the stack.
  */
 
-int check_live_out(basic_block_t *bb, var_t *var)
+bool check_live_out(basic_block_t *bb, var_t *var)
 {
     for (int i = 0; i < bb->live_out_idx; i++) {
         if (bb->live_out[i] == var)
-            return 1;
+            return true;
     }
-    return 0;
+    return false;
 }
 
 void refresh(basic_block_t *bb, insn_t *insn)