commit fdec834626d3fa97d9b4a993496f9db691d392b2
parent 4caf93bf49466f3f3d45062ecc19e20e0067109c
Author: MikoĊaj Lenczewski <mblenczewski@gmail.com>
Date: Sun, 12 Feb 2023 15:56:38 +0000
Reorganise libriot namespaces into riot, riot_wad, and riot_inibin
Diffstat:
11 files changed, 314 insertions(+), 266 deletions(-)
diff --git a/libriot/include/libriot.h b/libriot/include/libriot.h
@@ -8,165 +8,44 @@
extern "C" {
#endif /* __cplusplus */
-typedef s32 riot_bin_relptr_t;
-typedef u32 riot_bin_offptr_t;
+typedef s32 riot_relptr_t;
+typedef u32 riot_offptr_t;
-struct riot_bin_intrusive_list_node {
- riot_bin_relptr_t prev, next;
+struct riot_intrusive_list_node {
+ riot_relptr_t prev, next;
};
extern inline void
-riot_bin_intrusive_list_node_link(struct riot_bin_intrusive_list_node *self,
- struct riot_bin_intrusive_list_node *prev,
- struct riot_bin_intrusive_list_node *next);
+riot_intrusive_list_node_link(struct riot_intrusive_list_node *self,
+ struct riot_intrusive_list_node *prev,
+ struct riot_intrusive_list_node *next);
extern inline void
-riot_bin_intrusive_list_node_snip(struct riot_bin_intrusive_list_node *self);
-
-#define RIOT_BIN_NODE_COMPLEX_TYPE_FLAG 0x80
-
-enum riot_bin_node_type {
- RIOT_BIN_NODE_NONE = 0,
-
- RIOT_BIN_NODE_B8 = 1,
- RIOT_BIN_NODE_S8 = 2,
- RIOT_BIN_NODE_U8 = 3,
- RIOT_BIN_NODE_S16 = 4,
- RIOT_BIN_NODE_U16 = 5,
- RIOT_BIN_NODE_S32 = 6,
- RIOT_BIN_NODE_U32 = 7,
- RIOT_BIN_NODE_S64 = 8,
- RIOT_BIN_NODE_U64 = 9,
- RIOT_BIN_NODE_F32 = 10,
- RIOT_BIN_NODE_FVEC2 = 11,
- RIOT_BIN_NODE_FVEC3 = 12,
- RIOT_BIN_NODE_FVEC4 = 13,
- RIOT_BIN_NODE_FMAT4X4 = 14,
- RIOT_BIN_NODE_RGBA = 15,
- RIOT_BIN_NODE_STR = 16,
- RIOT_BIN_NODE_HASH = 17,
- RIOT_BIN_NODE_FILE = 18,
-
- RIOT_BIN_NODE_LIST = 0 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
- RIOT_BIN_NODE_LIST2 = 1 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
- RIOT_BIN_NODE_PTR = 2 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
- RIOT_BIN_NODE_EMBED = 3 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
- RIOT_BIN_NODE_LINK = 4 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
- RIOT_BIN_NODE_OPT = 5 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
- RIOT_BIN_NODE_MAP = 6 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
- RIOT_BIN_NODE_FLAG = 7 | RIOT_BIN_NODE_COMPLEX_TYPE_FLAG,
-};
+riot_intrusive_list_node_snip(struct riot_intrusive_list_node *self);
typedef u32 fnv1a_u32;
typedef u64 xxh64_u64;
-struct riot_fvec2 { f32 vs[2]; };
-struct riot_fvec3 { f32 vs[3]; };
-struct riot_fvec4 { f32 vs[4]; };
-struct riot_fmat4x4 { f32 vs[16]; };
-struct riot_rgba { u8 vs[4]; };
-
-struct riot_bin_str {
- u16 count;
- riot_bin_offptr_t data;
+struct riot_fvec2 {
+ f32 vs[2];
};
-struct riot_bin_field {
- fnv1a_u32 name_hash;
- riot_bin_offptr_t value;
- struct riot_bin_intrusive_list_node list;
+struct riot_fvec3 {
+ f32 vs[3];
};
-struct riot_bin_field_list {
- fnv1a_u32 name_hash;
- u16 count;
- riot_bin_offptr_t root;
+struct riot_fvec4 {
+ f32 vs[4];
};
-struct riot_bin_opt {
- b8 exists;
- riot_bin_relptr_t value;
+struct riot_fmat4x4 {
+ f32 vs[16];
};
-struct riot_bin_list {
- u32 count;
- riot_bin_offptr_t root;
+struct riot_rgba {
+ u8 vs[4];
};
-struct riot_bin_pair {
- riot_bin_offptr_t key, val;
- struct riot_bin_intrusive_list_node list;
-};
-
-struct riot_bin_map {
- u32 count;
- riot_bin_offptr_t root;
-};
-
-union riot_bin_node_tag {
- b8 node_b8, node_flag;
- s8 node_s8;
- u8 node_u8;
- s16 node_s16;
- u16 node_u16;
- s32 node_s32;
- u32 node_u32;
- s64 node_s64;
- u64 node_u64;
- f32 node_f32;
- struct riot_fvec2 node_fvec2;
- struct riot_fvec3 node_fvec3;
- struct riot_fvec4 node_fvec4;
- struct riot_fmat4x4 node_fmat4x4;
- struct riot_rgba node_rgba;
- struct riot_bin_str node_str;
- fnv1a_u32 node_hash, node_link;
- xxh64_u64 node_file;
- struct riot_bin_field_list node_ptr, node_embed;
- struct riot_bin_list node_list;
- struct riot_bin_opt node_opt;
- struct riot_bin_map node_map;
-};
-
-struct riot_bin_node {
- enum riot_bin_node_type type;
- union riot_bin_node_tag tag;
- struct riot_bin_intrusive_list_node list;
-};
-
-#define RIOT_BIN_CTX_STR_POOL_SZ 32 * KiB
-#define RIOT_BIN_CTX_FIELD_POOL_SZ 8 * KiB
-#define RIOT_BIN_CTX_PAIR_POOL_SZ 8 * KiB
-#define RIOT_BIN_CTX_NODE_POOL_SZ 8 * KiB
-
-struct riot_bin_ctx {
- struct mem_pool str_pool, field_pool, pair_pool, node_pool;
-};
-
-extern b32
-riot_bin_ctx_init(struct riot_bin_ctx *self);
-
-extern void
-riot_bin_ctx_free(struct riot_bin_ctx *self);
-
-extern b32
-riot_bin_ctx_push_str(struct riot_bin_ctx *self, u16 len, riot_bin_offptr_t *out);
-
-extern b32
-riot_bin_ctx_pushn_field(struct riot_bin_ctx *self, u16 count, riot_bin_offptr_t *out);
-
-extern b32
-riot_bin_ctx_pushn_pair(struct riot_bin_ctx *self, u32 count, riot_bin_offptr_t *out);
-
-extern b32
-riot_bin_ctx_pushn_node(struct riot_bin_ctx *self, u32 count, riot_bin_offptr_t *out);
-
-extern b32
-riot_bin_read(struct riot_bin_ctx *ctx, struct mem_stream stream);
-
-extern b32
-riot_bin_write(struct riot_bin_ctx *ctx, struct mem_stream stream);
-
#ifdef __cplusplus
};
#endif /* __cplusplus */
diff --git a/libriot/include/libriot/inibin.h b/libriot/include/libriot/inibin.h
@@ -0,0 +1,152 @@
+#ifndef LIBRIOT_INIBIN_H
+#define LIBRIOT_INIBIN_H
+
+#include "common.h"
+#include "utils.h"
+
+#include "libriot.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG 0x80
+
+enum riot_inibin_node_type {
+ RIOT_INIBIN_NODE_NONE = 0,
+
+ RIOT_INIBIN_NODE_B8 = 1,
+ RIOT_INIBIN_NODE_S8 = 2,
+ RIOT_INIBIN_NODE_U8 = 3,
+ RIOT_INIBIN_NODE_S16 = 4,
+ RIOT_INIBIN_NODE_U16 = 5,
+ RIOT_INIBIN_NODE_S32 = 6,
+ RIOT_INIBIN_NODE_U32 = 7,
+ RIOT_INIBIN_NODE_S64 = 8,
+ RIOT_INIBIN_NODE_U64 = 9,
+ RIOT_INIBIN_NODE_F32 = 10,
+ RIOT_INIBIN_NODE_FVEC2 = 11,
+ RIOT_INIBIN_NODE_FVEC3 = 12,
+ RIOT_INIBIN_NODE_FVEC4 = 13,
+ RIOT_INIBIN_NODE_FMAT4X4 = 14,
+ RIOT_INIBIN_NODE_RGBA = 15,
+ RIOT_INIBIN_NODE_STR = 16,
+ RIOT_INIBIN_NODE_HASH = 17,
+ RIOT_INIBIN_NODE_FILE = 18,
+
+ RIOT_INIBIN_NODE_LIST = 0 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+ RIOT_INIBIN_NODE_LIST2 = 1 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+ RIOT_INIBIN_NODE_PTR = 2 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+ RIOT_INIBIN_NODE_EMBED = 3 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+ RIOT_INIBIN_NODE_LINK = 4 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+ RIOT_INIBIN_NODE_OPT = 5 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+ RIOT_INIBIN_NODE_MAP = 6 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+ RIOT_INIBIN_NODE_FLAG = 7 | RIOT_INIBIN_NODE_COMPLEX_TYPE_FLAG,
+};
+
+struct riot_inibin_str {
+ u16 count;
+ riot_offptr_t data;
+};
+
+struct riot_inibin_field {
+ fnv1a_u32 name_hash;
+ riot_offptr_t value;
+ struct riot_intrusive_list_node list;
+};
+
+struct riot_inibin_field_list {
+ fnv1a_u32 name_hash;
+ u16 count;
+ riot_offptr_t root_field;
+};
+
+struct riot_inibin_opt {
+ b8 exists;
+ riot_relptr_t value;
+};
+
+struct riot_inibin_list {
+ u32 count;
+ riot_offptr_t root_node;
+};
+
+struct riot_inibin_pair {
+ riot_offptr_t key, val;
+ struct riot_intrusive_list_node list;
+};
+
+struct riot_inibin_map {
+ u32 count;
+ riot_offptr_t root_pair;
+};
+
+union riot_inibin_node_tag {
+ b8 node_b8, node_flag;
+ s8 node_s8;
+ u8 node_u8;
+ s16 node_s16;
+ u16 node_u16;
+ s32 node_s32;
+ u32 node_u32;
+ s64 node_s64;
+ u64 node_u64;
+ f32 node_f32;
+ struct riot_fvec2 node_fvec2;
+ struct riot_fvec3 node_fvec3;
+ struct riot_fvec4 node_fvec4;
+ struct riot_fmat4x4 node_fmat4x4;
+ struct riot_rgba node_rgba;
+ struct riot_inibin_str node_str;
+ fnv1a_u32 node_hash, node_link;
+ xxh64_u64 node_file;
+ struct riot_inibin_field_list node_ptr, node_embed;
+ struct riot_inibin_list node_list;
+ struct riot_inibin_opt node_opt;
+ struct riot_inibin_map node_map;
+};
+
+struct riot_inibin_node {
+ enum riot_inibin_node_type type;
+ union riot_inibin_node_tag tag;
+ struct riot_intrusive_list_node list;
+};
+
+#define RIOT_INIBIN_CTX_STR_POOL_SZ 32 * KiB
+#define RIOT_INIBIN_CTX_FIELD_POOL_SZ 8 * KiB
+#define RIOT_INIBIN_CTX_PAIR_POOL_SZ 8 * KiB
+#define RIOT_INIBIN_CTX_NODE_POOL_SZ 8 * KiB
+
+struct riot_inibin_ctx {
+ struct mem_pool str_pool, field_pool, pair_pool, node_pool;
+};
+
+extern b32
+riot_inibin_ctx_init(struct riot_inibin_ctx *self);
+
+extern void
+riot_inibin_ctx_free(struct riot_inibin_ctx *self);
+
+extern b32
+riot_inibin_ctx_push_str(struct riot_inibin_ctx *self, u16 len, riot_offptr_t *out);
+
+extern b32
+riot_inibin_ctx_pushn_field(struct riot_inibin_ctx *self, u16 count, riot_offptr_t *out);
+
+extern b32
+riot_inibin_ctx_pushn_pair(struct riot_inibin_ctx *self, u32 count, riot_offptr_t *out);
+
+extern b32
+riot_inibin_ctx_pushn_node(struct riot_inibin_ctx *self, u32 count, riot_offptr_t *out);
+
+extern b32
+riot_inibin_read(struct riot_inibin_ctx *ctx, struct mem_stream stream);
+
+extern b32
+riot_inibin_write(struct riot_inibin_ctx *ctx, struct mem_stream stream);
+
+#ifdef __cplusplus
+};
+#endif /* __cplusplus */
+
+#endif /* LIBRIOT_INIBIN_H */
diff --git a/libriot/include/libriot/wad.h b/libriot/include/libriot/wad.h
@@ -0,0 +1,17 @@
+#ifndef LIBRIOT_WAD_H
+#define LIBRIOT_WAD_H
+
+#include "common.h"
+#include "utils.h"
+
+#include "libriot.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef __cplusplus
+};
+#endif /* __cplusplus */
+
+#endif /* LIBRIOT_WAD_H */
diff --git a/libriot/makefile.mk b/libriot/makefile.mk
@@ -19,9 +19,9 @@ LIBRIOT_FLAGS := \
$(LDFLAGS)
LIBRIOT_SOURCES := libriot/src/libriot.c \
- libriot/src/utils.c \
- libriot/src/bin_reader.c \
- libriot/src/bin_writer.c
+ libriot/src/inibin.c \
+ libriot/src/inibin_reader.c \
+ libriot/src/inibin_writer.c
LIBRIOT_OBJECTS := $(LIBRIOT_SOURCES:%.c=$(OBJ)/%.c.o)
LIBRIOT_OBJDEPS := $(LIBRIOT_OBJECTS:%.o=%.d)
diff --git a/libriot/src/bin_reader.c b/libriot/src/bin_reader.c
@@ -1,10 +0,0 @@
-#include "libriot.h"
-
-b32
-riot_bin_read(struct riot_bin_ctx *ctx, struct mem_stream stream) {
- assert(ctx);
-
- (void) stream;
-
- return false;
-}
diff --git a/libriot/src/bin_writer.c b/libriot/src/bin_writer.c
@@ -1,10 +0,0 @@
-#include "libriot.h"
-
-b32
-riot_bin_write(struct riot_bin_ctx *ctx, struct mem_stream stream) {
- assert(ctx);
-
- (void) stream;
-
- return false;
-}
diff --git a/libriot/src/inibin.c b/libriot/src/inibin.c
@@ -0,0 +1,87 @@
+#include "libriot/inibin.h"
+
+b32
+riot_inibin_ctx_init(struct riot_inibin_ctx *self) {
+ assert(self);
+
+ if (!MEM_POOL_INIT(&self->str_pool, char, RIOT_INIBIN_CTX_STR_POOL_SZ))
+ goto str_pool_alloc_failure;
+
+ if (!MEM_POOL_INIT(&self->field_pool, struct riot_inibin_field, RIOT_INIBIN_CTX_FIELD_POOL_SZ))
+ goto field_pool_alloc_failure;
+
+ if (!MEM_POOL_INIT(&self->pair_pool, struct riot_inibin_pair, RIOT_INIBIN_CTX_PAIR_POOL_SZ))
+ goto pair_pool_alloc_failure;
+
+ if (!MEM_POOL_INIT(&self->node_pool, struct riot_inibin_node, RIOT_INIBIN_CTX_NODE_POOL_SZ))
+ goto node_pool_alloc_failure;
+
+ return true;
+
+node_pool_alloc_failure:
+ mem_pool_free(&self->pair_pool);
+pair_pool_alloc_failure:
+ mem_pool_free(&self->field_pool);
+field_pool_alloc_failure:
+ mem_pool_free(&self->str_pool);
+str_pool_alloc_failure:
+ return false;
+}
+
+void
+riot_inibin_ctx_free(struct riot_inibin_ctx *self) {
+ assert(self);
+
+ mem_pool_free(&self->str_pool);
+ mem_pool_free(&self->field_pool);
+ mem_pool_free(&self->pair_pool);
+ mem_pool_free(&self->node_pool);
+}
+
+b32
+riot_inibin_ctx_push_str(struct riot_inibin_ctx *self, u16 len, riot_offptr_t *out) {
+ assert(self);
+
+ void *absptr = MEM_POOL_ALLOC(&self->str_pool, char, len);
+ if (!absptr) return false;
+
+ *out = (char *)absptr - (char *)self->str_pool.ptr;
+
+ return true;
+}
+
+b32
+riot_inibin_ctx_pushn_field(struct riot_inibin_ctx *self, u16 count, riot_offptr_t *out) {
+ assert(self);
+
+ void *absptr = MEM_POOL_ALLOC(&self->field_pool, struct riot_inibin_field, count);
+ if (!absptr) return false;
+
+ *out = (struct riot_inibin_field *)absptr - (struct riot_inibin_field *)self->field_pool.ptr;
+
+ return true;
+}
+
+b32
+riot_inibin_ctx_pushn_pair(struct riot_inibin_ctx *self, u32 count, riot_offptr_t *out) {
+ assert(self);
+
+ void *absptr = MEM_POOL_ALLOC(&self->pair_pool, struct riot_inibin_pair, count);
+ if (!absptr) return false;
+
+ *out = (struct riot_inibin_pair *)absptr - (struct riot_inibin_pair *)self->pair_pool.ptr;
+
+ return true;
+}
+
+b32
+riot_inibin_ctx_pushn_node(struct riot_inibin_ctx *self, u32 count, riot_offptr_t *out) {
+ assert(self);
+
+ void *absptr = MEM_POOL_ALLOC(&self->node_pool, struct riot_inibin_node, count);
+ if (!absptr) return false;
+
+ *out = (struct riot_inibin_node *)absptr - (struct riot_inibin_node *)self->node_pool.ptr;
+
+ return true;
+}
diff --git a/libriot/src/inibin_reader.c b/libriot/src/inibin_reader.c
@@ -0,0 +1,10 @@
+#include "libriot/inibin.h"
+
+b32
+riot_inibin_read(struct riot_inibin_ctx *ctx, struct mem_stream stream) {
+ assert(ctx);
+
+ (void) stream;
+
+ return false;
+}
diff --git a/libriot/src/inibin_writer.c b/libriot/src/inibin_writer.c
@@ -0,0 +1,10 @@
+#include "libriot/inibin.h"
+
+b32
+riot_inibin_write(struct riot_inibin_ctx *ctx, struct mem_stream stream) {
+ assert(ctx);
+
+ (void) stream;
+
+ return false;
+}
diff --git a/libriot/src/libriot.c b/libriot/src/libriot.c
@@ -1,87 +1,28 @@
#include "libriot.h"
-b32
-riot_bin_ctx_init(struct riot_bin_ctx *self) {
- assert(self);
-
- if (!MEM_POOL_INIT(&self->str_pool, char, RIOT_BIN_CTX_STR_POOL_SZ))
- goto str_pool_alloc_failure;
-
- if (!MEM_POOL_INIT(&self->field_pool, struct riot_bin_field, RIOT_BIN_CTX_FIELD_POOL_SZ))
- goto field_pool_alloc_failure;
-
- if (!MEM_POOL_INIT(&self->pair_pool, struct riot_bin_pair, RIOT_BIN_CTX_PAIR_POOL_SZ))
- goto pair_pool_alloc_failure;
-
- if (!MEM_POOL_INIT(&self->node_pool, struct riot_bin_node, RIOT_BIN_CTX_NODE_POOL_SZ))
- goto node_pool_alloc_failure;
-
- return true;
-
-node_pool_alloc_failure:
- mem_pool_free(&self->pair_pool);
-pair_pool_alloc_failure:
- mem_pool_free(&self->field_pool);
-field_pool_alloc_failure:
- mem_pool_free(&self->str_pool);
-str_pool_alloc_failure:
- return false;
-}
-
void
-riot_bin_ctx_free(struct riot_bin_ctx *self) {
+riot_intrusive_list_node_link(struct riot_intrusive_list_node *self,
+ struct riot_intrusive_list_node *prev,
+ struct riot_intrusive_list_node *next) {
assert(self);
+ assert(prev);
+ assert(next);
- mem_pool_free(&self->str_pool);
- mem_pool_free(&self->field_pool);
- mem_pool_free(&self->pair_pool);
- mem_pool_free(&self->node_pool);
-}
-
-b32
-riot_bin_ctx_push_str(struct riot_bin_ctx *self, u16 len, riot_bin_offptr_t *out) {
- assert(self);
-
- void *absptr = MEM_POOL_ALLOC(&self->str_pool, char, len);
- if (!absptr) return false;
-
- *out = (char *)absptr - (char *)self->str_pool.ptr;
-
- return true;
+ prev->next = RELPTR_ABS2REL(riot_relptr_t, prev, self);
+ self->prev = RELPTR_ABS2REL(riot_relptr_t, self, prev);
+ self->next = RELPTR_ABS2REL(riot_relptr_t, self, next);
+ next->prev = RELPTR_ABS2REL(riot_relptr_t, next, self);
}
-b32
-riot_bin_ctx_pushn_field(struct riot_bin_ctx *self, u16 count, riot_bin_offptr_t *out) {
- assert(self);
-
- void *absptr = MEM_POOL_ALLOC(&self->field_pool, struct riot_bin_field, count);
- if (!absptr) return false;
-
- *out = (struct riot_bin_field *)absptr - (struct riot_bin_field *)self->field_pool.ptr;
-
- return true;
-}
-
-b32
-riot_bin_ctx_pushn_pair(struct riot_bin_ctx *self, u32 count, riot_bin_offptr_t *out) {
- assert(self);
-
- void *absptr = MEM_POOL_ALLOC(&self->pair_pool, struct riot_bin_pair, count);
- if (!absptr) return false;
-
- *out = (struct riot_bin_pair *)absptr - (struct riot_bin_pair *)self->pair_pool.ptr;
-
- return true;
-}
-
-b32
-riot_bin_ctx_pushn_node(struct riot_bin_ctx *self, u32 count, riot_bin_offptr_t *out) {
+void
+riot_intrusive_list_node_snip(struct riot_intrusive_list_node *self) {
assert(self);
- void *absptr = MEM_POOL_ALLOC(&self->node_pool, struct riot_bin_node, count);
- if (!absptr) return false;
-
- *out = (struct riot_bin_node *)absptr - (struct riot_bin_node *)self->node_pool.ptr;
+ struct riot_intrusive_list_node *prev, *next;
+ prev = RELPTR_REL2ABS(struct riot_intrusive_list_node *, riot_relptr_t, self, self->prev);
+ next = RELPTR_REL2ABS(struct riot_intrusive_list_node *, riot_relptr_t, self, self->next);
- return true;
+ prev->next = RELPTR_ABS2REL(riot_relptr_t, prev, next);
+ next->prev = RELPTR_ABS2REL(riot_relptr_t, next, prev);
+ self->prev = self->next = RELPTR_NULL;
}
diff --git a/libriot/src/utils.c b/libriot/src/utils.c
@@ -1,28 +0,0 @@
-#include "libriot.h"
-
-void
-riot_bin_intrusive_list_node_link(struct riot_bin_intrusive_list_node *self,
- struct riot_bin_intrusive_list_node *prev,
- struct riot_bin_intrusive_list_node *next) {
- assert(self);
- assert(prev);
- assert(next);
-
- prev->next = RELPTR_ABS2REL(riot_bin_relptr_t, prev, self);
- self->prev = RELPTR_ABS2REL(riot_bin_relptr_t, self, prev);
- self->next = RELPTR_ABS2REL(riot_bin_relptr_t, self, next);
- next->prev = RELPTR_ABS2REL(riot_bin_relptr_t, next, self);
-}
-
-void
-riot_bin_intrusive_list_node_snip(struct riot_bin_intrusive_list_node *self) {
- assert(self);
-
- struct riot_bin_intrusive_list_node *prev, *next;
- prev = RELPTR_REL2ABS(struct riot_bin_intrusive_list_node *, riot_bin_relptr_t, self, self->prev);
- next = RELPTR_REL2ABS(struct riot_bin_intrusive_list_node *, riot_bin_relptr_t, self, self->next);
-
- prev->next = RELPTR_ABS2REL(riot_bin_relptr_t, prev, next);
- next->prev = RELPTR_ABS2REL(riot_bin_relptr_t, next, prev);
- self->prev = self->next = RELPTR_NULL;
-}
