Revert "sys_bitfield*(): use 'void *' instead of memaddr_t"
This reverts commit 1f2ee5c6bcc60c2c91025bcf4c9d62d17e00c86b.
Change-Id: I6d6662952450e54aea2ffbc43973a5ecc40767bb
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/ioapic_intr.c
index 0acb6de..e1b511f 100644
--- a/drivers/interrupt_controller/ioapic_intr.c
+++ b/drivers/interrupt_controller/ioapic_intr.c
@@ -161,17 +161,17 @@
{
/* Currently only the following three flags are modified */
if (flags & IOAPIC_LOW) {
- sys_bitfield_set_bit(ioapic_suspend_buf,
+ sys_bitfield_set_bit((mem_addr_t) ioapic_suspend_buf,
BIT_POS_FOR_IRQ_OPTION(irq, IOAPIC_BITFIELD_HI_LO));
}
if (flags & IOAPIC_LEVEL) {
- sys_bitfield_set_bit(ioapic_suspend_buf,
+ sys_bitfield_set_bit((mem_addr_t) ioapic_suspend_buf,
BIT_POS_FOR_IRQ_OPTION(irq, IOAPIC_BITFIELD_LVL_EDGE));
}
if (flags & IOAPIC_INT_MASK) {
- sys_bitfield_set_bit(ioapic_suspend_buf,
+ sys_bitfield_set_bit((mem_addr_t) ioapic_suspend_buf,
BIT_POS_FOR_IRQ_OPTION(irq, IOAPIC_BITFIELD_ENBL_DSBL));
}
}
@@ -180,17 +180,17 @@
{
uint32_t flags = 0;
- if (sys_bitfield_test_bit(ioapic_suspend_buf,
+ if (sys_bitfield_test_bit((mem_addr_t) ioapic_suspend_buf,
BIT_POS_FOR_IRQ_OPTION(irq, IOAPIC_BITFIELD_HI_LO))) {
flags |= IOAPIC_LOW;
}
- if (sys_bitfield_test_bit(ioapic_suspend_buf,
+ if (sys_bitfield_test_bit((mem_addr_t) ioapic_suspend_buf,
BIT_POS_FOR_IRQ_OPTION(irq, IOAPIC_BITFIELD_LVL_EDGE))) {
flags |= IOAPIC_LEVEL;
}
- if (sys_bitfield_test_bit(ioapic_suspend_buf,
+ if (sys_bitfield_test_bit((mem_addr_t) ioapic_suspend_buf,
BIT_POS_FOR_IRQ_OPTION(irq, IOAPIC_BITFIELD_ENBL_DSBL))) {
flags |= IOAPIC_INT_MASK;
}
diff --git a/include/arch/arc/v2/asm_inline_gcc.h b/include/arch/arc/v2/asm_inline_gcc.h
index 7e037ff..73e906b 100644
--- a/include/arch/arc/v2/asm_inline_gcc.h
+++ b/include/arch/arc/v2/asm_inline_gcc.h
@@ -266,37 +266,29 @@
}
static ALWAYS_INLINE
- void sys_bitfield_set_bit(void *addr, unsigned int bit)
+ void sys_bitfield_set_bit(mem_addr_t addr, unsigned int bit)
{
- mem_addr_t _addr = (unsigned long) addr;
-
/* Doing memory offsets in terms of 32-bit values to prevent
- * alignment issues. The 4 * is needed because void *
- * arithmethic is byte based and by dividing by 32, we have
- * the index of the four-byte block where the bit is.
+ * alignment issues
*/
- sys_set_bit(_addr + 4 * (bit / 32), bit & 0x1F);
+ sys_set_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- void sys_bitfield_clear_bit(void *addr, unsigned int bit)
+ void sys_bitfield_clear_bit(mem_addr_t addr, unsigned int bit)
{
- mem_addr_t _addr = (unsigned long) addr;
-
- sys_clear_bit(_addr + 4 * (bit / 32), bit & 0x1F);
+ sys_clear_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- int sys_bitfield_test_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_bit(mem_addr_t addr, unsigned int bit)
{
- mem_addr_t _addr = (unsigned long) addr;
-
- return sys_test_bit(_addr + 4 * (bit / 32), bit & 0x1F);
+ return sys_test_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- int sys_bitfield_test_and_set_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_and_set_bit(mem_addr_t addr, unsigned int bit)
{
int ret;
@@ -307,7 +299,7 @@
}
static ALWAYS_INLINE
- int sys_bitfield_test_and_clear_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
{
int ret;
diff --git a/include/arch/nios2/asm_inline_gcc.h b/include/arch/nios2/asm_inline_gcc.h
index 37e6f58..3d9b3ac 100644
--- a/include/arch/nios2/asm_inline_gcc.h
+++ b/include/arch/nios2/asm_inline_gcc.h
@@ -143,36 +143,29 @@
}
static ALWAYS_INLINE
- void sys_bitfield_set_bit(void *addr, unsigned int bit)
+ void sys_bitfield_set_bit(mem_addr_t addr, unsigned int bit)
{
/* Doing memory offsets in terms of 32-bit values to prevent
* alignment issues
*/
- mem_addr_t _addr = (unsigned long) addr;
-
- sys_set_bit(_addr + ((bit >> 5) << 2), bit & 0x1F);
+ sys_set_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- void sys_bitfield_clear_bit(void *addr, unsigned int bit)
+ void sys_bitfield_clear_bit(mem_addr_t addr, unsigned int bit)
{
- mem_addr_t _addr = (unsigned long) addr;
-
- sys_clear_bit(_addr + ((bit >> 5) << 2), bit & 0x1F);
+ sys_clear_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
-
static ALWAYS_INLINE
- int sys_bitfield_test_bit(const void *addr, unsigned int bit)
+ int sys_bitfield_test_bit(mem_addr_t addr, unsigned int bit)
{
- mem_addr_t _addr = (unsigned long) addr;
-
- return sys_test_bit(_addr + ((bit >> 5) << 2), bit & 0x1F);
+ return sys_test_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- int sys_bitfield_test_and_set_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_and_set_bit(mem_addr_t addr, unsigned int bit)
{
int ret;
@@ -183,7 +176,7 @@
}
static ALWAYS_INLINE
- int sys_bitfield_test_and_clear_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
{
int ret;
diff --git a/include/arch/riscv32/sys_io.h b/include/arch/riscv32/sys_io.h
index 97fbca3..fc43dd0 100644
--- a/include/arch/riscv32/sys_io.h
+++ b/include/arch/riscv32/sys_io.h
@@ -85,35 +85,29 @@
}
static ALWAYS_INLINE
- void sys_bitfield_set_bit(void *addr, unsigned int bit)
+ void sys_bitfield_set_bit(mem_addr_t addr, unsigned int bit)
{
/* Doing memory offsets in terms of 32-bit values to prevent
* alignment issues
*/
- mem_addr_t _addr = (unsigned long) addr;
-
- sys_set_bit(_addr + ((bit >> 5) << 2), bit & 0x1F);
+ sys_set_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- void sys_bitfield_clear_bit(void *addr, unsigned int bit)
+ void sys_bitfield_clear_bit(mem_addr_t addr, unsigned int bit)
{
- mem_addr_t _addr = (unsigned long) addr;
-
- sys_clear_bit(_addr + ((bit >> 5) << 2), bit & 0x1F);
+ sys_clear_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- int sys_bitfield_test_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_bit(mem_addr_t addr, unsigned int bit)
{
- mem_addr_t _addr = (unsigned long) addr;
-
- return sys_test_bit(_addr + ((bit >> 5) << 2), bit & 0x1F);
+ return sys_test_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
}
static ALWAYS_INLINE
- int sys_bitfield_test_and_set_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_and_set_bit(mem_addr_t addr, unsigned int bit)
{
int ret;
@@ -124,7 +118,7 @@
}
static ALWAYS_INLINE
- int sys_bitfield_test_and_clear_bit(void *addr, unsigned int bit)
+ int sys_bitfield_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
{
int ret;
diff --git a/include/arch/x86/asm_inline_gcc.h b/include/arch/x86/asm_inline_gcc.h
index e564642..bc88564 100644
--- a/include/arch/x86/asm_inline_gcc.h
+++ b/include/arch/x86/asm_inline_gcc.h
@@ -474,51 +474,11 @@
return ret;
}
-static ALWAYS_INLINE
-void sys_bitfield_set_bit(void *addr, unsigned int bit)
-{
- mem_addr_t _addr = (unsigned long) addr;
-
- /* Doing memory offsets in terms of 32-bit values to prevent
- * alignment issues. The 4 * is needed because void *
- * arithmethic is byte based and by dividing by 32, we have
- * the index of the four-byte block where the bit is.
- */
- sys_set_bit(_addr + 4 * (bit / 32), bit & 0x1F);
-}
-
-static ALWAYS_INLINE
-void sys_bitfield_clear_bit(void *addr, unsigned int bit)
-{
- sys_clear_bit((unsigned long) addr, bit);
-}
-
-static ALWAYS_INLINE
-int sys_bitfield_test_bit(void *addr, unsigned int bit)
-{
- return sys_test_bit((mem_addr_t) addr, bit);
-}
-
-
-static ALWAYS_INLINE
-int sys_bitfield_test_and_set_bit(void *addr, unsigned int bit)
-{
- int ret;
-
- ret = sys_bitfield_test_bit(addr, bit);
- sys_bitfield_set_bit(addr, bit);
- return ret;
-}
-
-static ALWAYS_INLINE
-int sys_bitfield_test_and_clear_bit(void *addr, unsigned int bit)
-{
- int ret;
-
- ret = sys_bitfield_test_bit(addr, bit);
- sys_bitfield_clear_bit(addr, bit);
- return ret;
-}
+#define sys_bitfield_set_bit sys_set_bit
+#define sys_bitfield_clear_bit sys_clear_bit
+#define sys_bitfield_test_bit sys_test_bit
+#define sys_bitfield_test_and_set_bit sys_test_and_set_bit
+#define sys_bitfield_test_and_clear_bit sys_test_and_clear_bit
#endif /* _ASMLANGUAGE */
diff --git a/include/sys_io.h b/include/sys_io.h
index 144fb77..96685d0 100644
--- a/include/sys_io.h
+++ b/include/sys_io.h
@@ -274,7 +274,7 @@
*/
/**
- * @fn static inline void sys_bitfield_set_bit(void * addr, unsigned int bit)
+ * @fn static inline void sys_bitfield_set_bit(mem_addr_t addr, unsigned int bit)
* @brief Set the designated bit from addr to 1
*
* This functions takes the designated bit starting from addr and sets it to 1.
@@ -284,7 +284,7 @@
*/
/**
- * @fn static inline void sys_bitfield_clear_bit(void * addr, unsigned int bit)
+ * @fn static inline void sys_bitfield_clear_bit(mem_addr_t addr, unsigned int bit)
* @brief Clear the designated bit from addr to 0
*
* This functions takes the designated bit starting from addr and sets it to 0.
@@ -294,7 +294,7 @@
*/
/**
- * @fn static inline int sys_bitfield_test_bit(void * addr, unsigned int bit)
+ * @fn static inline int sys_bitfield_test_bit(mem_addr_t addr, unsigned int bit)
* @brief Test the bit if it is set or not
*
* This functions takes the designated bit starting from addr and tests its
@@ -307,7 +307,7 @@
*/
/**
- * @fn static inline int sys_bitfield_test_and_set_bit(void * addr, unsigned int bit)
+ * @fn static inline int sys_bitfield_test_and_set_bit(mem_addr_t addr, unsigned int bit)
* @brief Test the bit and set it
*
* This functions takes the designated bit starting from addr, tests its
@@ -320,7 +320,7 @@
*/
/**
- * @fn static inline int sys_bitfield_test_and_clear_bit(void * addr, unsigned int bit)
+ * @fn static inline int sys_bitfield_test_and_clear_bit(mem_addr_t addr, unsigned int bit)
* @brief Test the bit and clear it
*
* This functions takes the designated bit starting from addr, test its
@@ -333,19 +333,6 @@
*/
-/**
- * Define a bitfield
- *
- * Bitfields are an array of unsigned long integers, with as many
- * of them as needed to fit bits bit, taking into account there are
- * #LONG_BIT bits on each unsigned long int.
- *
- * @param name Name of the bitfield variable
- * @param bits Number of bits in the bitfield
- */
-#define DEFINE_BITFIELD(name, bits) \
- unsigned long int (name)[((bits) + LONG_BIT - 1) / LONG_BIT]
-
#ifdef __cplusplus
}
#endif
diff --git a/tests/kernel/bitfield/src/bitfield.c b/tests/kernel/bitfield/src/bitfield.c
index d21389d..de9712e 100644
--- a/tests/kernel/bitfield/src/bitfield.c
+++ b/tests/kernel/bitfield/src/bitfield.c
@@ -9,14 +9,14 @@
#include <tc_util.h>
-#define BIT_INDEX(bit) (bit / LONG_BIT)
-#define BIT_VAL(bit) (1 << (bit % LONG_BIT))
+#define BIT_INDEX(bit) (bit >> 3)
+#define BIT_VAL(bit) (1 << (bit & 0x7))
#define BITFIELD_SIZE 512
void main(void)
{
uint32_t b1 = 0;
- DEFINE_BITFIELD(b2, BITFIELD_SIZE) = { 0 };
+ unsigned char b2[BITFIELD_SIZE >> 3] = {0};
int failed = 0;
int test_rv;
unsigned int bit;
@@ -105,9 +105,9 @@
}
for (bit = 0; bit < BITFIELD_SIZE; ++bit) {
- sys_bitfield_set_bit(b2, bit);
+ sys_bitfield_set_bit((mem_addr_t)b2, bit);
if (b2[BIT_INDEX(bit)] != BIT_VAL(bit)) {
- TC_PRINT("got %lx expected %x\n", b2[BIT_INDEX(bit)],
+ TC_PRINT("got %d expected %d\n", b2[BIT_INDEX(bit)],
BIT_VAL(bit));
TC_PRINT("sys_bitfield_set_bit failed for bit %d\n",
bit);
@@ -115,13 +115,13 @@
failed++;
}
- if (!sys_bitfield_test_bit(b2, bit)) {
+ if (!sys_bitfield_test_bit((mem_addr_t)b2, bit)) {
TC_PRINT("sys_bitfield_test_bit did not detect bit %d\n",
bit);
failed++;
}
- sys_bitfield_clear_bit(b2, bit);
+ sys_bitfield_clear_bit((mem_addr_t)b2, bit);
if (b2[BIT_INDEX(bit)] != 0) {
b2[BIT_INDEX(bit)] = 0;
TC_PRINT("sys_bitfield_clear_bit failed for bit %d\n",
@@ -129,13 +129,13 @@
failed++;
}
- if (sys_bitfield_test_bit(b2, bit)) {
+ if (sys_bitfield_test_bit((mem_addr_t)b2, bit)) {
TC_PRINT("sys_bitfield_test_bit erroneously detected bit %d\n",
bit);
failed++;
}
- ret = sys_bitfield_test_and_set_bit(b2, bit);
+ ret = sys_bitfield_test_and_set_bit((mem_addr_t)b2, bit);
if (ret) {
TC_PRINT("sys_bitfield_test_and_set_bit erroneously detected bit %d\n",
bit);
@@ -147,7 +147,7 @@
bit);
failed++;
}
- ret = sys_bitfield_test_and_set_bit(b2, bit);
+ ret = sys_bitfield_test_and_set_bit((mem_addr_t)b2, bit);
if (!ret) {
TC_PRINT("sys_bitfield_test_and_set_bit did not detect bit %d\n",
bit);
@@ -160,7 +160,7 @@
failed++;
}
- ret = sys_bitfield_test_and_clear_bit(b2, bit);
+ ret = sys_bitfield_test_and_clear_bit((mem_addr_t)b2, bit);
if (!ret) {
TC_PRINT("sys_bitfield_test_and_clear_bit did not detect bit %d\n",
bit);
@@ -172,7 +172,7 @@
bit);
failed++;
}
- ret = sys_bitfield_test_and_clear_bit(b2, bit);
+ ret = sys_bitfield_test_and_clear_bit((mem_addr_t)b2, bit);
if (ret) {
TC_PRINT("sys_bitfield_test_and_clear_bit erroneously detected bit %d\n",
bit);
diff --git a/tests/kernel/common/src/bitfield.c b/tests/kernel/common/src/bitfield.c
index dcee881..d2cdf6f 100644
--- a/tests/kernel/common/src/bitfield.c
+++ b/tests/kernel/common/src/bitfield.c
@@ -24,24 +24,20 @@
assert_true(b1 == (1 << bit), "sys_set_bit failed on bit");
- assert_true((sys_test_bit((mem_addr_t)&b1, bit) == 0),
- "sys_test_bit did not detect bit");
+ assert_true((sys_test_bit((mem_addr_t)&b1, bit) == 0), "sys_test_bit did not detect bit");
sys_clear_bit((mem_addr_t)&b1, bit);
assert_true((b1 == 0), "sys_clear_bit failed for bit");
- assert_true((sys_test_bit((mem_addr_t)&b1, bit) == 0),
- "sys_test_bit erroneously detected bit");
+ assert_true((sys_test_bit((mem_addr_t)&b1, bit) == 0), "sys_test_bit erroneously detected bit");
- assert_true((sys_test_and_set_bit((mem_addr_t)&b1, bit) == 0),
- "sys_test_and_set_bit erroneously detected bit");
+ assert_true((sys_test_and_set_bit((mem_addr_t)&b1, bit) == 0), "sys_test_and_set_bit erroneously detected bit");
assert_true((b1 == (1 << bit)), "sys_test_and_set_bit");
printk("%d\n", sys_test_and_set_bit((mem_addr_t)&b1, bit));
- assert_true((sys_test_and_set_bit((mem_addr_t)&b1, bit) == 0),
- "sys_test_and_set_bit");
+ assert_true((sys_test_and_set_bit((mem_addr_t)&b1, bit) == 0), "sys_test_and_set_bit");
}
#if 0
@@ -94,7 +90,7 @@
}
for (bit = 0; bit < BITFIELD_SIZE; ++bit) {
- sys_bitfield_set_bit(b2, bit);
+ sys_bitfield_set_bit((mem_addr_t)b2, bit);
if (b2[BIT_INDEX(bit)] != BIT_VAL(bit)) {
TC_PRINT("got %d expected %d\n", b2[BIT_INDEX(bit)],
BIT_VAL(bit));
@@ -104,13 +100,13 @@
failed++;
}
- if (!sys_bitfield_test_bit(b2, bit)) {
+ if (!sys_bitfield_test_bit((mem_addr_t)b2, bit)) {
TC_PRINT("sys_bitfield_test_bit did not detect bit %d\n",
bit);
failed++;
}
- sys_bitfield_clear_bit(b2, bit);
+ sys_bitfield_clear_bit((mem_addr_t)b2, bit);
if (b2[BIT_INDEX(bit)] != 0) {
b2[BIT_INDEX(bit)] = 0;
TC_PRINT("sys_bitfield_clear_bit failed for bit %d\n",
@@ -118,13 +114,13 @@
failed++;
}
- if (sys_bitfield_test_bit(b2, bit)) {
+ if (sys_bitfield_test_bit((mem_addr_t)b2, bit)) {
TC_PRINT("sys_bitfield_test_bit erroneously detected bit %d\n",
bit);
failed++;
}
- ret = sys_bitfield_test_and_set_bit(b2, bit);
+ ret = sys_bitfield_test_and_set_bit((mem_addr_t)b2, bit);
if (ret) {
TC_PRINT("sys_bitfield_test_and_set_bit erroneously detected bit %d\n",
bit);
@@ -136,7 +132,7 @@
bit);
failed++;
}
- ret = sys_bitfield_test_and_set_bit(b2, bit);
+ ret = sys_bitfield_test_and_set_bit((mem_addr_t)b2, bit);
if (!ret) {
TC_PRINT("sys_bitfield_test_and_set_bit did not detect bit %d\n",
bit);
@@ -149,7 +145,7 @@
failed++;
}
- ret = sys_bitfield_test_and_clear_bit(b2, bit);
+ ret = sys_bitfield_test_and_clear_bit((mem_addr_t)b2, bit);
if (!ret) {
TC_PRINT("sys_bitfield_test_and_clear_bit did not detect bit %d\n",
bit);
@@ -161,7 +157,7 @@
bit);
failed++;
}
- ret = sys_bitfield_test_and_clear_bit(b2, bit);
+ ret = sys_bitfield_test_and_clear_bit((mem_addr_t)b2, bit);
if (ret) {
TC_PRINT("sys_bitfield_test_and_clear_bit erroneously detected bit %d\n",
bit);
diff --git a/tests/ztest/src/ztest_mock.c b/tests/ztest/src/ztest_mock.c
index d17d206..26a9731 100644
--- a/tests/ztest/src/ztest_mock.c
+++ b/tests/ztest/src/ztest_mock.c
@@ -45,11 +45,19 @@
#else
+/*
+ * FIXME: move to sys_io.h once the argument signature for bitmap has
+ * been fixed to void* or similar ZEP-1347
+ */
+#define BITS_PER_UL (8 * sizeof(unsigned long int))
+#define DEFINE_BITFIELD(name, bits) \
+ unsigned long int (name)[((bits) + BITS_PER_UL - 1) / BITS_PER_UL]
+
static inline
int sys_bitfield_find_first_clear(const unsigned long *bitmap,
unsigned int bits)
{
- unsigned int words = (bits + LONG_BIT - 1) / LONG_BIT;
+ unsigned int words = (bits + BITS_PER_UL - 1) / BITS_PER_UL;
unsigned int cnt;
unsigned int long neg_bitmap;
@@ -62,9 +70,9 @@
if (neg_bitmap == 0) /* all full */
continue;
else if (neg_bitmap == ~0UL) /* first bit */
- return cnt * LONG_BIT;
+ return cnt * BITS_PER_UL;
else
- return cnt * LONG_BIT + __builtin_ffsl(neg_bitmap);
+ return cnt * BITS_PER_UL + __builtin_ffsl(neg_bitmap);
}
return -1;
}
@@ -82,7 +90,8 @@
__ASSERT(allocation_index < CONFIG_ZTEST_PARAMETER_COUNT,
"param %p given to free is not in the static buffer %p:%u",
param, params, CONFIG_ZTEST_PARAMETER_COUNT);
- sys_bitfield_clear_bit(params_allocation, allocation_index);
+ sys_bitfield_clear_bit((mem_addr_t) params_allocation,
+ allocation_index);
}
static
@@ -97,7 +106,7 @@
printk("No more mock parameters available for allocation\n");
ztest_test_fail();
}
- sys_bitfield_set_bit(params_allocation, allocation_index);
+ sys_bitfield_set_bit((mem_addr_t) params_allocation, allocation_index);
param = params + allocation_index;
memset(param, 0, sizeof(*param));
return param;
