mykola/cutil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test struct & value functionality, implement struct_size

Browse source
This commit is contained in:
mykola2312 2022-05-03 08:18:27 +03:00
parent 1619e3234e
commit 3c0de35e2c
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
struct.c
View file

@ -57,8 +57,21 @@ uint value_array_size(struct cu_struct_s* st, uint idx, const void* in)
{ {
union intvalue_u count = {0}; union intvalue_u count = {0};
struct cu_value_s* value = &st->members[idx]; struct cu_value_s* value = &st->members[idx];
if (value->array.index) if (value->array.index)
value_get(st, value->array.count, in, &count); {
if (value->array.count != idx)
value_get(st, value->array.count, in, &count);
}
else count.int32 = value->array.count; else count.int32 = value->array.count;
return value->array.item * count.int32; return value->array.item * count.int32;
} }
uint struct_size(struct cu_struct_s* st, const void* in)
{
uint idx = 0;
struct cu_value_s* value = st->members;
while ((value++)->type != NoValue) idx++;
return value_offset(st, idx, in);
}

2
struct.h
View file

@ -62,4 +62,6 @@ uint value_offset(struct cu_struct_s* st, uint idx, const void* in);
void value_get(struct cu_struct_s* st, uint idx, const void* in, void* out); void value_get(struct cu_struct_s* st, uint idx, const void* in, void* out);
uint value_array_size(struct cu_struct_s* st, uint idx, const void* in); uint value_array_size(struct cu_struct_s* st, uint idx, const void* in);
uint struct_size(struct cu_struct_s* st, const void* in);
#endif #endif

15
test.c
View file

@ -15,18 +15,20 @@ struct test_s {
uint32_t array1[12]; uint32_t array1[12];
uint16_t count; uint16_t count;
item_t array2[5]; item_t array2[5];
uint64_t value;
} __attribute__((packed)) test = { } __attribute__((packed)) test = {
.seq = {0}, .seq = {0},
.array1 = {0}, .array1 = {0},
.count = 5, .count = 5,
.array2 = {1, 2, 3, 4, 5} .value = 123456789
}; };
CU_STRUCT_BEGIN(test_s, LittleEndian) CU_STRUCT_BEGIN(test_s, LittleEndian)
CU_VALUE_SEQUENCE(6) CU_VALUE_SEQUENCE(6)
CU_VALUE_ARRAY(4, 12) CU_VALUE_ARRAY(4, 12)
CU_VALUE_INT16() CU_VALUE_INT16()
CU_VALUE_ARRAY_INDEX(14, 3) CU_VALUE_ARRAY_INDEX(14, 2)
CU_VALUE_INT64()
CU_STRUCT_END() CU_STRUCT_END()
int main() int main()
@ -106,8 +108,13 @@ int main()
printf("%lx\t%lx\n", 0x12345678abcd8765, h64ton64(0x12345678abcd8765)); printf("%lx\t%lx\n", 0x12345678abcd8765, h64ton64(0x12345678abcd8765));
printf("[struct]\n"); printf("[struct]\n");
printf("value_offset\t%u\n", value_offset(CU_STRUCT(test_s), 1, &test)); printf("value_offset\t%u\n", value_offset(CU_STRUCT(test_s), 4, &test));
printf("value_size\t%u\n", value_size(CU_STRUCT(test_s), 1, &test)); printf("value_size\t%u\n", value_size(CU_STRUCT(test_s), 4, &test));
uint64_t value;
value_get(CU_STRUCT(test_s), 4, &test, &value);
printf("value\t%u\n", value);
printf("struct_size\t%u\t%u\n", sizeof(struct test_s),
struct_size(CU_STRUCT(test_s), &test));
cutil_exit(); cutil_exit();
return 0; return 0;