From 87f7c13645e762f21991ad79985a7f3e6ef612cf Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Wed, 13 Dec 2006 13:18:57 +0000 Subject: [PATCH] used new get_entity_offset(), get_entity_offset_bits_remainder() functions [r8440] --- ir/ir/irdumptxt.c | 11 ++++++----- ir/ir/iropt.c | 14 +++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c index 353fc3d8e..2308b66c3 100644 --- a/ir/ir/irdumptxt.c +++ b/ir/ir/irdumptxt.c @@ -574,8 +574,9 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned fprintf(F, "\n"); } else { /* no entattrs */ - fprintf(F, "%s(%3d) %*s: %s", prefix, - get_entity_offset_bits(ent), -40, get_type_name(get_entity_type(ent)), get_entity_name(ent)); + fprintf(F, "%s(%3d:d) %-40s: %s", prefix, + get_entity_offset(ent), get_entity_offset_bits_remainder(ent), + get_type_name(get_entity_type(ent)), get_entity_name(ent)); if (is_Method_type(get_entity_type(ent))) fprintf(F, "(...)"); if (verbosity & dump_verbosity_accessStats) { @@ -597,9 +598,9 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned for (i = 0; i < get_compound_ent_n_values(ent); ++i) { compound_graph_path *path = get_compound_ent_value_path(ent, i); entity *ent0 = get_compound_graph_path_node(path, 0); - fprintf(F, "\n%s %3d ", prefix, get_entity_offset_bits(ent0)); + fprintf(F, "\n%s %3d:%d ", prefix, get_entity_offset(ent0), get_entity_offset_bits_remainder(ent0)); if (get_type_state(type) == layout_fixed) - fprintf(F, "(%3d:%d) ", get_compound_ent_value_offset_bytes(ent, i), get_compound_ent_value_offset_bit_part(ent, i)); + fprintf(F, "(%3d:%d) ", get_compound_ent_value_offset_bytes(ent, i), get_compound_ent_value_offset_bit_remainder(ent, i)); fprintf(F, "%s", get_entity_name(ent)); for (j = 0; j < get_compound_graph_path_length(path); ++j) { entity *node = get_compound_graph_path_node(path, j); @@ -619,7 +620,7 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned fprintf(F, "%s volatility: %s", prefix, get_volatility_name(get_entity_volatility(ent))); fprintf(F, "\n%s peculiarity: %s", prefix, get_peculiarity_name(get_entity_peculiarity(ent))); fprintf(F, "\n%s ld_name: %s", prefix, ent->ld_name ? get_entity_ld_name(ent) : "no yet set"); - fprintf(F, "\n%s offset: %d bits, %d bytes", prefix, get_entity_offset_bits(ent), get_entity_offset_bytes(ent)); + fprintf(F, "\n%s offset: %d bytes, %d rem bits", prefix, get_entity_offset(ent), get_entity_offset_bits_remainder(ent)); if (is_Method_type(get_entity_type(ent))) { if (get_entity_irg(ent)) /* can be null */ { fprintf(F, "\n%s irg = %ld", prefix, get_irg_graph_nr(get_entity_irg(ent))); diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index 3019dd13a..1711aa07d 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -76,7 +76,7 @@ static tarval *computed_value_SymConst(ir_node *n) { ent = get_SymConst_entity(n); type = get_entity_owner(ent); if (get_type_state(type) == layout_fixed) - return new_tarval_from_long(get_entity_offset_bytes(ent), get_irn_mode(n)); + return new_tarval_from_long(get_entity_offset(ent), get_irn_mode(n)); break; default: break; @@ -3684,6 +3684,10 @@ void del_identities(pset *value_table) { /** * Return the canonical node computing the same value as n. + * + * @param value_table The value table + * @param n The node to lookup + * * Looks up the node in a hash table. * * For Const nodes this is performed in the constructor, too. Const @@ -3860,6 +3864,8 @@ static INLINE ir_node *gigo(ir_node *node) * It can only be called if it is guaranteed that no other nodes * reference this one, i.e., right after construction of a node. * + * @param n The node to optimize + * * current_ir_graph must be set to the graph of the node! */ ir_node *optimize_node(ir_node *n) @@ -4052,8 +4058,7 @@ ir_node *optimize_in_place_2(ir_node *n) /** * Wrapper for external use, set proper status bits after optimization. */ -ir_node *optimize_in_place(ir_node *n) -{ +ir_node *optimize_in_place(ir_node *n) { /* Handle graph state */ assert(get_irg_phase_state(current_ir_graph) != phase_building); @@ -4071,8 +4076,7 @@ ir_node *optimize_in_place(ir_node *n) /* * Sets the default operation for an ir_ops. */ -ir_op_ops *firm_set_default_operations(opcode code, ir_op_ops *ops) -{ +ir_op_ops *firm_set_default_operations(opcode code, ir_op_ops *ops) { ops = firm_set_default_computed_value(code, ops); ops = firm_set_default_equivalent_node(code, ops); ops = firm_set_default_transform_node(code, ops); -- 2.20.1