From b481fcf195a31292de5f7528270ce10b11f01be0 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 13 May 2026 02:23:31 +1000 Subject: [PATCH] clean up dependencies --- dlib/dlibincludes.c | 4 - external/tinyalloc/LICENCE | 201 ----------------- external/tinyalloc/tinyalloc.c | 383 --------------------------------- external/tinyalloc/tinyalloc.h | 28 --- external/wasmbuild.c | 0 5 files changed, 616 deletions(-) delete mode 100644 external/tinyalloc/LICENCE delete mode 100644 external/tinyalloc/tinyalloc.c delete mode 100644 external/tinyalloc/tinyalloc.h delete mode 100644 external/wasmbuild.c diff --git a/dlib/dlibincludes.c b/dlib/dlibincludes.c index b452883..dbde1c7 100644 --- a/dlib/dlibincludes.c +++ b/dlib/dlibincludes.c @@ -28,10 +28,6 @@ # include "../external/stb/stb_image_write.h" #endif -#ifdef BUILD_WASM -# include "../external/tinyalloc/tinyalloc.c" -#endif - #ifdef DLIB_INCLUDE_VULKAN # include "../../VulkanRenderer/vulkan_includes.c" #endif diff --git a/external/tinyalloc/LICENCE b/external/tinyalloc/LICENCE deleted file mode 100644 index 8dada3e..0000000 --- a/external/tinyalloc/LICENCE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/external/tinyalloc/tinyalloc.c b/external/tinyalloc/tinyalloc.c deleted file mode 100644 index 1de3a04..0000000 --- a/external/tinyalloc/tinyalloc.c +++ /dev/null @@ -1,383 +0,0 @@ -#include "tinyalloc.h" -#include - -#ifdef TA_DEBUG -extern void print_s(char *); -extern void print_i(size_t); -#else -#define print_s(X) -#define print_i(X) -#endif - -typedef struct Block Block; - -struct Block -{ - void *addr; - Block *next; - size_t size; -}; - -typedef struct -{ - Block *free; // first free block - Block *used; // first used block - Block *fresh; // first available blank block - size_t top; // top free addr -} Heap; - -extern uint8_t __heap_base; -extern uint8_t __data_end; - -static Heap *heap = NULL; -static const void *heap_limit = NULL; -static size_t heap_split_thresh; -static size_t heap_alignment; -static size_t heap_max_blocks; -static size_t current_pages; - -/** - * If compaction is enabled, inserts block - * into free list, sorted by addr. - * If disabled, add block has new head of - * the free list. - */ -static void insert_block(Block *block) -{ -#ifndef TA_DISABLE_COMPACT - Block *ptr = heap->free; - Block *prev = NULL; - while (ptr != NULL) - { - if ((size_t)block->addr <= (size_t)ptr->addr) - { - print_s("insert"); - print_i((size_t)ptr); - break; - } - prev = ptr; - ptr = ptr->next; - } - - if (prev != NULL) - { - if (ptr == NULL) - { - print_s("new tail"); - } - prev->next = block; - } - else - { - print_s("new head"); - heap->free = block; - } - block->next = ptr; -#else - block->next = heap->free; - heap->free = block; -#endif -} - -#ifndef TA_DISABLE_COMPACT -static void release_blocks(Block *scan, Block *to) -{ - Block *scan_next; - while (scan != to) - { - print_s("release"); - print_i((size_t)scan); - scan_next = scan->next; - scan->next = heap->fresh; - heap->fresh = scan; - scan->addr = 0; - scan->size = 0; - scan = scan_next; - } -} - -static void compact() -{ - Block *ptr = heap->free; - Block *prev; - Block *scan; - while (ptr != NULL) - { - prev = ptr; - scan = ptr->next; - - while (scan != NULL && (size_t)prev->addr + prev->size == (size_t)scan->addr) - { - print_s("merge"); - print_i((size_t)scan); - prev = scan; - scan = scan->next; - } - - if (prev != ptr) - { - size_t new_size = (size_t)prev->addr - (size_t)ptr->addr + prev->size; - print_s("new size"); - print_i(new_size); - ptr->size = new_size; - Block *next = prev->next; - // make merged blocks available - release_blocks(ptr->next, prev->next); - // relink - ptr->next = next; - } - - ptr = ptr->next; - } -} -#endif - -uint32_t ta_grow(uint32_t pages) -{ - return __builtin_wasm_memory_grow(0, pages); -} - -uint32_t ta_page_count() -{ - return __builtin_wasm_memory_size(0); -} - -void ta_init(const size_t heap_blocks, const size_t split_thresh, const size_t alignment) -{ - current_pages = ta_page_count(); - void *limit = (void *)ta_PAGE_SIZE(current_pages); - - heap = (Heap *)&__heap_base; - heap_limit = limit; - heap_split_thresh = split_thresh; - heap_alignment = alignment; - heap_max_blocks = heap_blocks; - - heap->free = NULL; - heap->used = NULL; - heap->fresh = (Block *)(heap + 1); - heap->top = (size_t)(heap->fresh + heap_blocks); - - Block *block = heap->fresh; - size_t i = heap_max_blocks - 1; - while (i--) - { - block->next = block + 1; - block++; - } - - block->next = NULL; -} - -void free(void *ptr) -{ - Block *block = heap->used; - Block *prev = NULL; - while (block != NULL) - { - if (ptr == block->addr) - { - if (prev) - { - prev->next = block->next; - } - else - { - heap->used = block->next; - } - insert_block(block); -#ifndef TA_DISABLE_COMPACT - compact(); -#endif - } - prev = block; - block = block->next; - } -} - -size_t ta_ptr_size(void *ptr) -{ - size_t result = 0; - - Block *block = heap->used; - while(block != NULL) - { - if(ptr == block->addr) - { - result = block->size; - break; - } - } - - return result; -} - -static Block *alloc_block(size_t num) -{ - Block *ptr = heap->free; - Block *prev = NULL; - size_t top = heap->top; - num = (num + heap_alignment - 1) & -heap_alignment; - while (ptr != NULL) - { - const int is_top = ((size_t)ptr->addr + ptr->size >= top) && ((size_t)ptr->addr + num <= (size_t)heap_limit); - if (is_top || ptr->size >= num) - { - if (prev != NULL) - { - prev->next = ptr->next; - } - else - { - heap->free = ptr->next; - } - ptr->next = heap->used; - heap->used = ptr; - if (is_top) - { - print_s("resize top block"); - ptr->size = num; - heap->top = (size_t)ptr->addr + num; -#ifndef TA_DISABLE_SPLIT - } - else if (heap->fresh != NULL) - { - size_t excess = ptr->size - num; - if (excess >= heap_split_thresh) - { - ptr->size = num; - Block *split = heap->fresh; - heap->fresh = split->next; - split->addr = (void *)((size_t)ptr->addr + num); - print_s("split"); - print_i((size_t)split->addr); - split->size = excess; - insert_block(split); -#ifndef TA_DISABLE_COMPACT - compact(); -#endif - } -#endif - } - - return ptr; - } - - prev = ptr; - ptr = ptr->next; - } - // no matching free blocks - // see if any other blocks available - size_t new_top = top + num; - if (heap->fresh != NULL && new_top <= (size_t)heap_limit) - { - ptr = heap->fresh; - heap->fresh = ptr->next; - ptr->addr = (void *)top; - ptr->next = heap->used; - ptr->size = num; - heap->used = ptr; - heap->top = new_top; - return ptr; - } - - return NULL; -} - -static size_t ta_bytes_to_pages(size_t count) -{ - size_t pages = count/(1024*64); - return pages > 0 ? pages : 1; -} - -void *malloc(size_t num) -{ - Block *block = alloc_block(num); - - if(block == NULL) - { - ta_grow(ta_bytes_to_pages(num)); - size_t new_pages = ta_page_count(); - size_t page_diff = new_pages - current_pages; - if(page_diff > 0) - { - current_pages = new_pages; - heap_limit = (void *)ta_PAGE_SIZE(current_pages); - - block = alloc_block(num); - } - } - - return block != NULL ? block->addr : NULL; -} - -static void memclear(void *ptr, size_t num) -{ - size_t *ptrw = (size_t *)ptr; - size_t numw = (num & -sizeof(size_t)) / sizeof(size_t); - while (numw--) - { - *ptrw++ = 0; - } - num &= (sizeof(size_t) - 1); - uint8_t *ptrb = (uint8_t *)ptrw; - while (num--) - { - *ptrb++ = 0; - } -} - -void *calloc(size_t num, size_t size) -{ - num *= size; - Block *block = alloc_block(num); - if (block != NULL) - { - memclear(block->addr, num); - return block->addr; - } - return NULL; -} - -void *realloc(void *ptr, size_t size) -{ - void *new_ptr = malloc(size); - size_t prev_size = ta_ptr_size(ptr); - - __builtin_memcpy(new_ptr, ptr, prev_size); - - free(ptr); - - return new_ptr; -} - -static size_t count_blocks(Block *ptr) -{ - size_t num = 0; - while (ptr != NULL) - { - num++; - ptr = ptr->next; - } - return num; -} - -size_t ta_num_free() -{ - return count_blocks(heap->free); -} - -size_t ta_num_used() -{ - return count_blocks(heap->used); -} - -size_t ta_num_fresh() -{ - return count_blocks(heap->fresh); -} - -bool ta_check() -{ - return heap_max_blocks == ta_num_free() + ta_num_used() + ta_num_fresh(); -} diff --git a/external/tinyalloc/tinyalloc.h b/external/tinyalloc/tinyalloc.h deleted file mode 100644 index c10b68a..0000000 --- a/external/tinyalloc/tinyalloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include - -#define ta_PAGE_SIZE(x)(x*1024*64) - -void ta_init(const size_t heap_blocks, const size_t split_thresh, const size_t alignment); -uint32_t ta_grow(uint32_t pages); -uint32_t ta_page_count(); - -void *malloc(size_t num); -void *calloc(size_t num, size_t size); -void free(void *ptr); -void *realloc(void *ptr, size_t num); - -size_t ta_ptr_size(void *ptr); -size_t ta_num_free(); -size_t ta_num_used(); -size_t ta_num_fresh(); -bool ta_check(); - -#ifdef __cplusplus -} -#endif diff --git a/external/wasmbuild.c b/external/wasmbuild.c deleted file mode 100644 index e69de29..0000000