X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Fcall_str_example.c;h=2ea856ab307f69d4f748107033b9c23624050795;hb=a587dd2e23eafa549494155709fbd5f83afdf043;hp=76b2693f760fd71c2125a1d204ea1adb9522bc76;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm diff --git a/testprograms/call_str_example.c b/testprograms/call_str_example.c index 76b2693f7..2ea856ab3 100644 --- a/testprograms/call_str_example.c +++ b/testprograms/call_str_example.c @@ -10,12 +10,10 @@ * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. */ -# include -# include +#include +#include -# include "irvrfy.h" -# include "irdump.h" -# include "firm.h" +#include /** * This file constructs the ir for the following pseudo-program: @@ -29,25 +27,27 @@ * This program demonstrates how to represent string constants. */ -int main(int argc, char **argv) +int main(void) { + char *dump_file_suffix = ""; ir_graph *irg; /* this variable contains the irgraph */ - type *owner; /* the class in which this method is defined */ - type *proc_main; /* type information for the method main */ - type *proc_called; /* type information for called method f */ - type *U8, *U8array, *string_ptr; /* type for pointers to strings. */ - entity *ent; /* represents this method as entity of owner */ - entity *const_str; /* represents a constant string. */ + ir_type *owner; /* the class in which this method is defined */ + ir_type *proc_main; /* ir_type information for the method main */ + ir_type *proc_called; /* ir_type information for called method f */ + ir_type *U8, *U8array, *string_ptr; /* ir_type for pointers to strings. */ + ir_entity *ent; /* represents this method as ir_entity of owner */ + ir_entity *const_str; /* represents a constant string. */ char *str = "Hello World\n"; /* The constant string. */ ir_node *x, *str_addr, *proc_ptr, *call; - int i; + symconst_symbol sym; + size_t i; printf("\nCreating an IR graph: CALL_STR_EXAMPLE...\n"); /* init library */ init_firm (NULL); - /* An unsinged 8 bit type */ + /* An unsinged 8 bit ir_type */ U8 = new_type_primitive (new_id_from_chars("char", 4), mode_Bu); /* An array containing unsigned 8 bit elements. */ U8array = new_type_array (new_id_from_chars("char_arr", 8), 1, U8); @@ -55,7 +55,7 @@ int main(int argc, char **argv) string_ptr = new_type_pointer (new_id_from_chars ("ptr_to_string", 13), U8array, mode_P); - /* Make a global entity that represents the constant String. */ + /* Make a global ir_entity that represents the constant String. */ const_str = new_entity(get_glob_type(), new_id_from_str("constStr"), U8array); set_entity_variability(const_str, variability_constant); for (i = 0; i < strlen(str); i++) { @@ -68,7 +68,7 @@ int main(int argc, char **argv) * For imperative languages like C we view a program as a large class containing * all functions of the program as methods in this class. This class is * automatically generated. - * We use the same name for the method type as for the method entity. + * We use the same name for the method ir_type as for the method ir_entity. */ #define METHODNAME "CALL_STR_EXAMPLE_main" #define NRARGS 0 @@ -77,8 +77,8 @@ int main(int argc, char **argv) proc_main = new_type_method(new_id_from_chars(METHODNAME, strlen(METHODNAME)), NRARGS, NRES); - /* Make type information for called method which also belongs to the - global type. */ + /* Make ir_type information for called method which also belongs to the + global ir_type. */ #define F_METHODNAME "f" #define F_NRARGS 1 #define F_NRES 0 @@ -88,12 +88,12 @@ int main(int argc, char **argv) set_method_param_type(proc_called, 0, string_ptr); - /* Make the entity for main needed for a correct ir_graph. */ + /* Make the ir_entity for main needed for a correct ir_graph. */ #define ENTITYNAME "CALL_STR_EXAMPLE_main" ent = new_entity (owner, new_id_from_chars (ENTITYNAME, strlen(ENTITYNAME)), proc_main); - /* Generates the basic graph for the method represented by entity ent, that + /* Generates the basic graph for the method represented by ir_entity ent, that * is, generates start and end blocks and nodes and a first, initial block. * The constructor needs to know how many local variables the method has. */ @@ -101,14 +101,13 @@ int main(int argc, char **argv) irg = new_ir_graph (ent, NUM_OF_LOCAL_VARS); /* get the pointer to the string constant */ - symconst_symbol sym; sym.entity_p = const_str; - str_addr = new_SymConst(sym, symconst_addr_ent); + str_addr = new_SymConst(mode_P, sym, symconst_addr_ent); - /* get the pointer to the procedure from the class type */ + /* get the pointer to the procedure from the class ir_type */ /* this is how a pointer to be fixed by the linker is represented. */ sym.ident_p = new_id_from_str (F_METHODNAME); - proc_ptr = new_SymConst (sym, symconst_addr_name); + proc_ptr = new_SymConst (mode_P, sym, symconst_addr_name); /* call procedure set_a, first built array with parameters */ { @@ -117,7 +116,7 @@ int main(int argc, char **argv) call = new_Call(get_store(), proc_ptr, 1, in, proc_called); } /* make the possible changes by the called method to memory visible */ - set_store(new_Proj(call, mode_M, 0)); + set_store(new_Proj(call, mode_M, pn_Call_M)); /* Make the return node returning the memory. */ x = new_Return (get_store(), 0, NULL); @@ -140,11 +139,10 @@ int main(int argc, char **argv) irg_vrfy(irg); printf("Done building the graph. Dumping it.\n"); - char *dump_file_suffix = ""; dump_ir_block_graph (irg, dump_file_suffix); dump_all_types(dump_file_suffix); - printf("Use xvcg to view this graph:\n"); - printf("/ben/goetz/bin/xvcg GRAPHNAME\n\n"); + printf("Use ycomp to view this graph:\n"); + printf("ycomp GRAPHNAME\n\n"); return (0); }