projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SEC: add HMAC implementation.
[bertos.git]
/
bertos
/
struct
/
bitarray.h
diff --git
a/bertos/struct/bitarray.h
b/bertos/struct/bitarray.h
index 326617a34f0a1f7a8a6bfc1aff4716b42bb0a233..636049382e54af64924a1c0e3249560ea7093d58 100644
(file)
--- a/
bertos/struct/bitarray.h
+++ b/
bertos/struct/bitarray.h
@@
-45,73
+45,79
@@
#include <cpu/types.h>
#include <cpu/types.h>
+typedef struct BitArray
+{
+ size_t size; /// Size in bytes of the bitarray
+ size_t bitarray_len; /// Number of bits used
+ uint8_t *array; /// Pointer to memory occupied by the bitarray
+} BitArray;
-#define
ALLOC_BITARRAY
(name, size) uint8_t name[DIV_ROUNDUP((size), 8)]
-#define BIT
_
ARRAY_SIZE(name) (sizeof((name)) * 8)
+#define
BITARRAY_ALLOC
(name, size) uint8_t name[DIV_ROUNDUP((size), 8)]
+#define BITARRAY_SIZE(name) (sizeof((name)) * 8)
-INLINE void bitarray_set(
int idx, uint8_t *bit_array, size_t len
)
+INLINE void bitarray_set(
BitArray *bitx, int idx
)
{
{
- ASSERT((size_t)idx <= len);
+ ASSERT((size_t)idx <= bitx->bitarray_len);
+
int page = idx / 8;
uint8_t bit = idx % 8;
int page = idx / 8;
uint8_t bit = idx % 8;
- bit
_
array[page] |= BV(bit);
+ bit
x->
array[page] |= BV(bit);
}
}
-INLINE void bitarray_clear(
int idx, uint8_t *bit_array, size_t len
)
+INLINE void bitarray_clear(
BitArray *bitx, int idx
)
{
{
- ASSERT((size_t)idx <= len);
+ ASSERT((size_t)idx <= bitx->bitarray_len);
+
int page = idx / 8;
uint8_t bit = idx % 8;
int page = idx / 8;
uint8_t bit = idx % 8;
- bit
_
array[page] &= ~BV(bit);
+ bit
x->
array[page] &= ~BV(bit);
}
}
-INLINE void bitarray_set
Offset(int idx, int offset, uint8_t *bit_array, size_t len
)
+INLINE void bitarray_set
Range(BitArray *bitx, int idx, int offset
)
{
{
- ASSERT((size_t)idx <= len);
+ ASSERT((size_t)idx <=
bitx->bitarray_
len);
for (int i = idx; i < offset + idx; i++)
for (int i = idx; i < offset + idx; i++)
- bitarray_set(
i, bit_array, len
);
+ bitarray_set(
bitx, i
);
}
}
-INLINE void bitarray_clear
Offset(int idx, int offset, uint8_t *bit_array, size_t len
)
+INLINE void bitarray_clear
Range(BitArray *bitx, int idx, int offset
)
{
{
- ASSERT((size_t)idx <= len);
+ ASSERT((size_t)idx <=
bitx->bitarray_
len);
for (int i = idx; i < offset + idx; i++)
for (int i = idx; i < offset + idx; i++)
- bitarray_clear(
i, bit_array, len
);
+ bitarray_clear(
bitx, i
);
}
}
-INLINE bool bitarray_
check(int idx, uint8_t *bit_array, size_t len
)
+INLINE bool bitarray_
test(BitArray *bitx, int idx
)
{
{
- ASSERT((size_t)idx <= len);
+ ASSERT((size_t)idx <=
bitx->bitarray_
len);
int page = idx / 8;
uint8_t bit = idx % 8;
int page = idx / 8;
uint8_t bit = idx % 8;
- return (bit
_
array[page] & BV(bit));
+ return (bit
x->
array[page] & BV(bit));
}
}
-INLINE bool bitarray_full(uint8_t *bit_array, size_t len)
+/**
+ * Check if the bitarray is full
+ *
+ * Only \a bitarray_len bits are tested.
+ */
+INLINE bool bitarray_isFull(BitArray *bitx)
{
{
- int count = len;
- for (size_t page = 0; page <=
len / 8
; page++)
+ // test full bytes except the last one
+ for (size_t page = 0; page <=
bitx->size - 2
; page++)
{
{
- if (count < 8)
- {
- for (size_t i = page * 8; i <= len; i++)
- if (!bitarray_check(i, bit_array, len))
- return 0;
- count--;
- }
- else
- {
- if (!(bit_array[page] == 0xff))
- return 0;
- }
- count -= 8;
+ if (!(bitx->array[page] == 0xff))
+ return 0;
}
}
+ // test the last byte using the correct bitmask
+ uint8_t mask = BV(bitx->bitarray_len >> 3) - 1;
+ if (!(bitx->array[bitx->size - 1] & mask))
+ return 0;
return 1;
}
return 1;
}
@@
-119,47
+125,46
@@
INLINE bool bitarray_full(uint8_t *bit_array, size_t len)
/*
* Ugly!.. reformat it.
*/
/*
* Ugly!.. reformat it.
*/
-INLINE bool bitarray_
blockFull(int idx, int offset, uint8_t *bit_array, size_t len
)
+INLINE bool bitarray_
isRangeFull(BitArray *bitx, int idx, int offset
)
{
{
- ASSERT((size_t)(idx + offset) <= len);
+ ASSERT((size_t)(idx + offset) <=
bitx->bitarray_
len);
for (int i = idx; i <= idx + offset; i++)
for (int i = idx; i <= idx + offset; i++)
- if (!bitarray_
check(i, bit_array, len
))
+ if (!bitarray_
test(bitx, i
))
return 0;
return 1;
}
return 0;
return 1;
}
-
/*
* Ugly!.. reformat it.
*/
/*
* Ugly!.. reformat it.
*/
-INLINE bool bitarray_
blockEmpty(int idx, int offset, uint8_t *bit_array, size_t len
)
+INLINE bool bitarray_
isRangeEmpty(BitArray *bitx, int idx, int offset
)
{
{
- ASSERT((size_t)(idx + offset) <= len);
+ ASSERT((size_t)(idx + offset) <=
bitx->bitarray_
len);
for (int i = idx; i <= idx + offset; i++)
for (int i = idx; i <= idx + offset; i++)
- if (bitarray_
check(i, bit_array, len
))
+ if (bitarray_
test(bitx, i
))
return 0;
return 1;
}
return 0;
return 1;
}
-INLINE void bitarray_dump(
uint8_t *bit_array, size_t len
)
+INLINE void bitarray_dump(
BitArray *bitx
)
{
{
- kprintf("bitarray size[%zu]bits
\n", len
);
+ kprintf("bitarray size[%zu]bits
on [%zu]bytes\n", bitx->bitarray_len, bitx->size
);
int i = 0;
int j = 0;
int i = 0;
int j = 0;
- int count = len;
+ int count =
bitx->bitarray_
len;
while (count--)
{
while (count--)
{
- kprintf("%d", bitarray_
check(i++, bit_array, len
));
+ kprintf("%d", bitarray_
test(bitx, i++
));
if (j == 7)
{
if (j == 7)
{
- kprintf("..%02x [%d]\n", bit
_
array[(i / 8) - 1], i);
+ kprintf("..%02x [%d]\n", bit
x->
array[(i / 8) - 1], i);
j = 0;
continue;
}
j = 0;
continue;
}
@@
-167,9
+172,17
@@
INLINE void bitarray_dump(uint8_t *bit_array, size_t len)
}
if (j != 0)
}
if (j != 0)
- kprintf("..%02x [%d]\n", bit
_
array[i / 8], i);
+ kprintf("..%02x [%d]\n", bit
x->
array[i / 8], i);
}
}
+INLINE void bitarray_init(BitArray *bitx, size_t bitarray_len, uint8_t *array, size_t size)
+{
+ bitx->size = size;
+ bitx->array = array;
+ bitx->bitarray_len = bitarray_len;
+}
+
+
int bitarray_testSetup(void);
int bitarray_testRun(void);
int bitarray_testTearDown(void);
int bitarray_testSetup(void);
int bitarray_testRun(void);
int bitarray_testTearDown(void);