From c50f5272ea4275b3f79d2c71115f2be014ed11ee Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Sun, 29 Dec 2019 17:51:03 +0100 Subject: ptrlist: make linearize_ptr_list() generic The ptrlist API has a function to copy the elements of a ptrlist into an array but it's not typed and thus needs a wrapper (or casts) for each type it's used for. Also, 'linearize' is confusing since this is unrelated to Sparse's linearization. Simplify this by adding a generic (but type-safe) macro for this with a more descriptive name: ptr_list_to_array() Signed-off-by: Luc Van Oostenryck --- ptrlist.h | 6 ++++++ simplify.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ptrlist.h b/ptrlist.h index 0b061422..5a3dcbeb 100644 --- a/ptrlist.h +++ b/ptrlist.h @@ -84,6 +84,12 @@ extern void __free_ptr_list(struct ptr_list **); (PTRLIST_TYPE(lst)) ptr_list_nth_entry(head, nth);\ }) +#define ptr_list_to_array(list, array, size) ({ \ + struct ptr_list* head = (struct ptr_list*)(list); \ + CHECK_TYPE(list, *array); \ + linearize_ptr_list(head, (void**)array, size); \ + }) + //////////////////////////////////////////////////////////////////////// // API #define PREPARE_PTR_LIST(head, ptr) \ diff --git a/simplify.c b/simplify.c index 584078dd..cf5b3d74 100644 --- a/simplify.c +++ b/simplify.c @@ -83,7 +83,7 @@ static struct basic_block *phi_parent(struct basic_block *source, pseudo_t pseud // number of element, a positive number if there was // more than expected and a negative one if less. // -// :note: we can't reuse a function like linearize_ptr_list() +// :note: we can't reuse ptr_list_to_array() for the phi-sources // because any VOIDs in the phi-list must be ignored here // as in this context they mean 'entry has been removed'. static int get_phisources(struct instruction *sources[], int nbr, struct instruction *insn) @@ -116,7 +116,7 @@ static int if_convert_phi(struct instruction *insn) bb = insn->bb; if (get_phisources(array, 2, insn)) return 0; - if (linearize_ptr_list((struct ptr_list *)bb->parents, (void **)parents, 3) != 2) + if (ptr_list_to_array(bb->parents, parents, 3) != 2) return 0; p1 = array[0]->phi_src; bb1 = array[0]->bb; -- cgit 1.2.3-korg