aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Dudka <kdudka@redhat.com>2009-08-06 17:27:46 +0000
committerChristopher Li <sparse@chrisli.org>2009-07-29 11:13:56 -0700
commit0be55c9fb2192301f3d916412ed06b30c2fda46e (patch)
tree5e240b3e6cb3180104b1be97c4307a1f398dbffb
parentAdd c{l,t}z{,l,ll}, ffsl{,l}, popcountll and floating point comparison builtins. (diff)
downloadsparse-0be55c9fb2192301f3d916412ed06b30c2fda46e.tar.gz
sparse-0be55c9fb2192301f3d916412ed06b30c2fda46e.tar.bz2
sparse-0be55c9fb2192301f3d916412ed06b30c2fda46e.zip
linearize.h: sanitize header
It's unfortunate to use 'true' and 'false' as identifiers in a system header. It clashes with corresponding macros from <stdbool.h> when included before <sparse/linearize.h>. Signed-off-by: Kamil Dudka <kdudka@redhat.com> Acked-by: Hannes Eder <hannes@hanneseder.net> Signed-off-by: Christopher Li <sparse@chrisli.org>
-rw-r--r--linearize.c6
-rw-r--r--linearize.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/linearize.c b/linearize.c
index 1a19214..238ee5d 100644
--- a/linearize.c
+++ b/linearize.c
@@ -666,7 +666,7 @@ void insert_branch(struct basic_block *bb, struct instruction *jmp, struct basic
}
-void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi_node, pseudo_t true, pseudo_t false)
+void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi_node, pseudo_t if_true, pseudo_t if_false)
{
pseudo_t target;
struct instruction *select;
@@ -685,8 +685,8 @@ void insert_select(struct basic_block *bb, struct instruction *br, struct instru
select->target = target;
target->def = select;
- use_pseudo(select, true, &select->src2);
- use_pseudo(select, false, &select->src3);
+ use_pseudo(select, if_true, &select->src2);
+ use_pseudo(select, if_false, &select->src3);
add_instruction(&bb->insns, select);
add_instruction(&bb->insns, br);
diff --git a/linearize.h b/linearize.h
index 2205082..50b3601 100644
--- a/linearize.h
+++ b/linearize.h
@@ -328,7 +328,7 @@ struct entrypoint {
struct instruction *entry;
};
-extern void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi, pseudo_t true, pseudo_t false);
+extern void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi, pseudo_t if_true, pseudo_t if_false);
extern void insert_branch(struct basic_block *bb, struct instruction *br, struct basic_block *target);
pseudo_t alloc_phi(struct basic_block *source, pseudo_t pseudo, int size);