From 8ca4fbe654fb843df76514cee54dd353b178e068 Mon Sep 17 00:00:00 2001 From: EimaMei Date: Thu, 2 May 2024 20:55:44 +0300 Subject: [PATCH 1/5] Documentation and macro rewording, minor typeof-less support, new macros and bug fixes --- Makefile | 6 +- sili.h | 389 ++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 275 insertions(+), 120 deletions(-) diff --git a/Makefile b/Makefile index bdde69b..792741c 100644 --- a/Makefile +++ b/Makefile @@ -27,12 +27,12 @@ $(EXE): $(SRC) sili.h $(CC) $(FLAGS) $(SRC) $(INCLUDE) $(LIBS) -o $@ # Check the assembly output. -dump_asm: +asm: $(CC) -g $(FLAGS) $(INCLUDE) $(LIBS) -masm=intel -S $(SRC) -o sili.S -# Runs and compiles every example. -run_examples: +# Compiles and runs every example. +compile_examples: @for f in $(shell ls examples/*.c); do make SRC=$${f}; rm -rf $(EXE); done diff --git a/sili.h b/sili.h index 5468cbd..9a51541 100644 --- a/sili.h +++ b/sili.h @@ -45,13 +45,14 @@ DOCUMENTATION some kind of 'text'. Such arguments are noted if their type denotation is A FULLY CAPITALIZED KEYWORD. This is a general list of the keywords, their meanings and examples of them: - - TYPE - argument is just the type name (siString, usize, rawptr). - - TYPE* - same as TYPE except it's a pointer to it (siString*, usize*, rawptr*). - - INT - argument can be any signed integer (50, -250LL, ISIZE_MAX). - - UINT - argument can be any unsigned integer (50, 250ULL, USIZE_MAX). - - EXPRESSION - argument is just some kind of valid C value (60, "hello", SI_RGB(255, 255, 255)). - - NAME - argument has to be regular text with _no_ enquotes (test, var, len). - - ANYTHING - argument can be literally anything. + - TYPE - the type name (siString, usize, rawptr). + - TYPE* - the pointer of a type (siString*, usize*, rawptr*). + - INT - a signed integer (50, -250LL, ISIZE_MAX). + - UINT - an unsigned integer (50, 250ULL, USIZE_MAX). + - FUNCTION - the name of any visibly-exposed function without enquotes. + - EXPRESSION - any legal C value (60, "hello", SI_RGB(255, 255, 255)). + - NAME - regular text with no enquotes (test, var, len). + - ANYTHING - anything. =========================================================================== MACROS @@ -64,26 +65,26 @@ MACROS ``` - SI_NO_ASSERTIONS_IN_HEADER - 'SI_ASSERT()' and its other variations do not - check for the assertion, essentially doing nothing, meaning any given expression - will evaluate to nothing and not crash the app. Slightly increases the performance - of the app, but should only be enabled for release builds, as any error in - the code will then not get caught and will most likely crash the app somewhere - else further down. Note that these functions work as intended outside the - "sili.h" file. + check for the assertion inside of the 'sili.h' file, meaning any given expression + from sili functions will evaluate to nothing and not crash the app if the + assertion equals false. May increase the performance of the program, but should + only be enabled for release builds, as any errors in the code will then not get + caught and will most likely crash the app somewhere else further down. - - SI_NO_ASSERTIONS - same as 'SI_NO_ASSERTIONS' except 'SI_ASSERT()' becomes - also not usable outside "sili.h". + - SI_NO_ASSERTIONS - same as 'SI_NO_ASSERTIONS' except all of the assertion + functions continue to be unusable outside of 'sili.h', disabling the functionality + entirely. - - SI_NO_ALLOC_DEBUG_INFO - by default 'si_malloc()' and similar functions take - __FILE__ and __LINE__ arguments for debugging. For performance reasons, you - can disable this. + - SI_NO_ALLOC_DEBUG_INFO - 'si_malloc()' and similar functions take + '__FILE__' and '__LINE__' arguments under the hood for debugging. For performance + reasons, you can disable this. - SI_RELEASE_MODE - same as defining both 'SI_NO_ASSERTIONS' and 'SI_NO_ALLOC_DEBUG_INFO'. - SI_NO_ERROR_STRUCT - by default 'siErrorInfo' that contains an i32 error code, u64 time in UTC+0 and a cstring of the last function that edited the structure. - Defining this macro makes siErrorInfo only contain an error code. + Defining this macro makes 'siErrorInfo' only contain an error code. - SI_NO_INLINE_ASM - disables any usage of inline ASM in "sili.h". @@ -91,7 +92,10 @@ MACROS Intel syntax is used. - SI_NO_WINDOWS_H - disables the inclusion of inside "sili.h." - Will cause 'undefined' compiler errors in some parts of the code. + Will cause 'undefined' compiler errors in some parts of the code without a + proper replacement. + + - SI_NO_TYPEOF - disables the usage of '__typeof__' inside of the library. =========================================================================== CREDITS @@ -425,11 +429,18 @@ typedef double f64; SI_STATIC_ASSERT(sizeof(f32) == 4); SI_STATIC_ASSERT(sizeof(f64) == 8); -#define SI_F32_MIN (1.17549435e-38f) -#define SI_F32_MAX (3.40282347e+38f) - -#define SI_F64_MIN (2.2250738585072014e-308) -#define SI_F64_MAX (1.7976931348623157e+308) +#ifndef FLOAT32_MIN + #define FLOAT32_MIN (1.17549435e-38f) +#endif +#ifndef FLOAT32_MAX + #define FLOAT32_MAX (3.40282347e+38f) +#endif +#ifndef FLOAT64_MIN + #define FLOAT64_MIN (2.2250738585072014e-308) +#endif +#ifndef FLOAT64_MAX + #define FLOAT64_MAX (1.7976931348623157e+308) +#endif #if !defined(b8) @@ -513,13 +524,13 @@ SI_STATIC_ASSERT(false == 0); #if (defined(SI_LANGUAGE_CPP) && (SI_STANDARD_VERSION >= SI_STANDARD_CPP17)) || (!defined (SI_LANGUAGE_CPP) && SI_STANDARD_VERSION > SI_STANDARD_C17) /* Specifies a fallthrough for the compiler. */ - #define fallthrough [[fallthrough]] + #define siFallthrough [[fallthrough]] #elif defined(SI_GNUC_COMPLIANT) /* Specifies a fallthrough for the compiler. */ - #define fallthrough __attribute__((fallthrough)) + #define siFallthrough __attribute__((fallthrough)) #else /* Specifies a fallthrough for the compiler. */ - #define fallthrough do {} while (0) + #define siFallthrough do {} while (0) #endif @@ -682,10 +693,11 @@ SI_STATIC_ASSERT(sizeof(nil) == sizeof(void*)); | Unary operators | ======================== */ -#if !defined(typeof) && !(defined(SI_LANGUAGE_C) && SI_STANDARD_VERSION > SI_STANDARD_C17) +#if !defined(typeof) && !(defined(SI_LANGUAGE_C) && SI_STANDARD_VERSION > SI_STANDARD_C17) && !defined(SI_NO_TYPEOF) /* ...VALUE - TYPE/EXPRESSION * Gets the value's type and expresses it as just a regular type. */ #define typeof(.../* VALUE */) __typeof__(__VA_ARGS__) + #define SI_TYPEOF_USED 1 #endif #if !defined(countof) @@ -728,7 +740,7 @@ SI_STATIC_ASSERT(sizeof(nil) == sizeof(void*)); /* allocator - siAllocator* | type - TYPE | count - usize * Allocates an array of 'sizeof(type)' bytes to the allocator and casts the value. */ #define si_mallocArray(allocator, type, count) (type*)si_malloc(allocator, sizeof(type) * (count)) -/* allocator - siAllocator* | pointer - REGULAR POINTER +/* allocator - siAllocator* | pointer - POINTER * Allocates 'sizeof(variable)' bytes to the allocator and copies the value of * 'variable' to the allocated memory. Variable _must_ be a pointer. */ #define si_mallocCopy(allocator, pointer) \ @@ -740,18 +752,36 @@ SI_STATIC_ASSERT(sizeof(nil) == sizeof(void*)); /* type - TYPE | ...VALUES - , [EXPRESSION] ... * Declares a static buffer. */ #define si_buf(type, .../* VALUES */) (type[]){__VA_ARGS__} -/* a - VARIABLE | b - VARIABLE - * Swaps the value of 'a' with 'b'; 'b' with 'a'. */ -#define si_swap(a, b) do { typeof((a)) tmp = (a); (a) = (b); (b) = tmp; } while (0) /* Pauses the thread and waits for the user to press enter in the terminal. */ #define si_pause() do { si_print("Press any key to continue..."); getchar(); } while(0) /* x - EXPRESSION * Checks if value is nil/zero. */ #define si_isNil(x) ((x) == 0) + +#if defined(SI_TYPEOF_USED) +/* a - VARIABLE | b - VARIABLE + * Swaps the value of 'a' with 'b'; 'b' with 'a'. */ +#define si_swap(a, b) do { typeof((a)) tmp = (a); (a) = (b); (b) = tmp; } while (0) /* countvar - NAME | start - INT | end - INT * A loop that loops from 'start' to 'end' and increments 'countVar' each cycle. */ #define for_range(countVar, start, end) \ for (typeof(end) countVar = (start); countVar < (end); countVar += 1) +#else +/* a - VARIABLE | b - VARIABLE + * Swaps the value of 'a' with 'b'; 'b' with 'a'. */ +#define si_swap(a, b) do { \ + char tmp[sizeof(a)]; \ + memcpy(tmp, &a, sizeof(a)); \ + memcpy(&a, &b, sizeof(a)); \ + memcpy(&b, tmp, sizeof(b)); \ +} while (0) + +/* countvar - NAME | start - INT | end - INT + * A loop that loops from 'start' to 'end' and increments 'countVar' each cycle. */ +#define for_range(countVar, start, end) \ + for (usize countVar = (start); countVar < (usize)(end); countVar += 1) + +#endif #if defined(SI_GNUC_COMPLIANT) /* x - CONDITION @@ -774,12 +804,22 @@ SI_STATIC_ASSERT(sizeof(nil) == sizeof(void*)); * Denotes that this statement is less likely to be expected. */ #define SI_UNLIKELY(x) (x) #endif + +#if SI_STANDARD_VERSION < SI_STANDARD_C11 && !defined(memcpy_s) +/* dst - rawptr | dstsz - usize | src - rawptr | count - usize + * A pre-C11 implementation* of memcpy_s. */ +#define memcpy_s(dst, dstsz, src, count) (memcpy(dst, src, si_min(dstsz, count)) != dst) +#endif /* ======================== | Endian swap macros | ======================== */ +/* little - EXPRESSION | big - EXPRESSION + * Returns one of the specified values depending on the system's endianness. */ +#define SI_ENDIAN_VALUE(little, big) ((SI_HOST_IS_LITTLE_ENDIAN) ? (little) : (big)) + /* x - u16 * Swaps the endianess of a 16-bit number. */ #define si_swap16(x) \ @@ -966,14 +1006,29 @@ typedef struct { /* Contains a function pointer for siThread. */ typedef rawptr SI_FUNC_PTR(siFunction, (rawptr)); +#if defined(SI_TYPEOF_USED) /* func - NAME - * A hasty macro solution for inputting a function into a thread. */ + * A hasty macro solution for inputting a function into a thread without a warning. */ #define siFunc(func) SI_FUNC_PTR_CHANGE(func, siFunction) +#else +/* func - NAME + * A hasty macro solution for inputting a function into a thread that will result in a warning. */ +#define siFunc(func) (siFunction)(func) +#endif -/* func1 - NAME | type - func2 +#if defined(SI_TYPEOF_USED) +/* func1 - NAME | newType - TYPE + * Changes the type of the 1st specified function to newly specified one in an ISO C + * portable fashion. */ +#define SI_FUNC_PTR_CHANGE(func1, newType) \ + SI_FUNC_PTR_CHANGE_EX(func1, typeof(&func1), newType) +#endif +/* func1 - NAME | ogType - TYPE | newType - TYPE * Changes the type of the 1st specified function to second one's in an ISO C * portable fashion. */ -#define SI_FUNC_PTR_CHANGE(func1, func2) (((union { typeof(&func1) a; typeof(func2) b;}){func1}).b) +#define SI_FUNC_PTR_CHANGE_EX(func1, ogType, newType) \ + (((union { ogType a; newType b;}){func1}).b) + /* ======================== @@ -1049,7 +1104,17 @@ typedef struct { f32 x, y, z, w; } siVec4; #define SI_VEC4(x, y, z, w) ((siVec4){x, y, z, w}) /* rect - siRect * Macro to define a 4D vector from a regular 'siRect' struct. */ - #define SI_VEC4R(rect) SI_VEC4((rect).x, (rect).y, (rect).width, (rect).height) +#define SI_VEC4R(rect) SI_VEC4((rect).x, (rect).y, (rect).width, (rect).height) + +/* A struct containing 4 floats used for coordinates */ +typedef struct { f32 x1, x2, y1, y2; } siCoordsF32; +/* A struct containing 4 u32s used for coordinates */ +typedef struct { u32 x1, x2, y1, y2; } siCoordsU32; + + +#ifndef SI_MAX_PATH_LEN + #define SI_MAX_PATH_LEN 260 +#endif typedef SI_ENUM(u32, siDirection) { SI_DIRECTION_LEFT, @@ -1314,27 +1379,16 @@ typedef struct { * Gets the siArray's header. */ #define SI_ARRAY_HEADER(array) ((siArrayHeader*)array - 1) -#if !defined(for_each) - #if defined(SI_LANGUAGE_C) && SI_STANDARD_VERSION > SI_STANDARD_C89 - /* variableName - NAME | array - siArray(TYPE) - * Iterates through a siArray. */ - #define for_each(variableName, array) \ - for (\ - typeof(array) variableName = array; \ - variableName != (typeof(array))si_arrayGetPtr(array, si_arrayLen(array)); \ - variableName += 1 \ - ) - #else - /* variableName - NAME | array - siArray(TYPE) - * Iterates through a siArray. */ - #define for_each(variableName, array) \ - typeof(array) variableName; \ - for ( \ - variableName = array; \ - variableName != (typeof(array))si_arrayGetPtr(array, si_arrayLen(array)); \ - variableName += 1 \ - ) - #endif +#if !defined(for_each) && SI_TYPEOF_USED + /* variableName - NAME | array - siArray(TYPE) + * Iterates through a siArray. */ + #define for_each(variableName, array) \ + typeof(array) variableName; \ + for ( \ + variableName = array; \ + variableName != (typeof(array))si_arrayGetPtr(array, si_arrayLen(array)); \ + variableName += 1 \ + ) #endif /* array - siArray(TYPE) | index - usize @@ -1682,6 +1736,9 @@ siUtf32Char si_utf8StrAt(siUtf8String str, usize charIndex); /* Encodes a NULL-terminated UTF-8 string into UTF-16. */ siUtf16String si_utf8ToUtf16Str(siAllocator* alloc, siUtf8String str, usize* strLenOut); +/* Encodes a length-specified UTF-8 string into UTF-16. */ +siUtf16String si_utf8ToUtf16StrEx(siAllocator* alloc, siUtf8String str, usize strLen, + usize* strLenOut); /* Encodes a NULL-terminated UTF-16 string into UTF-8. */ siUtf8String si_utf16ToUtf8Str(siAllocator* alloc, siUtf16String str, usize* strLenOut); @@ -1801,7 +1858,8 @@ char* si_u64ToCstrEx(siAllocator* alloc, u64 num, i32 base, usize* outLen); * the number is base-10. */ char* si_i64ToCstr(siAllocator* alloc, i64 num); /* Creates a string from the specified signed number and its base. Length of - * the string is written into 'outLen', unless 'outLen' is nil. */ + * the string, including the minus sign if the integer is negative, is written + * into 'outLen', unless 'outLen' is nil. */ char* si_i64ToCstrEx(siAllocator* alloc, i64 num, i32 base, usize* outLen); /* Creates a string from the specified float. By default the function assumes that @@ -2186,7 +2244,7 @@ typedef SI_ENUM(i32, siIOType) { typedef struct { /* Pointer to the full path. Note that this will be the same as 'baseName' * if the 'fullPath' flag in 'si_dirPollEntryEx' wasn't set to true. */ - char path[256]; + char path[SI_MAX_PATH_LEN]; /* Pointer to the base name. */ char* baseName; /* Actual length of the path. */ @@ -2443,7 +2501,7 @@ typedef SI_ENUM(usize, siBitType) { /* x - INT * Returns true if x is negative. */ -#define si_numIsNeg(x) (x < 0) +#define si_numIsNeg(x) ((x) < 0) /* Returns how many 1 bits are in an 8-bit number. */ usize si_numCountBitsU8(u8 num); @@ -2629,9 +2687,23 @@ void si_dllUnload(siDllHandle dll); /* Returns the pointer to the specified processor name of the DLL. */ siDllProc si_dllProcAddress(siDllHandle dll, cstring name); -#endif /* !defined(SI_NO_DLL) */ +#if defined(SI_TYPEOF_USED) +/* dll - siDllHandle | function - FUNCTION + * Loads the specified function's name as a processor and returns it as an ISO-C + * friendly function. */ +#define si_dllProcAddressFunc(dll, function) \ + si_dllProcAddressFuncEx(dll, function, typeof(function)) +#endif + +/* dll - siDllHandle | function - FUNCTION | type - TYPE + * Loads the specified function's name as a processor and returns it as an ISO-C + * friendly function. */ +#define si_dllProcAddressFuncEx(dll, function, type) \ + (((union { rawptr a; type b; }){si_dllProcAddress(dll, #function)}).b) +#endif /* !defined(SI_NO_DLL) */ + #if !defined(SI_NO_MATH) /* * @@ -2723,9 +2795,6 @@ f32 si_ceilF32(f32 x); * as a 64-bit unsigned int (meaning the exponent can only be from 0 to 19, otherwise * the app will crash). */ u64 si_pow10(u32 exponent); -/* Raises a f64 10 by the power of the exponent. The exponent must be in-between - * -18 to 18, otherwise the app will crash.*/ -f64 si_pow10F64(i32 exponent); /* Rounds up the number to the nearest multiple and returns it. */ u64 si_numRoundNearestMultiple(u64 num, usize multiple); @@ -3394,13 +3463,17 @@ siString si_arrayToSistring(siArray(char*) array, cstring separator) { } siString res = si_stringMakeReserve(SI_ARRAY_HEADER(array)->allocator, totalSize); - rawptr backPtr = si_arrayBack(array); - for_each (str, array) { - if (separator != nil && (&str) != backPtr) { - si_stringJoin(&res, separator, *str); + + if (separator != nil) { + for_range (i, 0, si_arrayLen(array) - 1) { + si_stringJoin(&res, separator, array[i]); } - else { - si_stringAppend(&res, *str); + si_stringAppend(&res, array[si_arrayLen(array)]); + + } + else { + for_range (i, 0, si_arrayLen(array)) { + si_stringAppend(&res, array[i]); } } @@ -3584,7 +3657,7 @@ void si_arrayShrinkToFit(rawptr arrayPtr) { siByte* array = *si_cast(siByte**, arrayPtr); siArrayHeader* header = SI_ARRAY_HEADER(array); - header = (typeof(header))si_realloc( + header = (siArrayHeader*)si_realloc( header->allocator, header, sizeof(siArrayHeader) + si_arrayTotalSize(array), @@ -4295,13 +4368,13 @@ char* si_i64ToCstr(siAllocator* alloc, i64 num) { char* si_i64ToCstrEx(siAllocator* alloc, i64 num, i32 base, usize* outLen) { SI_ASSERT_NOT_NULL(alloc); - usize len = si_numLenI64Ex(num, base); + b64 isNegative = si_numIsNeg(num); + usize len = si_numLenI64Ex(num, base) + isNegative; char* res = si_mallocArray(alloc, char, len + 1); char* endPtr = res + len; *endPtr = '\0'; - b64 isNegative = si_numIsNeg(num); u64 unsignedNum = (num ^ -isNegative) + isNegative; do { @@ -4320,33 +4393,86 @@ char* si_f64ToCstrEx(siAllocator* alloc, f64 num, i32 base, u32 afterPoint, usize* outLen) { SI_ASSERT_NOT_NULL(alloc); - b32 isNegative = num < 0; - num = si_absf(num); - usize len = isNegative + si_numLenEx((i64)num, base) + 1 * (afterPoint != 0) + afterPoint; - char* res = si_mallocArray(alloc, char, len + 1); - char* endPtr = res + len; - *endPtr = '\0'; + b32 isNegative; + { + static u64 infinity = 0x7FF0000000000000; + static u64 nanV = 0x7FF8000000000000; - f64 baseForm = num; - u64 pow10val = si_pow10(afterPoint); - u64 remainder = (u64)((baseForm - (u64)baseForm) * pow10val + 0.5); + union { f64 f; u64 n; } check = {num}; + isNegative = (check.n & SI_ENDIAN_VALUE(SI_BIT(63), SI_BIT(0))) != 0; + check.n &= ~SI_ENDIAN_VALUE(SI_BIT(63), SI_BIT(0)); /* NOTE(EimaMei): A quick way of changing the minus to plus. */ + num = check.f; - usize count = 0; - while (count < afterPoint) { - *(--endPtr) = SI_NUM_TO_CHAR_TABLE[remainder % base]; - remainder /= base; - count += 1; + if (check.n == infinity) { + usize len = isNegative + 3; + + char* res = si_mallocArray(alloc, char, len + 1); + char* endPtr = res; + + SI_STOPIF(isNegative, endPtr[0] = '-'; endPtr += 1); + memcpy(endPtr, "inf\0", 4); + SI_STOPIF(outLen != nil, *outLen = len); + + return res; + } + else if (check.n == nanV) { + char* res = si_mallocArray(alloc, char, 4); + char* endPtr = res; + + memcpy(endPtr, "nan\0", 4); + SI_STOPIF(outLen != nil, *outLen = 3); + + return res; + + } + } + + + usize baseLen = 0; + f64 copy = num; + while (copy > 0.9999999999) { /* NOTE(EimaMei): How long can this be?? */ + copy /= base; + baseLen += 1; } - SI_STOPIF(count != 0, *(--endPtr) = '.'); + usize len = isNegative + baseLen + (afterPoint != 0) + afterPoint; + + if (baseLen != 0) { + copy *= base; + baseLen -= 1; + } + else { + len += 1; + } + f64 remainder = copy; + + + char* res = si_mallocArray(alloc, char, len + 1); + char* endPtr = res; + + SI_STOPIF(isNegative, *endPtr = '-'; endPtr++); + endPtr[len] = '\0'; do { - *(--endPtr) = SI_NUM_TO_CHAR_TABLE[(u64)baseForm % base]; - baseForm /= base; - } while ((u64)baseForm > 0); + u32 digit = (u32)copy; + copy -= digit; + copy *= base; + *endPtr = SI_NUM_TO_CHAR_TABLE[digit % base]; + endPtr += 1; + } while (baseLen--); + + SI_STOPIF(afterPoint != 0, *endPtr = '.'; endPtr += 1); + + while (afterPoint) { + remainder *= base; + + *endPtr = SI_NUM_TO_CHAR_TABLE[(u64)remainder % base]; + endPtr += 1; + + afterPoint -= 1; + } - SI_STOPIF(isNegative, *(--endPtr) = '-'); SI_STOPIF(outLen != nil, *outLen = len); return res; } @@ -4552,6 +4678,53 @@ siUtf16String si_utf8ToUtf16Str(siAllocator* alloc, siUtf8String str, usize* str SI_STOPIF(strLenOut != nil, *strLenOut = len); return res; } +siUtf16String si_utf8ToUtf16StrEx(siAllocator* alloc, siUtf8String str, usize strLen, + usize* strLenOut) { + SI_ASSERT_NOT_NULL(alloc); + SI_ASSERT_NOT_NULL(str); + + siUtf8String utf8Ptr = str; + siUtf16String res = (siUtf16String)si_allocatorCurPtr(alloc); + u16* curPos = (u16*)res; + + while (strLen) { + siUtf32Char utf32 = si_utf8Decode(utf8Ptr); + i32 codepoint = utf32.codepoint; + SI_ASSERT_MSG(codepoint != SI_UNICODE_INVALID, "Invalid UTF-8 character."); + + SI_STOPIF(codepoint == '\0', break); + utf8Ptr += utf32.len; + + if (codepoint < 0xFFFF) { + alloc->offset += 2; + SI_STOPIF(alloc->offset >= alloc->maxLen, goto end); + + *curPos = codepoint; + curPos += 1; + } + else { + alloc->offset += 4; + SI_STOPIF(alloc->offset >= alloc->maxLen, goto end); + + u32 t = codepoint - 0x10000; + u32 high = (t << 10) + 0xD800; + u32 low = t + 0xDC00; + + *curPos = (high << 16) | (low & 0x0000FFFF); + curPos += 2; + } + + strLen -= 1; + } +end: + *curPos = '\0'; + usize len = (char*)curPos - (char*)res; + alloc->offset += len + 1; + + SI_STOPIF(strLenOut != nil, *strLenOut = len); + return res; +} + siUtf8String si_utf16ToUtf8Str(siAllocator* alloc, siUtf16String str, usize* strLenOut) { SI_ASSERT_NOT_NULL(alloc); @@ -5689,7 +5862,7 @@ siDirectory si_dirOpen(siAllocator* alloc, cstring path) { usize len; siUtf16String widePath = si_utf8ToUtf16Str(stack, path, &len); - SI_ASSERT_MSG(len + 4 <= MAX_PATH, "Path is larger than 260 bytes."); + SI_ASSERT_MSG(len + 4 <= SI_MAX_PATH_LEN, "Path is larger than 260 bytes."); // NOTE(EimaMei): Reason why this works is because 'appendText' is right // after 'widePath' in memory. @@ -6019,8 +6192,8 @@ u64 si_bytesToNumSiArr(siArray(u8) bytes) { u64 res = 0; usize shift = (si_arrayLen(bytes) - 1) * 8; - for_each (byte, bytes) { - res |= si_cast(u64, *byte) << shift; + for_range (i, 0, si_arrayLen(bytes)) { + res |= (u64)bytes[i] << shift; shift -= 8; } @@ -6152,7 +6325,7 @@ isize si_snprintfVa(char* buffer, usize outCap, cstring fmt, va_list va) { union { u64 U64; i64 I64; f64 F64; i32 I32; u32 U32; cstring STR; siByte* PTR; usize USIZE; } vaValue; usize bufIndex = 0; usize len; - siAllocator* stack = si_allocatorMakeStack(64); + siAllocator* stack = si_allocatorMakeStack(128); char x; cstring fmtPtr = fmt; @@ -6444,7 +6617,7 @@ SI_GOTO_LABEL(GOTO_PRINT_SWITCH) else { f64 remainder = vaValue.F64 - (u64)vaValue.F64; u64 newAfterPoint = 0; - f64 maxZeroValue = si_pow10F64(-(i32)afterPoint); + f64 maxZeroValue = (f64)si_pow10(-(i32)afterPoint); while (newAfterPoint < afterPoint) { remainder *= 10; i64 digit = (i64)(remainder + (0.5 * ((i64)remainder != 0))); @@ -6670,7 +6843,7 @@ siDllProc si_dllProcAddress(siDllHandle dll, cstring name) { SI_ASSERT_NOT_NULL(name); #if defined(SI_SYSTEM_WINDOWS) PROC proc = GetProcAddress((HMODULE)dll, name); - return SI_FUNC_PTR_CHANGE(*proc, rawptr); + return SI_FUNC_PTR_CHANGE_EX(*proc, PROC, rawptr); #else return (siDllProc)dlsym(dll, name); #endif @@ -6770,24 +6943,6 @@ u64 si_pow10(u32 exponent) { return allPossibleValues[exponent]; } -F_TRAITS(inline) -f64 si_pow10F64(i32 exponent) { - static const f64 allPossibleValues[] = { - 1e-18, 1e-17, 1e-16, 1e-15, 1e-14, 1e-13, - 1e-12, 1e-11, 1e-10, 1e-09, 1e-08, 1e-07, - 1e-06, 1e-05, 1e-04, 1e-03, 1e-02, 1e-01, - - 1e+0, - - 1e+01, 1e+02, 1e+03, 1e+04, 1e+05, 1e+06, - 1e+07, 1e+08, 1e+09, 1e+10, 1e+11, 1e+12, - 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18 - }; - SI_ASSERT_MSG(si_between(exponent, -18, 18), "Exponent large. Must be from 0 to 19 to not overflow."); - - return allPossibleValues[exponent + 18]; -} - F_TRAITS(inline) u64 si_numRoundNearestMultiple(u64 num, usize multiple) { return ((num + multiple / 2) / multiple) * multiple; From 8431e307fb8e13bb5b3c80c979bd646c3bfd3dac Mon Sep 17 00:00:00 2001 From: EimaMei Date: Thu, 2 May 2024 20:57:47 +0300 Subject: [PATCH 2/5] forgor to update the github workflows --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9f8512e..bfb8dec 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,4 +16,4 @@ jobs: - name: apt run: sudo apt-get install libxcursor-dev - name: make - run: make run_examples + run: make compile_examples diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 11a4fd4..082b311 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,4 +14,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: make - run: make run_examples + run: make compile_examples diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 174b2ab..3825190 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,4 +14,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: make - run: make run_examples + run: make compile_examples From 3c777c51b87d28e9e576930c980486660fc84930 Mon Sep 17 00:00:00 2001 From: EimaMei Date: Thu, 2 May 2024 20:59:17 +0300 Subject: [PATCH 3/5] Fixed a typo in the MacOS version --- sili.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sili.h b/sili.h index 9a51541..d36d12e 100644 --- a/sili.h +++ b/sili.h @@ -219,7 +219,7 @@ extern "C" { #define SI_CPU_X86 1 #define SI_CACHE_LINE_SIZE 64 -#elif defined(_M_PPC) || defined(__powerpc__) || defined(__powerpc64__) || defined(_ARCH_PPC) || #defined(__ppc64__) +#elif defined(_M_PPC) || defined(__powerpc__) || defined(__powerpc64__) || defined(_ARCH_PPC) || defined(__ppc64__) #define SI_CPU_PPC 1 #define SI_CPU_PPC64 (__powerpc64__ || __ppc64__) #define SI_CACHE_LINE_SIZE 128 From 546b187225cf826534b7bafd8004ee1f5685ce08 Mon Sep 17 00:00:00 2001 From: EimaMei Date: Thu, 2 May 2024 21:06:52 +0300 Subject: [PATCH 4/5] Fix a few asm issues --- sili.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sili.h b/sili.h index d36d12e..2903443 100644 --- a/sili.h +++ b/sili.h @@ -499,27 +499,27 @@ SI_STATIC_ASSERT(false == 0); #define si_asm(... /* asm */) __asm { __VA_ARGS__ } #else #if defined(SI_CPU_X86) && defined(SI_GNUC_COMPLIANT) - /* asm - cstring | ...IOR - ASM INPUT, OUTPUT OR REGISTERS + /* asmStr - cstring | ...IOR - ASM INPUT, OUTPUT OR REGISTERS * Inserts inline assembly into the program using GNU C assembly syntax. */ - #define si_asm(asm, .../* IOR */) \ + #define si_asm(asmStr, .../* IOR */) \ __asm__ __volatile__( \ ".intel_syntax noprefix" SI_ASM_NL \ - asm SI_ASM_NL \ + asmStr SI_ASM_NL \ ".att_syntax" \ __VA_ARGS__ \ ) - - #define SI_ASM_INPUT(...) : __VA_ARGS__ - #define SI_ASM_OUTPUT(...) : __VA_ARGS__ - #define SI_ASM_REGISTERS(...) : __VA_ARGS__ - #define SI_ASM_NL "\n" #else - /* asm - cstring | ...IOR - ASM INPUT, OUTPUT OR REGISTERS + /* asmStr - cstring | ...IOR - ASM INPUT, OUTPUT OR REGISTERS * Inserts inline assembly into the program using GNU C assembly syntax. */ - #define si_asm(asm, .../ * IOR */) __asm__ __volatile__(asm __VA_ARGS__) + #define si_asm(asmStr, .../ * IOR */) __asm__ __volatile__(asmStr __VA_ARGS__) #endif #endif +#define SI_ASM_INPUT(...) : __VA_ARGS__ +#define SI_ASM_OUTPUT(...) : __VA_ARGS__ +#define SI_ASM_REGISTERS(...) : __VA_ARGS__ +#define SI_ASM_NL "\n" + #if (defined(SI_LANGUAGE_CPP) && (SI_STANDARD_VERSION >= SI_STANDARD_CPP17)) || (!defined (SI_LANGUAGE_CPP) && SI_STANDARD_VERSION > SI_STANDARD_C17) From c05876e69d001a822c19bb70c25de4479234add3 Mon Sep 17 00:00:00 2001 From: EimaMei Date: Thu, 2 May 2024 21:10:34 +0300 Subject: [PATCH 5/5] Mac is being annoying --- sili.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sili.h b/sili.h index 2903443..6b2ea28 100644 --- a/sili.h +++ b/sili.h @@ -501,7 +501,7 @@ SI_STATIC_ASSERT(false == 0); #if defined(SI_CPU_X86) && defined(SI_GNUC_COMPLIANT) /* asmStr - cstring | ...IOR - ASM INPUT, OUTPUT OR REGISTERS * Inserts inline assembly into the program using GNU C assembly syntax. */ - #define si_asm(asmStr, .../* IOR */) \ + #define si_asm(asmStr, ...) \ __asm__ __volatile__( \ ".intel_syntax noprefix" SI_ASM_NL \ asmStr SI_ASM_NL \