projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in comment.
[libfirm]
/
ir
/
opt
/
proc_cloning.c
diff --git
a/ir/opt/proc_cloning.c
b/ir/opt/proc_cloning.c
index
1e29e6a
..
0e9f492
100644
(file)
--- a/
ir/opt/proc_cloning.c
+++ b/
ir/opt/proc_cloning.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-35,31
+35,24
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#ifdef HAVE_STRING_H
#include <string.h>
#include <string.h>
-#endif
+#include "iroptimize.h"
#include "tv.h"
#include "set.h"
#include "tv.h"
#include "set.h"
-#include "entity.h"
#include "irprog_t.h"
#include "hashptr.h"
#include "irgwalk.h"
#include "irprog_t.h"
#include "hashptr.h"
#include "irgwalk.h"
-#include "proc_cloning.h"
#include "analyze_irg_args.h"
#include "irprintf.h"
#include "ircons.h"
#include "irouts.h"
#include "analyze_irg_args.h"
#include "irprintf.h"
#include "ircons.h"
#include "irouts.h"
-#include "mangle.h"
#include "irnode_t.h"
#include "irtools.h"
#include "irgmod.h"
#include "array.h"
#include "xmalloc.h"
#include "irnode_t.h"
#include "irtools.h"
#include "irgmod.h"
#include "array.h"
#include "xmalloc.h"
-/* A macro to iterate sets.*/
-#define ITERATE_SET(set_entries, entry) for(entry = set_first(set_entries); entry; entry = set_next(set_entries))
-
/**
* This struct contains the information quadruple for a Call, which we need to
* decide if this function must be cloned.
/**
* This struct contains the information quadruple for a Call, which we need to
* decide if this function must be cloned.
@@
-191,14
+184,10
@@
static void collect_irg_calls(ir_node *call, void *env) {
if (is_Call(call)) {
call_ptr = get_Call_ptr(call);
if (is_Call(call)) {
call_ptr = get_Call_ptr(call);
- /* Call pointer must be a SymConst*/
- if (op_SymConst != get_irn_op(call_ptr))
- return;
- /* Call pointer must be the address of an entity.*/
- if (get_SymConst_kind(call_ptr) != symconst_addr_ent)
+ if (! is_Global(call_ptr))
return;
return;
- callee = get_
SymConst
_entity(call_ptr);
+ callee = get_
Global
_entity(call_ptr);
/* we can only clone calls to existing entities */
if (get_entity_visibility(callee) == visibility_external_allocated)
/* we can only clone calls to existing entities */
if (get_entity_visibility(callee) == visibility_external_allocated)
@@
-273,6
+262,7
@@
static void set_preds(ir_node *irn, void *env) {
irn_copy = get_irn_link(irn);
if (is_Block(irn)) {
irn_copy = get_irn_link(irn);
if (is_Block(irn)) {
+ set_Block_MacroBlock(irn_copy, get_irn_link(get_Block_MacroBlock(irn)));
for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; i--) {
pred = get_Block_cfgpred(irn, i);
/* "End" block must be handled extra, because it is not matured.*/
for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; i--) {
pred = get_Block_cfgpred(irn, i);
/* "End" block must be handled extra, because it is not matured.*/
@@
-321,7
+311,7
@@
static ir_node *get_irg_arg(ir_graph *irg, int pos) {
* We rely on the fact the only one arg exists, so do
* a cheap CSE in this case.
*/
* We rely on the fact the only one arg exists, so do
* a cheap CSE in this case.
*/
- set_irn_out(irg_args, i, arg);
+ set_irn_out(irg_args, i, arg
, 0
);
exchange(proj, arg);
} else
arg = proj;
exchange(proj, arg);
} else
arg = proj;
@@
-442,7
+432,7
@@
static ir_entity *clone_method(quadruple_t *q) {
sym.entity_p = new_entity;
rem = current_ir_graph;
current_ir_graph = get_const_code_irg();
sym.entity_p = new_entity;
rem = current_ir_graph;
current_ir_graph = get_const_code_irg();
- new_entity->value = new_SymConst(sym, symconst_addr_ent);
+ new_entity->value = new_SymConst(
mode_P_code,
sym, symconst_addr_ent);
current_ir_graph = rem;
/* The "new_entity" don't have this information. */
current_ir_graph = rem;
/* The "new_entity" don't have this information. */
@@
-469,7
+459,7
@@
static ir_node *new_cl_Call(ir_node *call, ir_entity *new_entity, int pos) {
ir_node *bl = get_nodes_block(call);
sym.entity_p = new_entity;
ir_node *bl = get_nodes_block(call);
sym.entity_p = new_entity;
- callee = new_r_SymConst(irg, bl, sym, symconst_addr_ent);
+ callee = new_r_SymConst(irg, bl,
mode_P_code,
sym, symconst_addr_ent);
mtp = get_entity_type(new_entity);
n_params = get_Call_n_params(call);
mtp = get_entity_type(new_entity);
n_params = get_Call_n_params(call);
@@
-516,7
+506,7
@@
static void exchange_calls(quadruple_t *q, ir_entity *cloned_ent) {
*/
static float calculate_weight(const entry_t *entry) {
return ARR_LEN(entry->q.calls) *
*/
static float calculate_weight(const entry_t *entry) {
return ARR_LEN(entry->q.calls) *
- (get_method_param_weight(entry->q.ent, entry->q.pos) + 1);
+ (
float)(
get_method_param_weight(entry->q.ent, entry->q.pos) + 1);
}
/**
}
/**