procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rbtree: drop the data pointer; instead rely on being embedded

Browse source 
Drop the data pointer, and instead assume the struct rbtree will be
embedded in a bigger data structure (to be extracted via
container_of()).

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2008-10-30 10:58:28 -07:00
parent 9656a581cd
commit e8873121aa
7 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -319,7 +319,7 @@ preproc.$(O): preproc.c compiler.h config.h hashtbl.h insnsi.h nasm.h \
version.h
quote.$(O): quote.c compiler.h config.h nasmlib.h quote.h
raa.$(O): raa.c compiler.h config.h nasmlib.h raa.h
rbtree.$(O): rbtree.c compiler.h config.h nasmlib.h rbtree.h
rbtree.$(O): rbtree.c compiler.h config.h rbtree.h
regdis.$(O): regdis.c regdis.h regs.h
regflags.$(O): regflags.c compiler.h config.h insnsi.h nasm.h nasmlib.h \
pptok.h preproc.h regs.h tables.h version.h

2
Mkfiles/msvc.mak
View file

@ -252,7 +252,7 @@ preproc.$(O): preproc.c compiler.h hashtbl.h insnsi.h nasm.h nasmlib.h \
pptok.h preproc.h quote.h regs.h stdscan.h tables.h tokens.h version.h
quote.$(O): quote.c compiler.h nasmlib.h quote.h
raa.$(O): raa.c compiler.h nasmlib.h raa.h
rbtree.$(O): rbtree.c compiler.h nasmlib.h rbtree.h
rbtree.$(O): rbtree.c compiler.h rbtree.h
regdis.$(O): regdis.c regdis.h regs.h
regflags.$(O): regflags.c compiler.h insnsi.h nasm.h nasmlib.h pptok.h \
preproc.h regs.h tables.h version.h

2
Mkfiles/netware.mak
View file

@ -194,7 +194,7 @@ preproc.o: preproc.c compiler.h config.h hashtbl.h insnsi.h nasm.h nasmlib.h \
pptok.h preproc.h quote.h regs.h stdscan.h tables.h tokens.h version.h
quote.o: quote.c compiler.h config.h nasmlib.h quote.h
raa.o: raa.c compiler.h config.h nasmlib.h raa.h
rbtree.o: rbtree.c compiler.h config.h nasmlib.h rbtree.h
rbtree.o: rbtree.c compiler.h config.h rbtree.h
regdis.o: regdis.c regdis.h regs.h
regflags.o: regflags.c compiler.h config.h insnsi.h nasm.h nasmlib.h pptok.h \
preproc.h regs.h tables.h version.h

2
Mkfiles/openwcom.mak
View file

@ -281,7 +281,7 @@ preproc.$(O): preproc.c compiler.h hashtbl.h insnsi.h nasm.h nasmlib.h &
pptok.h preproc.h quote.h regs.h stdscan.h tables.h tokens.h version.h
quote.$(O): quote.c compiler.h nasmlib.h quote.h
raa.$(O): raa.c compiler.h nasmlib.h raa.h
rbtree.$(O): rbtree.c compiler.h nasmlib.h rbtree.h
rbtree.$(O): rbtree.c compiler.h rbtree.h
regdis.$(O): regdis.c regdis.h regs.h
regflags.$(O): regflags.c compiler.h insnsi.h nasm.h nasmlib.h pptok.h &
preproc.h regs.h tables.h version.h

2
Mkfiles/owlinux.mak
View file

@ -291,7 +291,7 @@ preproc.$(O): preproc.c compiler.h hashtbl.h insnsi.h nasm.h nasmlib.h \
pptok.h preproc.h quote.h regs.h stdscan.h tables.h tokens.h version.h
quote.$(O): quote.c compiler.h nasmlib.h quote.h
raa.$(O): raa.c compiler.h nasmlib.h raa.h
rbtree.$(O): rbtree.c compiler.h nasmlib.h rbtree.h
rbtree.$(O): rbtree.c compiler.h rbtree.h
regdis.$(O): regdis.c regdis.h regs.h
regflags.$(O): regflags.c compiler.h insnsi.h nasm.h nasmlib.h pptok.h \
preproc.h regs.h tables.h version.h

28
rbtree.c
View file

@ -3,15 +3,14 @@
*
* Simple implementation of a left-leaning red-black tree with 64-bit
* integer keys. The search operation will return the highest node <=
* the key; only search, insert, and full-tree deletion is supported,
* but additional standard llrbtree operations can be coded up at will.
* the key; only search and insert are supported, but additional
* standard llrbtree operations can be coded up at will.
*
* See http://www.cs.princeton.edu/~rs/talks/LLRB/RedBlack.pdf for
* information about left-leaning red-black trees.
*/
#include "rbtree.h"
#include "nasmlib.h"
const struct rbtree *rb_search(const struct rbtree *tree, uint64_t key)
{
@ -62,24 +61,20 @@ static void color_flip(struct rbtree *h)
h->right->red = !h->right->red;
}
struct rbtree *rb_insert(struct rbtree *tree, uint64_t key, void *data)
struct rbtree *rb_insert(struct rbtree *tree, struct rbtree *node)
{
if (!tree) {
struct rbtree *node = nasm_malloc(sizeof *node);
node->key = key;
node->data = data;
node->red = true;
node->red = true;
return node;
}
if (is_red(tree->left) && is_red(tree->right))
color_flip(tree);
if (key < tree->key)
tree->left = rb_insert(tree->left, key, data);
if (node->key < tree->key)
tree->left = rb_insert(tree->left, node);
else
tree->right = rb_insert(tree->right, key, data);
tree->right = rb_insert(tree->right, node);
if (is_red(tree->right))
tree = rotate_left(tree);
@ -89,12 +84,3 @@ struct rbtree *rb_insert(struct rbtree *tree, uint64_t key, void *data)
return tree;
}
void rb_free(struct rbtree *tree)
{
if (tree) {
rb_free(tree->left);
rb_free(tree->right);
nasm_free(tree);
}
}

7
rbtree.h
View file

@ -4,15 +4,16 @@
#include "compiler.h"
#include <inttypes.h>
/* This structure should be embedded in a larger data structure;
the final output from rb_search() can then be converted back
to the larger data structure via container_of(). */
struct rbtree {
uint64_t key;
void *data;
struct rbtree *left, *right;
bool red;
};
struct rbtree *rb_insert(struct rbtree *, uint64_t, void *);
struct rbtree *rb_insert(struct rbtree *, struct rbtree *);
const struct rbtree *rb_search(const struct rbtree *, uint64_t);
void rb_free(struct rbtree *);
#endif /* NASM_RBTREE_H */