diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-09 16:31:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-07 21:05:47 -0700 |
commit | c08c251d04d71bce96f7734692307ae7ca6f52b2 (patch) | |
tree | 863e541011db08107088aa22bc25ebcab572c532 /sort.c | |
parent | Move remove_pseudo() to linearize.h (diff) | |
download | sparse-c08c251d04d71bce96f7734692307ae7ca6f52b2.tar.gz sparse-c08c251d04d71bce96f7734692307ae7ca6f52b2.tar.bz2 sparse-c08c251d04d71bce96f7734692307ae7ca6f52b2.zip |
Beginning infrastructure for tagged lists.
Right now we verify that low bits are clear when inserting,
and clear them on use.
Diffstat (limited to 'sort.c')
-rw-r--r-- | sort.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -138,7 +138,7 @@ merge_block_seqs (struct ptr_list *b1, int n, // Do a quick skip in case entire blocks from b1 are // already less than smallest element in b2. while (b1->nr == 0 || - cmp (b1->list[b1->nr - 1], b2->list[0]) < 0) { + cmp (PTR_ENTRY(b1, b1->nr - 1), PTR_ENTRY(b2,0)) < 0) { // printf ("Skipping whole block.\n"); BEEN_THERE('H'); b1 = b1->next; @@ -149,8 +149,8 @@ merge_block_seqs (struct ptr_list *b1, int n, } while (1) { - const void *d1 = b1->list[i1]; - const void *d2 = b2->list[i2]; + const void *d1 = PTR_ENTRY(b1,i1); + const void *d2 = PTR_ENTRY(b2,i2); assert (i1 >= 0 && i1 < b1->nr); assert (i2 >= 0 && i2 < b2->nr); |