projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use be_put_ignore_regs() instead of duplicating its logic.
[libfirm]
/
ir
/
adt
/
pqueue.c
diff --git
a/ir/adt/pqueue.c
b/ir/adt/pqueue.c
index
3ce0f1e
..
5becefa
100644
(file)
--- a/
ir/adt/pqueue.c
+++ b/
ir/adt/pqueue.c
@@
-45,7
+45,7
@@
typedef struct _pqueue_el_t {
void *data;
typedef struct _pqueue_el_t {
void *data;
- int
ke
y;
+ int
priorit
y;
} pqueue_el_t;
struct _pqueue_t {
} pqueue_el_t;
struct _pqueue_t {
@@
-63,11
+63,12
@@
static void pqueue_heapify(pqueue_t *q, unsigned pos) {
pqueue_el_t tmp;
unsigned exchange = pos;
pqueue_el_t tmp;
unsigned exchange = pos;
- if (q->elems[exchange].
key < q->elems[pos * 2].ke
y) {
+ if (q->elems[exchange].
priority < q->elems[pos * 2].priorit
y) {
exchange = pos * 2;
}
exchange = pos * 2;
}
- if ((pos * 2 + 1) < len && q->elems[exchange].key < q->elems[pos * 2 + 1].key) {
+ if ((pos * 2 + 1) < len
+ && q->elems[exchange].priority < q->elems[pos * 2 + 1].priority) {
exchange = pos * 2 + 1;
}
exchange = pos * 2 + 1;
}
@@
-86,7
+87,7
@@
static void pqueue_heapify(pqueue_t *q, unsigned pos) {
* Sifts up a newly inserted element at position @p pos.
*/
static void pqueue_sift_up(pqueue_t *q, unsigned pos) {
* Sifts up a newly inserted element at position @p pos.
*/
static void pqueue_sift_up(pqueue_t *q, unsigned pos) {
- while(q->elems[pos].
key > q->elems[pos / 2].ke
y) {
+ while(q->elems[pos].
priority > q->elems[pos / 2].priorit
y) {
pqueue_el_t tmp;
tmp = q->elems[pos];
pqueue_el_t tmp;
tmp = q->elems[pos];
@@
-108,11
+109,11
@@
void del_pqueue(pqueue_t *q) {
free(q);
}
free(q);
}
-void pqueue_put(pqueue_t *q, void *data, int
ke
y) {
+void pqueue_put(pqueue_t *q, void *data, int
priorit
y) {
pqueue_el_t el;
pqueue_el_t el;
- el.data = data;
- el.
key = ke
y;
+ el.data
= data;
+ el.
priority = priorit
y;
ARR_APP1(pqueue_el_t, q->elems, el);
ARR_APP1(pqueue_el_t, q->elems, el);