noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Macro safe slot_allocator.h

Browse Source
This commit is contained in:
Nils O. Selåsdal
2025-07-21 20:30:33 +02:00
parent 251246924d
commit b2d56f8094
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ucore/slot_allocator.h
+10 -10
View File
@@ -56,13 +56,13 @@ struct UCSlotAlloc {
*/ */
#define UC_SLOT_ALLOC_DEF(var_name, slot_size_, num_slots_) \ #define UC_SLOT_ALLOC_DEF(var_name, slot_size_, num_slots_) \
struct {\ struct {\
uc_bv_integer bitmap[UC_BV_LEN(num_slots_)]; \ uc_bv_integer bitmap[UC_BV_LEN((num_slots_))]; \
uint8_t memory[num_slots_ * slot_size_] __attribute__((aligned)); \ uint8_t memory[(num_slots_) * (slot_size_)] __attribute__((aligned)); \
} var_name ## _memory = { \ } var_name ## _memory = { \
}; \ }; \
UCSlotAlloc var_name = { \ UCSlotAlloc var_name = { \
.slot_size = slot_size_, \ .slot_size = (slot_size_), \
.num_slots = num_slots_, \ .num_slots = (num_slots_), \
.bitmap = UC_BV_STATIC_INIT(var_name ## _memory.bitmap), \ .bitmap = UC_BV_STATIC_INIT(var_name ## _memory.bitmap), \
.slots = var_name ## _memory.memory \ .slots = var_name ## _memory.memory \
}; };
@@ -72,12 +72,12 @@ UCSlotAlloc var_name = { \
* bits is also allocated for the bitmap with this definition * bits is also allocated for the bitmap with this definition
*/ */
#define UC_SLOT_ALLOC_DEF_EX(var_name, slot_size_, num_slots_, memory) \ #define UC_SLOT_ALLOC_DEF_EX(var_name, slot_size_, num_slots_, memory) \
uc_bv_integer var_name ## _bitmap[UC_BV_LEN(num_slots_)] = {}; \ uc_bv_integer var_name ## _bitmap[UC_BV_LEN((num_slots_))] = {}; \
UCSlotAlloc var_name = { \ UCSlotAlloc var_name = { \
.slot_size = slot_size_, \ .slot_size = (slot_size_), \
.num_slots = num_slots_, \ .num_slots = (num_slots_), \
.bitmap = UC_BV_STATIC_INIT(var_name ## _bitmap), \ .bitmap = UC_BV_STATIC_INIT(var_name ## _bitmap), \
.slots = memory \ .slots = (memory) \
}; };
/** Allocate a memory slot /** Allocate a memory slot
@@ -99,8 +99,8 @@ void uc_slot_free(UCSlotAlloc *restrict sa, void *restrict slot);
/** uc_slot_free() where the slot can be a NULL pointer */ /** uc_slot_free() where the slot can be a NULL pointer */
#define uc_slot_free_safe(sa, slot) \ #define uc_slot_free_safe(sa, slot) \
do { \ do { \
if (slot != NULL) { \ if ((slot) != NULL) { \
uc_slot_free(sa, slot); \ uc_slot_free((sa), (slot)); \
} \ } \
} while (0) } while (0)