projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not warn about wrong register for a Phi input if that register is a joker (i.e...
[libfirm]
/
testprograms
/
dead_block_example.c
diff --git
a/testprograms/dead_block_example.c
b/testprograms/dead_block_example.c
index
83f43bb
..
426507e
100644
(file)
--- a/
testprograms/dead_block_example.c
+++ b/
testprograms/dead_block_example.c
@@
-10,12
+10,12
@@
* Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE.
*/
* Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE.
*/
-#
include <stdio.h>
-#
include <string.h>
+#include <stdio.h>
+#include <string.h>
-# include "irvrfy.h"
-# include "irdump.h"
-#
include "firm.h"
+
+
+#
include <libfirm/firm.h>
/*
* a dead block / unreachable code.
/*
* a dead block / unreachable code.
@@
-48,27
+48,28
@@
*
**/
*
**/
-int main(
int argc, char **argv
)
+int main(
void
)
{
{
+ char *dump_file_suffix = "";
ir_graph *irg; /* this variable contains the irgraph */
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 *prim_t_int;
-
entity *ent; /* represents this method as
entity of owner */
+
ir_
type *owner; /* the class in which this method is defined */
+
ir_type *proc_main; /* ir_
type information for the method main */
+
ir_
type *prim_t_int;
+
ir_entity *ent; /* represents this method as ir_
entity of owner */
ir_node *c1, *c2, *cond, *f, *t, *endBlock, *Block1, *jmp, *Block2,
*deadBlock, *x;
/* init library */
init_firm (NULL);
ir_node *c1, *c2, *cond, *f, *t, *endBlock, *Block1, *jmp, *Block2,
*deadBlock, *x;
/* init library */
init_firm (NULL);
- /*** Make basic
type information for primitive
type int. ***/
- prim_t_int = new_type_primitive(
id_from_str
("int", 3), mode_Is);
+ /*** Make basic
ir_type information for primitive ir_
type int. ***/
+ prim_t_int = new_type_primitive(
new_id_from_chars
("int", 3), mode_Is);
/* FIRM was designed for oo languages where all methods belong to a class.
* For imperative languages like C we view a file as a large class containing
* all functions as methods in this file.
* Therefore we define a class "empty" according to the file name
/* FIRM was designed for oo languages where all methods belong to a class.
* For imperative languages like C we view a file as a large class containing
* all functions as methods in this file.
* Therefore we define a class "empty" according to the file name
- * with a method main as an entity.
+ * with a method main as an
ir_
entity.
*/
#define CLASSNAME "DEAD_BLOCK"
#define METHODNAME "main"
*/
#define CLASSNAME "DEAD_BLOCK"
#define METHODNAME "main"
@@
-76,12
+77,12
@@
int main(int argc, char **argv)
#define NRES 1
printf("\nCreating an IR graph: %s...\n", CLASSNAME);
#define NRES 1
printf("\nCreating an IR graph: %s...\n", CLASSNAME);
- owner = new_type_class (
id_from_str
(CLASSNAME, strlen(CLASSNAME)));
- proc_main = new_type_method(
id_from_str
(METHODNAME, strlen(METHODNAME)),
+ owner = new_type_class (
new_id_from_chars
(CLASSNAME, strlen(CLASSNAME)));
+ proc_main = new_type_method(
new_id_from_chars
(METHODNAME, strlen(METHODNAME)),
NRARGS, NRES);
set_method_res_type(proc_main, 0, prim_t_int);
ent = new_entity (owner,
NRARGS, NRES);
set_method_res_type(proc_main, 0, prim_t_int);
ent = new_entity (owner,
-
id_from_str
(METHODNAME, strlen(METHODNAME)),
+
new_id_from_chars
(METHODNAME, strlen(METHODNAME)),
proc_main);
get_entity_ld_name(ent); /* To enforce name mangling for vcg graph name */
#define NUM_OF_LOCAL_VARS 1
proc_main);
get_entity_ld_name(ent); /* To enforce name mangling for vcg graph name */
#define NUM_OF_LOCAL_VARS 1
@@
-93,48
+94,48
@@
int main(int argc, char **argv)
c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
set_value(0, c2);
c2 = new_Const (mode_Is, new_tarval_from_long (2, mode_Is));
set_value(0, c2);
- cond = new_Cond(new_Proj(new_Cmp(c1, c2), mode_b, Eq));
+ cond = new_Cond(new_Proj(new_Cmp(c1, c2), mode_b,
pn_Cmp_
Eq));
f = new_Proj(cond, mode_X, 0);
t = new_Proj(cond, mode_X, 1);
f = new_Proj(cond, mode_X, 0);
t = new_Proj(cond, mode_X, 1);
- mature_
b
lock(get_irg_current_block(irg));
+ mature_
immB
lock(get_irg_current_block(irg));
/* end block to add jmps */
endBlock = new_immBlock();
/* Block 1 */
Block1 = new_immBlock();
/* end block to add jmps */
endBlock = new_immBlock();
/* Block 1 */
Block1 = new_immBlock();
- add_i
n_edge
(Block1, t);
- mature_
b
lock(Block1);
+ add_i
mmBlock_pred
(Block1, t);
+ mature_
immB
lock(Block1);
jmp = new_Jmp();
jmp = new_Jmp();
- add_i
n_edge
(endBlock, jmp);
+ add_i
mmBlock_pred
(endBlock, jmp);
/* Block 2 */
Block2 = new_immBlock();
/* Block 2 */
Block2 = new_immBlock();
- add_i
n_edge
(Block2, f);
- mature_
b
lock(Block2);
+ add_i
mmBlock_pred
(Block2, f);
+ mature_
immB
lock(Block2);
jmp = new_Jmp();
jmp = new_Jmp();
- add_i
n_edge
(endBlock, jmp);
+ add_i
mmBlock_pred
(endBlock, jmp);
/* dead Block */
deadBlock = new_immBlock();
/* dead Block */
deadBlock = new_immBlock();
- mature_
b
lock(deadBlock);
+ mature_
immB
lock(deadBlock);
jmp = new_Jmp();
jmp = new_Jmp();
- add_i
n_edge
(endBlock, jmp);
+ add_i
mmBlock_pred
(endBlock, jmp);
/* finish end block */
/* finish end block */
- s
witch
_block(endBlock);
+ s
et_cur
_block(endBlock);
{
ir_node *in[1];
in[0] = get_value(0, mode_Is);
get_store();
x = new_Return (get_store(), 1, in);
}
{
ir_node *in[1];
in[0] = get_value(0, mode_Is);
get_store();
x = new_Return (get_store(), 1, in);
}
- mature_
b
lock (get_irg_current_block(irg));
+ mature_
immB
lock (get_irg_current_block(irg));
- add_i
n_edge
(get_irg_end_block(irg), x);
- mature_
b
lock (get_irg_end_block(irg));
+ add_i
mmBlock_pred
(get_irg_end_block(irg), x);
+ mature_
immB
lock (get_irg_end_block(irg));
- finalize_cons (irg);
+
irg_
finalize_cons (irg);
printf("Optimizing ...\n");
local_optimize_graph (irg);
printf("Optimizing ...\n");
local_optimize_graph (irg);
@@
-144,10
+145,10
@@
int main(int argc, char **argv)
irg_vrfy(irg);
printf("Dumping the graph and a control flow graph.\n");
irg_vrfy(irg);
printf("Dumping the graph and a control flow graph.\n");
- dump_ir_block_graph (irg);
- dump_cfg (irg);
- printf("Use
xvcg
to view these graphs:\n");
- printf("
/ben/goetz/bin/xvcg
GRAPHNAME\n\n");
+ dump_ir_block_graph (irg
, dump_file_suffix
);
+ dump_cfg (irg
, dump_file_suffix
);
+ printf("Use
ycomp
to view these graphs:\n");
+ printf("
ycomp
GRAPHNAME\n\n");
return (0);
}
return (0);
}