From d30b58bd10c40fe4cab58af6595bc54f321874d3 Mon Sep 17 00:00:00 2001 From: Sebastian Felis Date: Thu, 17 Jul 2003 14:53:25 +0000 Subject: [PATCH] Changed constant prefix FGD_ (firm generic dumper) to FW_ (firm walker) [r1520] --- ir/common/firmwalk.c | 42 +++++++++++++++++++++--------------------- ir/common/firmwalk.h | 12 ++++++------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ir/common/firmwalk.c b/ir/common/firmwalk.c index bc9796116..5f3a566b1 100644 --- a/ir/common/firmwalk.c +++ b/ir/common/firmwalk.c @@ -35,10 +35,10 @@ typedef struct { //@{ /** Access macros to fw_data structure */ -#define FGD_GET_DATA_LIST(s) ((s)->list) -#define FGD_SET_DATA_LIST(s, t) ((s)->list = (t)) -#define FGD_GET_DATA_LINK(s) ((s)->link) -#define FGD_SET_DATA_LINK(s, t) ((s)->link = (t)) +#define FW_GET_DATA_LIST(s) ((s)->list) +#define FW_SET_DATA_LIST(s, t) ((s)->list = (t)) +#define FW_GET_DATA_LINK(s) ((s)->link) +#define FW_SET_DATA_LINK(s, t) ((s)->link = (t)) //@} /** Returns own data struct of the firm walker. @@ -66,7 +66,7 @@ fw_data *fw_get_data(void *thing) memset(data, 0, sizeof(fw_data)); set_irg_link(thing, data); /* allocate block list */ - FGD_GET_DATA_LIST(data) = NEW_ARR_F(ir_node *, 0); + FW_GET_DATA_LIST(data) = NEW_ARR_F(ir_node *, 0); } break; case k_ir_node: @@ -81,7 +81,7 @@ fw_data *fw_get_data(void *thing) memset(data, 0, sizeof(fw_data)); set_irn_link(thing, data); /* allocate node list */ - FGD_GET_DATA_LIST(data) = NEW_ARR_F(ir_node *, 0); + FW_GET_DATA_LIST(data) = NEW_ARR_F(ir_node *, 0); } } break; @@ -105,7 +105,7 @@ void fw_free_data(void *thing) /* delete block list of graph */ if (NULL != data) { - DEL_ARR_F(FGD_GET_DATA_LIST(data)); + DEL_ARR_F(FW_GET_DATA_LIST(data)); set_irg_link(thing, NULL); } break; @@ -116,7 +116,7 @@ void fw_free_data(void *thing) data = get_irn_link(thing); if (NULL != data) { - DEL_ARR_F(FGD_GET_DATA_LIST(data)); + DEL_ARR_F(FW_GET_DATA_LIST(data)); set_irn_link(thing, NULL); } } @@ -140,13 +140,13 @@ void set_firm_walk_link(void *thing, void *link) break; case k_ir_graph: data = fw_get_data(thing); - FGD_SET_DATA_LINK(data, link); + FW_SET_DATA_LINK(data, link); break; case k_ir_node: if (is_Block(thing)) { data = fw_get_data(thing); - FGD_SET_DATA_LINK(data, link); + FW_SET_DATA_LINK(data, link); } else set_irn_link(thing, link); @@ -170,12 +170,12 @@ void *get_firm_walk_link(void *thing) return get_type_link(thing); case k_ir_graph: data = fw_get_data(thing); - return FGD_GET_DATA_LINK(data); + return FW_GET_DATA_LINK(data); case k_ir_node: if (is_Block(thing)) { data = fw_get_data(thing); - return FGD_GET_DATA_LINK(data); + return FW_GET_DATA_LINK(data); } else return get_irn_link(thing); @@ -249,7 +249,7 @@ void fw_collect_irn(ir_node *irn, void *env) { /* add this block to ir graph's block list */ data = fw_get_data(get_current_ir_graph()); - ARR_APP1(ir_node *, FGD_GET_DATA_LIST(data), irn); + ARR_APP1(ir_node *, FW_GET_DATA_LIST(data), irn); } /* non block nodes */ else @@ -257,7 +257,7 @@ void fw_collect_irn(ir_node *irn, void *env) /* add this node to block's node list */ ir_node *block = get_nodes_Block(irn); data = fw_get_data(block); - ARR_APP1(ir_node *, FGD_GET_DATA_LIST(data), irn); + ARR_APP1(ir_node *, FW_GET_DATA_LIST(data), irn); } } @@ -316,7 +316,7 @@ void firm_walk_init(firm_walk_flags flags) pmap_insert(mode_map, mode_b, NULL); // Collect all types (also unused types) if flag is set - if (FGD_WITH_ALL_TYPES & flags) + if (FW_WITH_ALL_TYPES & flags) type_walk(fw_collect_tore, NULL, NULL); // for each ir graph @@ -422,7 +422,7 @@ void firm_walk(firm_walk_interface *wif) /* walk over all irg's block nested ========================== */ data = fw_get_data(irg); - block_list = FGD_GET_DATA_LIST(data); + block_list = FW_GET_DATA_LIST(data); block_list_len = ARR_LEN(block_list); for (block_i = 0; block_i < block_list_len; block_i++) { @@ -433,16 +433,16 @@ void firm_walk(firm_walk_interface *wif) /* walk over all block's ir nodes nested =================== */ data = fw_get_data(block); - irn_list = FGD_GET_DATA_LIST(data); + irn_list = FW_GET_DATA_LIST(data); irn_list_len = ARR_LEN(irn_list); // call block as prefix ir node if ((wif->do_node) && - (wif->flags & FGD_DUMP_BLOCK_AS_IRN & !FGD_DUMP_IRN_IN_PREFIX)) + (wif->flags & FW_DUMP_BLOCK_AS_IRN & !FW_DUMP_IRN_IN_PREFIX)) wif->do_node(block, wif->env); // do ir nodes in prefix or postfix order? - if (wif->flags & FGD_DUMP_IRN_IN_PREFIX) + if (wif->flags & FW_DUMP_IRN_IN_PREFIX) irn_i = irn_list_len-1; else irn_i = 0; @@ -452,14 +452,14 @@ void firm_walk(firm_walk_interface *wif) if (wif->do_node) wif->do_node((ir_node *)irn_list[irn_i], wif->env); // do ir nodes in prefix or postfix order? - if (wif->flags & FGD_DUMP_IRN_IN_PREFIX) + if (wif->flags & FW_DUMP_IRN_IN_PREFIX) irn_i--; else irn_i++; } // call block as postfix ir node if ((wif->do_node) && - (wif->flags & (FGD_DUMP_BLOCK_AS_IRN | FGD_DUMP_IRN_IN_PREFIX))) + (wif->flags & (FW_DUMP_BLOCK_AS_IRN | FW_DUMP_IRN_IN_PREFIX))) wif->do_node(block, wif->env); /* wall over all block's ir nodes nested end =============== */ diff --git a/ir/common/firmwalk.h b/ir/common/firmwalk.h index 76b31faef..c4384b0e1 100644 --- a/ir/common/firmwalk.h +++ b/ir/common/firmwalk.h @@ -82,17 +82,17 @@ typedef void firm_walk_node_func (ir_node *irn, void *env); */ typedef enum { - FGD_WITH_ALL_TYPES = 1<<0, /**< Collect and dump all types, especially + FW_WITH_ALL_TYPES = 1<<0, /**< Collect and dump all types, especially unused types. @note This flag could be set in firm_dumper_init() and is unused in firm_dump() */ - FGD_WITH_DOMINATOR = 1<<1, /**< nyi */ - FGD_WITH_OUTEDGES = 1<<2, /**< nyi */ - FGD_WITH_LOOPS = 1<<3, /**< nyi */ - FGD_DUMP_BLOCK_AS_IRN = 1<<4, /**< Dump all block nodes as irn nodes + FW_WITH_DOMINATOR = 1<<1, /**< nyi */ + FW_WITH_OUTEDGES = 1<<2, /**< nyi */ + FW_WITH_LOOPS = 1<<3, /**< nyi */ + FW_DUMP_BLOCK_AS_IRN = 1<<4, /**< Dump all block nodes as irn nodes additionally */ - FGD_DUMP_IRN_IN_PREFIX = 1<<5, /**< Dumps all ir nodes in prefix order + FW_DUMP_IRN_IN_PREFIX = 1<<5, /**< Dumps all ir nodes in prefix order according to the internal firm graph structure */ } firm_walk_flags; -- 2.20.1