From 629ae37a01e0b2a044025152cde4a7668ad25f6c Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Mon, 29 May 2006 13:41:33 +0000 Subject: [PATCH] renamed symconst_size to symconst_type_size [r7816] --- ir/common/old_fctnames.h | 3 ++- ir/external/read.c | 7 ++++--- ir/opt/escape_ana.c | 2 +- testprograms/oo_inline_example.c | 2 +- testprograms/oo_program_example.c | 2 +- testprograms/place_with_dead_block_example.c | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ir/common/old_fctnames.h b/ir/common/old_fctnames.h index 7d941e2cd..ccebc1f57 100644 --- a/ir/common/old_fctnames.h +++ b/ir/common/old_fctnames.h @@ -38,7 +38,8 @@ #define get_SymConst_ptrinfo get_SymConst_name #define set_SymConst_ptrinfo set_SymConst_name #define type_tag symconst_type_tag -#define size symconst_size +#define size symconst_type_size +#define symconst_size symconst_type_size #define linkage_ptr_info symconst_addr_name #define get_nodes_Block(X) get_nodes_block(X) diff --git a/ir/external/read.c b/ir/external/read.c index be932e85d..bdb4d4454 100644 --- a/ir/external/read.c +++ b/ir/external/read.c @@ -1,5 +1,6 @@ /* -*- c -*- */ + /* * Project: libFIRM * File name: ir/external/read.c @@ -1179,7 +1180,7 @@ static void create_abstract_alloc(ir_graph *irg, proc_t *proc, eff_t *eff) ftype = xtype -> f_tp; sym.type_p = ftype; - alloc = new_Alloc(get_store(), new_SymConst(sym, symconst_size), ftype, + alloc = new_Alloc(get_store(), new_SymConst(sym, symconst_type_size), ftype, heap_alloc); set_store(new_Proj(alloc, mode_M, 0)); eff -> firmnode = new_Proj(alloc, mode_P, 2); @@ -1683,8 +1684,8 @@ void free_abstraction(void) { /* * $Log$ - * Revision 1.23 2005/11/18 09:46:50 beck - * removed depency of bool type and stdbool.h (not C89) + * Revision 1.24 2006/05/29 13:34:49 beck + * renamed symconst_size to symconst_type_size * * Revision 1.22 2005/08/16 10:18:35 beck * create_abstraction() now returns an error code if the file could not diff --git a/ir/opt/escape_ana.c b/ir/opt/escape_ana.c index 62d4a7f59..8c53f3742 100644 --- a/ir/opt/escape_ana.c +++ b/ir/opt/escape_ana.c @@ -297,7 +297,7 @@ static void transform_allocs(ir_graph *irg, walk_env_t *env) atp = get_Alloc_type(alloc); tp = NULL; - if (get_irn_op(size) == op_SymConst && get_SymConst_kind(size) == symconst_size) { + if (get_irn_op(size) == op_SymConst && get_SymConst_kind(size) == symconst_type_size) { /* if the size is a type size and the types matched */ assert(atp == get_SymConst_type(size)); tp = atp; diff --git a/testprograms/oo_inline_example.c b/testprograms/oo_inline_example.c index f2b7fd668..793eec4c4 100644 --- a/testprograms/oo_inline_example.c +++ b/testprograms/oo_inline_example.c @@ -122,7 +122,7 @@ main(void) /* There is only one block in main, it contains the allocation and the calls. */ /* Allocate the defined object and generate the type information. */ symconst_symbol sym = { class_prima }; - obj_size = new_SymConst(sym, symconst_size); + obj_size = new_SymConst(sym, symconst_type_size); obj_o = new_Alloc(get_store(), obj_size, class_prima, heap_alloc); set_store(new_Proj(obj_o, mode_M, 0)); /* make the changed memory visible */ obj_o = new_Proj(obj_o, mode_P, 2); /* remember the pointer to the object */ diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c index 69033680f..22fe94a3f 100644 --- a/testprograms/oo_program_example.c +++ b/testprograms/oo_program_example.c @@ -120,7 +120,7 @@ main(void) /* There is only one block in main, it contains the allocation and the calls. */ /* Allocate the defined object and generate the type information. */ symconst_symbol sym = {class_prima}; - obj_size = new_SymConst(sym, symconst_size); + obj_size = new_SymConst(sym, symconst_type_size); obj_o = new_Alloc(get_store(), obj_size, class_prima, heap_alloc); set_store(new_Proj(obj_o, mode_M, 0)); /* make the changed memory visible */ obj_o = new_Proj(obj_o, mode_P, 2); /* remember the pointer to the object */ diff --git a/testprograms/place_with_dead_block_example.c b/testprograms/place_with_dead_block_example.c index b64a78871..fff01721a 100644 --- a/testprograms/place_with_dead_block_example.c +++ b/testprograms/place_with_dead_block_example.c @@ -90,7 +90,7 @@ int main(int argc, char **argv) /* Generate the two constants. A SymConst can not be constant evaluated. */ sym.type_p = new_type_class(new_id_from_str("SomeClass")); a = new_Const (mode_Is, new_tarval_from_long (0, mode_Is)); - b = new_SymConst (sym, symconst_size); + b = new_SymConst (sym, symconst_type_size); /* Generate the Conv with Bad as block */ a = new_Conv(b, mode_Ls); -- 2.20.1