From 8e28f7419e677754aa731f647da8c3ed3eeb43ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20W=C3=BCrdig?= Date: Thu, 29 Mar 2007 16:31:06 +0000 Subject: [PATCH] switched to ir_nodeset [r12591] --- ir/ana/phiclass.c | 12 +++++++----- ir/ana/phiclass.h | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ir/ana/phiclass.c b/ir/ana/phiclass.c index fe615f8be..8dc95f9cd 100644 --- a/ir/ana/phiclass.c +++ b/ir/ana/phiclass.c @@ -18,6 +18,7 @@ #include "iredges_t.h" #include "phiclass.h" #include "irphase_t.h" +#include "irnodeset.h" struct _phi_classes_t { phase_t ph; /* The phase object holding the irn data */ @@ -144,11 +145,12 @@ static void phi_class_compute(phi_classes_t *pc) { /** * Build the Phi classes for the set of given Phis. */ -static void phi_class_compute_by_phis(phi_classes_t *pc, pset *all_phi_nodes) { - if (pset_count(all_phi_nodes)) { - ir_node *phi; +static void phi_class_compute_by_phis(phi_classes_t *pc, ir_nodeset_t *all_phi_nodes) { + if (ir_nodeset_size(all_phi_nodes) > 0) { + ir_nodeset_iterator_t iter; + ir_node *phi; - foreach_pset(all_phi_nodes, phi) { + foreach_ir_nodeset(all_phi_nodes, phi, iter) { ir_node ***irn_pc = _get_phi_class(&pc->ph, phi); assert(is_Phi(phi) && mode_is_datab(get_irn_mode(phi))); @@ -211,7 +213,7 @@ phi_classes_t *phi_class_new_from_irg(ir_graph *irg, int pure_phi_classes) { * Builds all Phi classes for the given set of Phis. * @return The Phis class object for @p all_phis. */ -phi_classes_t *phi_class_new_from_set(ir_graph *irg, pset *all_phis, int pure_phi_classes) { +phi_classes_t *phi_class_new_from_set(ir_graph *irg, ir_nodeset_t *all_phis, int pure_phi_classes) { phi_classes_t *res = xmalloc(sizeof(*res)); FIRM_DBG_REGISTER(res->dbg, "ir.ana.phiclass"); diff --git a/ir/ana/phiclass.h b/ir/ana/phiclass.h index c1195f368..2f731b406 100644 --- a/ir/ana/phiclass.h +++ b/ir/ana/phiclass.h @@ -11,6 +11,7 @@ #include "pset.h" #include "irgraph.h" #include "irnode.h" +#include "irnodeset.h" typedef struct _phi_classes_t phi_classes_t; @@ -41,12 +42,12 @@ phi_classes_t *phi_class_new_from_irg(ir_graph *irg, int pure_phi_classes); /** * Builds all Phi classes for the given set of Phis. * @param irg The irg, the Phis are from - * @param all_phis A set containing all Phis nodes to build the classes for + * @param all_phis An ir_nodeset containing all Phis nodes to build the classes for * @param pure_phi_classes Set to one if Phi classes should only contain Phi nodes. * Beware: This might result in different (more) Phi classes as if not set * @return The Phis class object for @p all_phis. */ -phi_classes_t *phi_class_new_from_set(ir_graph *irg, pset *all_phis, int pure_phi_classes); +phi_classes_t *phi_class_new_from_set(ir_graph *irg, ir_nodeset_t *all_phis, int pure_phi_classes); /** * Free all allocated data. -- 2.20.1