projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix another PIC problem
[libfirm]
/
ir
/
be
/
beschedtrivial.c
diff --git
a/ir/be/beschedtrivial.c
b/ir/be/beschedtrivial.c
index
25b5e45
..
b95fefe
100644
(file)
--- a/
ir/be/beschedtrivial.c
+++ b/
ir/be/beschedtrivial.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.
*
@@
-24,9
+24,7
@@
* @date 29.08.2006
* @version $Id$
*/
* @date 29.08.2006
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include <stdlib.h>
#include <stdlib.h>
@@
-42,15
+40,17
@@
* Just assure that branches are executed last, otherwise select
* the first node ready.
*/
* Just assure that branches are executed last, otherwise select
* the first node ready.
*/
-static ir_node *trivial_select(void *block_env, ir_nodeset_t *ready_set, ir_nodeset_t *live_set)
+static ir_node *trivial_select(void *block_env, ir_nodeset_t *ready_set,
+ ir_nodeset_t *live_set)
{
{
- const arch_env_t *arch_env = block_env;
- ir_node *irn = NULL;
- ir_nodeset_iterator_t iter;
+ ir_node *irn;
+ ir_nodeset_iterator_t iter;
+ (void)block_env;
+ (void)live_set;
/* assure that branches and constants are executed last */
foreach_ir_nodeset(ready_set, irn, iter) {
/* assure that branches and constants are executed last */
foreach_ir_nodeset(ready_set, irn, iter) {
- if (!
arch_irn_class_is(arch_env, irn, branch
)) {
+ if (!
is_cfop(irn
)) {
return irn;
}
}
return irn;
}
}
@@
-62,17
+62,21
@@
static ir_node *trivial_select(void *block_env, ir_nodeset_t *ready_set, ir_node
return irn;
}
return irn;
}
-static void *trivial_init_graph(const list_sched_selector_t *vtab, const
arch_env_t *arch_env, ir_graph *
irg)
+static void *trivial_init_graph(const list_sched_selector_t *vtab, const
be_irg_t *b
irg)
{
{
- return (void *)arch_env;
+ (void)vtab;
+ (void)birg;
+ return NULL;
}
}
-static void *trivial_init_block(void *graph_env, ir_node *bl)
+static void *trivial_init_block(void *graph_env, ir_node *bl
ock
)
{
{
- return graph_env;
+ (void)graph_env;
+ (void)block;
+ return NULL;
}
}
-
static const list_sched_selector_t trivial_selector_struct
= {
+
const list_sched_selector_t trivial_selector
= {
trivial_init_graph,
trivial_init_block,
trivial_select,
trivial_init_graph,
trivial_init_block,
trivial_select,
@@
-84,5
+88,3
@@
static const list_sched_selector_t trivial_selector_struct = {
NULL, /* finish_block */
NULL /* finish_graph */
};
NULL, /* finish_block */
NULL /* finish_graph */
};
-
-const list_sched_selector_t *trivial_selector = &trivial_selector_struct;