doylet
/
Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dqn: Update fixed array/string implementation

This commit is contained in:
doyle 2022-11-25 00:35:53 +11:00
parent 5c1ed1db8c
commit 1048b79045
4 changed files with 519 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1012
dqn.h
View File

File diff suppressed because it is too large Load Diff

10
dqn_cpp_file.h
View File

@ -4,10 +4,16 @@
#include <stdio.h>
#include <stdarg.h>
// -----------------------------------------------------------------------------
// NOTE: Dqn_CppFile: Helper functions to generate formatted CPP files
// -----------------------------------------------------------------------------
#define DQN_CPPF_ASSERT(expr) do { if (!(expr)) { *((int volatile *)0) = 0; } } while (0)
#define DQN_CPPF_ASSERT(expr) \
do \
{ \
if (!(expr)) \
{ \
*((int volatile *)0) = 0; \
} \
} while (0)
struct Dqn_CppFile
{

67
dqn_keccak.h
View File

@ -185,11 +185,6 @@ Dqn_KeccakBytes32 Dqn_SHA3_256StringToBytes32(Dqn_String8 string);
Dqn_KeccakBytes48 Dqn_SHA3_384StringToBytes48(Dqn_String8 string);
Dqn_KeccakBytes64 Dqn_SHA3_512StringToBytes64(Dqn_String8 string);
Dqn_KeccakBytes28 Dqn_SHA3_224_U8ArrayToBytes28(Dqn_Array<Dqn_KeccakU8> array);
Dqn_KeccakBytes32 Dqn_SHA3_256_U8ArrayToBytes32(Dqn_Array<Dqn_KeccakU8> array);
Dqn_KeccakBytes48 Dqn_SHA3_384_U8ArrayToBytes48(Dqn_Array<Dqn_KeccakU8> array);
Dqn_KeccakBytes64 Dqn_SHA3_512_U8ArrayToBytes64(Dqn_Array<Dqn_KeccakU8> array);
// -----------------------------------------------------------------------------
// NOTE: Keccak - Helpers for Dqn data structures
// -----------------------------------------------------------------------------
@ -197,11 +192,6 @@ Dqn_KeccakBytes28 Dqn_Keccak224StringToBytes28(Dqn_String8 string);
Dqn_KeccakBytes32 Dqn_Keccak256StringToBytes32(Dqn_String8 string);
Dqn_KeccakBytes48 Dqn_Keccak384StringToBytes48(Dqn_String8 string);
Dqn_KeccakBytes64 Dqn_Keccak512StringToBytes64(Dqn_String8 string);
Dqn_KeccakBytes28 Dqn_Keccak224_U8ArrayToBytes28(Dqn_Array<Dqn_KeccakU8> array);
Dqn_KeccakBytes32 Dqn_Keccak256_U8ArrayToBytes32(Dqn_Array<Dqn_KeccakU8> array);
Dqn_KeccakBytes48 Dqn_Keccak384_U8ArrayToBytes48(Dqn_Array<Dqn_KeccakU8> array);
Dqn_KeccakBytes64 Dqn_Keccak512_U8ArrayToBytes64(Dqn_Array<Dqn_KeccakU8> array);
#endif // DQN_H
// -----------------------------------------------------------------------------
@ -519,13 +509,6 @@ Dqn_KeccakBytes28 Dqn_SHA3_224StringToBytes28(Dqn_String8 string)
return result;
}
Dqn_KeccakBytes28 Dqn_SHA3_224_U8ArrayToBytes28(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes28 result;
Dqn_SHA3_224(array.data, array.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes32 Dqn_SHA3_256StringToBytes32(Dqn_String8 string)
{
Dqn_KeccakBytes32 result;
@ -533,13 +516,6 @@ Dqn_KeccakBytes32 Dqn_SHA3_256StringToBytes32(Dqn_String8 string)
return result;
}
Dqn_KeccakBytes32 Dqn_SHA3_256_U8ArrayToBytes32(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes32 result;
Dqn_SHA3_256(array.data, array.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes48 Dqn_SHA3_384StringToBytes48(Dqn_String8 string)
{
Dqn_KeccakBytes48 result;
@ -547,26 +523,12 @@ Dqn_KeccakBytes48 Dqn_SHA3_384StringToBytes48(Dqn_String8 string)
return result;
}
Dqn_KeccakBytes48 Dqn_SHA3_384_U8ArrayToBytes48(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes48 result;
Dqn_SHA3_384(array.data, array.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes64 Dqn_SHA3_512StringToBytes64(Dqn_String8 string)
{
Dqn_KeccakBytes64 result;
Dqn_SHA3_512(string.data, string.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes64 Dqn_SHA3_512_U8ArrayToBytes64(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes64 result;
Dqn_SHA3_512(array.data, array.size, result.data, sizeof(result));
return result;
}
#endif // DQN_H
#if defined(DQN_H)
@ -580,13 +542,6 @@ Dqn_KeccakBytes28 Dqn_Keccak224StringToBytes28(Dqn_String8 string)
return result;
}
Dqn_KeccakBytes28 Dqn_Keccak224_U8ArrayToBytes28(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes28 result;
Dqn_Keccak224(array.data, array.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes32 Dqn_Keccak256StringToBytes32(Dqn_String8 string)
{
Dqn_KeccakBytes32 result;
@ -594,14 +549,6 @@ Dqn_KeccakBytes32 Dqn_Keccak256StringToBytes32(Dqn_String8 string)
return result;
}
Dqn_KeccakBytes32 Dqn_Keccak256_U8ArrayToBytes32(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes32 result;
Dqn_Keccak256(array.data, array.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes48 Dqn_Keccak384StringToBytes48(Dqn_String8 string)
{
Dqn_KeccakBytes48 result;
@ -609,26 +556,12 @@ Dqn_KeccakBytes48 Dqn_Keccak384StringToBytes48(Dqn_String8 string)
return result;
}
Dqn_KeccakBytes48 Dqn_Keccak384_U8ArrayToBytes48(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes48 result;
Dqn_Keccak384(array.data, array.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes64 Dqn_Keccak512StringToBytes64(Dqn_String8 string)
{
Dqn_KeccakBytes64 result;
Dqn_Keccak512(string.data, string.size, result.data, sizeof(result));
return result;
}
Dqn_KeccakBytes64 Dqn_Keccak512_U8ArrayToBytes64(Dqn_Array<Dqn_KeccakU8> array)
{
Dqn_KeccakBytes64 result;
Dqn_Keccak512(array.data, array.size, result.data, sizeof(result));
return result;
}
#endif // DQN_H
// -----------------------------------------------------------------------------

200
dqn_unit_tests.cpp
View File

@ -8,15 +8,14 @@
#if defined(DQN_TEST_WITH_MAIN)
#define DQN_IMPLEMENTATION
#define DQN_WITH_CRT_ALLOCATOR // Dqn_CRTAllocator
#define DQN_WITH_DSMAP // Dqn_DSMap
#define DQN_WITH_FIXED_ARRAY // Dqn_FixedArray
#define DQN_WITH_FIXED_STRING // Dqn_FixedString
#define DQN_WITH_FIXED_ARRAY // Dqn_FArray
#define DQN_WITH_FIXED_STRING // Dqn_FString8
#define DQN_WITH_HEX // Dqn_Hex and friends ...
#define DQN_WITH_JSON_BUILDER // Dqn_JSONBuilder
#define DQN_WITH_MAP // Dqn_Map
#define DQN_WITH_MATH // Dqn_V2/3/4/Mat4 and friends ...
#define DQN_WITH_THREAD_CONTEXT // Dqn_ThreadContext and friends ...
#define DQN_WITH_WIN_NET //
#include "dqn.h"
#define DQN_KECCAK_IMPLEMENTATION
@ -28,134 +27,6 @@
#define DQN_TESTER_IMPLEMENTATION
#include "dqn_tester.h"
Dqn_Tester Dqn_Test_Array()
{
Dqn_Tester test = {};
DQN_TESTER_BEGIN_GROUP("Dqn_Array");
// NOTE: Dqn_Array_InitWithMemory
{
{
Dqn_Tester_Begin(&test, "Fixed Memory: Test add single item and can't allocate more");
int memory[4] = {};
Dqn_Array<int> array = Dqn_Array_InitWithMemory(memory, Dqn_CArray_Count(memory), 0 /*size*/);
Dqn_Array_Add(&array, 1);
Dqn_Array_Add(&array, 2);
Dqn_Array_Add(&array, 3);
Dqn_Array_Add(&array, 4);
DQN_TESTER_ASSERTF(&test, array.data[0] == 1, "array.data %d", array.data[0]);
DQN_TESTER_ASSERTF(&test, array.data[1] == 2, "array.data %d", array.data[1]);
DQN_TESTER_ASSERTF(&test, array.data[2] == 3, "array.data %d", array.data[2]);
DQN_TESTER_ASSERTF(&test, array.data[3] == 4, "array.data %d", array.data[3]);
DQN_TESTER_ASSERTF(&test, array.size == 4, "array.size: %zu", array.size);
int *added_item = Dqn_Array_Add(&array, 5);
DQN_TESTER_ASSERTF(&test, added_item == nullptr, "Failed to add item to array");
DQN_TESTER_ASSERTF(&test, array.size == 4, "array.size: %zu", array.size);
DQN_TESTER_ASSERTF(&test, array.max == 4, "array.max: %zu", array.max);
Dqn_Tester_End(&test);
}
{
Dqn_Tester_Begin(&test, "Fixed Memory: Test add array of items");
int memory[4] = {};
int DATA[] = {1, 2, 3};
Dqn_Array<int> array = Dqn_Array_InitWithMemory(memory, Dqn_CArray_Count(memory), 0 /*size*/);
Dqn_Array_AddArray(&array, DATA, Dqn_CArray_Count(DATA));
DQN_TESTER_ASSERTF(&test, array.data[0] == 1, "array.data %d", array.data[0]);
DQN_TESTER_ASSERTF(&test, array.data[1] == 2, "array.data %d", array.data[1]);
DQN_TESTER_ASSERTF(&test, array.data[2] == 3, "array.data %d", array.data[2]);
DQN_TESTER_ASSERTF(&test, array.size == 3, "array.size: %zu", array.size);
DQN_TESTER_ASSERTF(&test, array.max == 4, "array.max: %zu", array.max);
Dqn_Tester_End(&test);
}
{
Dqn_Tester_Begin(&test, "Fixed Memory: Test clear and clear with memory zeroed");
int memory[4] = {};
int DATA[] = {1, 2, 3};
Dqn_Array<int> array = Dqn_Array_InitWithMemory(memory, Dqn_CArray_Count(memory), 0 /*size*/);
Dqn_Array_AddArray(&array, DATA, Dqn_CArray_Count(DATA));
Dqn_Array_Clear(&array, Dqn_ZeroMem_No);
DQN_TESTER_ASSERTF(&test, array.size == 0, "array.size: %zu", array.size);
DQN_TESTER_ASSERTF(&test, array.max == 4, "array.max: %zu", array.max);
DQN_TESTER_ASSERTF(&test, array.data[0] == 1, "array.data %d. Clear but don't zero memory so old values should still remain", array.data[0]);
Dqn_Array_Clear(&array, Dqn_ZeroMem_Yes);
DQN_TESTER_ASSERTF(&test, array.data[0] == 0, "array.data %d. Clear but zero memory old values should not remain", array.data[0]);
Dqn_Tester_End(&test);
}
{
Dqn_Tester_Begin(&test, "Fixed Memory: Test erase stable and erase unstable");
int memory[4] = {};
int DATA[] = {1, 2, 3, 4};
Dqn_Array<int> array = Dqn_Array_InitWithMemory(memory, Dqn_CArray_Count(memory), 0 /*size*/);
Dqn_Array_AddArray(&array, DATA, Dqn_CArray_Count(DATA));
Dqn_Array_EraseUnstable(&array, 1);
DQN_TESTER_ASSERTF(&test, array.data[0] == 1, "array.data %d", array.data[0]);
DQN_TESTER_ASSERTF(&test, array.data[1] == 4, "array.data %d", array.data[1]);
DQN_TESTER_ASSERTF(&test, array.data[2] == 3, "array.data %d", array.data[2]);
DQN_TESTER_ASSERTF(&test, array.size == 3, "array.size: %zu", array.size);
Dqn_Array_EraseStable(&array, 0);
DQN_TESTER_ASSERTF(&test, array.data[0] == 4, "array.data: %d", array.data[0]);
DQN_TESTER_ASSERTF(&test, array.data[1] == 3, "array.data: %d", array.data[1]);
DQN_TESTER_ASSERTF(&test, array.size == 2, "array.size: %zu", array.size);
Dqn_Tester_End(&test);
}
{
Dqn_Tester_Begin(&test, "Fixed Memory: Test array pop and peek");
int memory[4] = {};
int DATA[] = {1, 2, 3};
Dqn_Array<int> array = Dqn_Array_InitWithMemory(memory, Dqn_CArray_Count(memory), 0 /*size*/);
Dqn_Array_AddArray(&array, DATA, Dqn_CArray_Count(DATA));
Dqn_Array_Pop(&array, 2);
DQN_TESTER_ASSERTF(&test, array.data[0] == 1, "array.data: %d", array.data[0]);
DQN_TESTER_ASSERTF(&test, array.size == 1, "array.size: %zu", array.size);
DQN_TESTER_ASSERTF(&test, array.max == 4, "array.max: %zu", array.max);
int *peek_item = Dqn_Array_Peek(&array);
DQN_TESTER_ASSERTF(&test, *peek_item == 1, "peek: %d", *peek_item);
DQN_TESTER_ASSERTF(&test, array.size == 1, "array.size: %zu", array.size);
DQN_TESTER_ASSERTF(&test, array.max == 4, "array.max: %zu", array.max);
Dqn_Tester_End(&test);
}
}
// NOTE: Dynamic Memory: Dqn_Array
{
Dqn_Tester_Begin(&test, "Dynamic Memory: Reserve and check over commit reallocates");
Dqn_Arena arena = {};
Dqn_Array<int> array = {};
array.arena = &arena;
Dqn_Array_Reserve(&array, 4);
DQN_TESTER_ASSERTF(&test, array.size == 0, "array.size: %zu", array.size);
DQN_TESTER_ASSERTF(&test, array.max == 4, "array.max: %zu", array.max);
int DATA[] = {1, 2, 3, 4};
Dqn_Array_AddArray(&array, DATA, Dqn_CArray_Count(DATA));
DQN_TESTER_ASSERTF(&test, array.data[0] == 1, "array.data: %d", array.data[0]);
DQN_TESTER_ASSERTF(&test, array.data[1] == 2, "array.data: %d", array.data[1]);
DQN_TESTER_ASSERTF(&test, array.data[2] == 3, "array.data: %d", array.data[2]);
DQN_TESTER_ASSERTF(&test, array.data[3] == 4, "array.data: %d", array.data[3]);
DQN_TESTER_ASSERTF(&test, array.size == 4, "array.size: %zu", array.size);
int *added_item = Dqn_Array_Add(&array, 5);
DQN_TESTER_ASSERTF(&test, *added_item == 5, "added_item: %d", *added_item);
DQN_TESTER_ASSERTF(&test, array.data[4] == 5, "array.data: %d", array.data[4]);
DQN_TESTER_ASSERTF(&test, array.size == 5, "array.size: %zu", array.size);
DQN_TESTER_ASSERTF(&test, array.max >= 5, "array.max: %zu", array.max);
Dqn_Arena_Free(&arena, false /*clear_mem*/);
Dqn_Tester_End(&test);
}
DQN_TESTER_END_GROUP(&test);
return test;
}
Dqn_Tester Dqn_Test_File()
{
Dqn_Tester test = {};
@ -226,61 +97,61 @@ Dqn_Tester Dqn_Test_FixedArray()
{
Dqn_Tester test = {};
#if defined(DQN_WITH_FIXED_ARRAY)
DQN_TESTER_BEGIN_GROUP("Dqn_FixedArray");
// NOTE: Dqn_FixedArray_Init
DQN_TESTER_BEGIN_GROUP("Dqn_FArray");
// NOTE: Dqn_FArray_Init
{
Dqn_Tester_Begin(&test, "Initialise from raw array");
int raw_array[] = {1, 2};
auto array = Dqn_FixedArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
auto array = Dqn_FArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
DQN_TESTER_ASSERT(&test, array.size == 2);
DQN_TESTER_ASSERT(&test, array[0] == 1);
DQN_TESTER_ASSERT(&test, array[1] == 2);
DQN_TESTER_ASSERT(&test, array.data[0] == 1);
DQN_TESTER_ASSERT(&test, array.data[1] == 2);
Dqn_Tester_End(&test);
}
// NOTE: Dqn_FixedArray_EraseStable
// NOTE: Dqn_FArray_EraseStable
{
Dqn_Tester_Begin(&test, "Erase stable 1 element from array");
int raw_array[] = {1, 2, 3};
auto array = Dqn_FixedArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
Dqn_FixedArray_EraseStable(&array, 1);
auto array = Dqn_FArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
Dqn_FArray_EraseStable(&array, 1);
DQN_TESTER_ASSERT(&test, array.size == 2);
DQN_TESTER_ASSERT(&test, array[0] == 1);
DQN_TESTER_ASSERT(&test, array[1] == 3);
DQN_TESTER_ASSERT(&test, array.data[0] == 1);
DQN_TESTER_ASSERT(&test, array.data[1] == 3);
Dqn_Tester_End(&test);
}
// NOTE: Dqn_FixedArray_EraseUnstable
// NOTE: Dqn_FArray_EraseUnstable
{
Dqn_Tester_Begin(&test, "Erase unstable 1 element from array");
int raw_array[] = {1, 2, 3};
auto array = Dqn_FixedArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
Dqn_FixedArray_EraseUnstable(&array, 0);
auto array = Dqn_FArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
DQN_TESTER_ASSERT(&test, Dqn_FArray_EraseUnstable(&array, 0));
DQN_TESTER_ASSERT(&test, array.size == 2);
DQN_TESTER_ASSERT(&test, array[0] == 3);
DQN_TESTER_ASSERT(&test, array[1] == 2);
DQN_TESTER_ASSERT(&test, array.data[0] == 3);
DQN_TESTER_ASSERT(&test, array.data[1] == 2);
Dqn_Tester_End(&test);
}
// NOTE: Dqn_FixedArray_Add
// NOTE: Dqn_FArray_Add
{
Dqn_Tester_Begin(&test, "Add 1 element to array");
int const ITEM = 2;
int raw_array[] = {1};
auto array = Dqn_FixedArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
Dqn_FixedArray_Add(&array, ITEM);
auto array = Dqn_FArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
Dqn_FArray_Add(&array, ITEM);
DQN_TESTER_ASSERT(&test, array.size == 2);
DQN_TESTER_ASSERT(&test, array[0] == 1);
DQN_TESTER_ASSERT(&test, array[1] == ITEM);
DQN_TESTER_ASSERT(&test, array.data[0] == 1);
DQN_TESTER_ASSERT(&test, array.data[1] == ITEM);
Dqn_Tester_End(&test);
}
// NOTE: Dqn_FixedArray_Clear
// NOTE: Dqn_FArray_Clear
{
Dqn_Tester_Begin(&test, "Clear array");
int raw_array[] = {1};
auto array = Dqn_FixedArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
Dqn_FixedArray_Clear(&array);
auto array = Dqn_FArray_Init<int, 4>(raw_array, (int)Dqn_CArray_Count(raw_array));
Dqn_FArray_Clear(&array, Dqn_ZeroMem_No);
DQN_TESTER_ASSERT(&test, array.size == 0);
Dqn_Tester_End(&test);
}
@ -289,25 +160,25 @@ Dqn_Tester Dqn_Test_FixedArray()
return test;
}
Dqn_Tester Dqn_Test_FixedString()
Dqn_Tester Dqn_Test_FString8()
{
Dqn_Tester test = {};
#if defined(DQN_WITH_FIXED_STRING)
DQN_TESTER_BEGIN_GROUP("Dqn_FixedString");
DQN_TESTER_BEGIN_GROUP("Dqn_FString8");
// NOTE: Dqn_FixedString_Append
// NOTE: Dqn_FString8_Append
{
Dqn_Tester_Begin(&test, "Append too much fails");
Dqn_FixedString<4> str = {};
DQN_TESTER_ASSERTF(&test, Dqn_FixedString_Append(&str, "abcd") == false, "We need space for the null-terminator");
Dqn_FString8<4> str = {};
DQN_TESTER_ASSERTF(&test, Dqn_FString8_AppendCString8(&str, "abcd") == false, "We need space for the null-terminator");
Dqn_Tester_End(&test);
}
// NOTE: Dqn_FixedString_AppendFmt
// NOTE: Dqn_FString8_AppendFmt
{
Dqn_Tester_Begin(&test, "Append format string too much fails");
Dqn_FixedString<4> str = {};
DQN_TESTER_ASSERTF(&test, Dqn_FixedString_AppendFmt(&str, "abcd") == false, "We need space for the null-terminator");
Dqn_FString8<4> str = {};
DQN_TESTER_ASSERTF(&test, Dqn_FString8_AppendFmt(&str, "abcd") == false, "We need space for the null-terminator");
Dqn_Tester_End(&test);
}
DQN_TESTER_END_GROUP(&test);
@ -1767,10 +1638,9 @@ void Dqn_Test_RunSuite()
{
Dqn_Tester tests[]
{
Dqn_Test_Array(),
Dqn_Test_File(),
Dqn_Test_FixedArray(),
Dqn_Test_FixedString(),
Dqn_Test_FString8(),
Dqn_Test_Hex(),
Dqn_Test_Intrinsics(),
Dqn_Test_M4(),