From 303f428e78cf44f10032e55a69d5d5cd00f5d715 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 19 Nov 2023 15:31:47 +0000 Subject: Split out strings module in runtime --- runtime/src/shed.c | 24 ++---------------------- runtime/src/shed.h | 2 ++ runtime/src/strings.c | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 runtime/src/strings.c (limited to 'runtime/src') diff --git a/runtime/src/shed.c b/runtime/src/shed.c index 05d10c7d..f6d63d0b 100644 --- a/runtime/src/shed.c +++ b/runtime/src/shed.c @@ -14,7 +14,7 @@ uint32_t const PAGE_SIZE = 65536; uint32_t wasm_memory_grow(uint32_t pages); -void* shed__runtime__alloc(uint32_t size) { +void* shed__runtime__alloc(size_t size) { // TODO: implement a more sensible scheme. This allocates a new page on every request. uint32_t previous_page_count = wasm_memory_grow((size + PAGE_SIZE - 1) / PAGE_SIZE); return (void*) (previous_page_count * PAGE_SIZE); @@ -22,28 +22,8 @@ void* shed__runtime__alloc(uint32_t size) { #else -void* shed__runtime__alloc(uint64_t size) { +void* shed__runtime__alloc(size_t size) { return malloc(size); } #endif - -ShedString shed__runtime__string_alloc(ShedStringLength length) { - return shed__runtime__alloc(sizeof(ShedStringLength) + length); -} - -ShedString shed__runtime__string_add(ShedString left, ShedString right) { - ShedStringLength length = left->length + right->length; - ShedString string = shed__runtime__string_alloc(length); - string->length = length; - - for(ShedStringLength i = 0; i < left->length; i++) { - string->data[i] = left->data[i]; - } - - for(ShedStringLength i = 0; i < right->length; i++) { - string->data[left->length + i] = right->data[i]; - } - - return string; -} diff --git a/runtime/src/shed.h b/runtime/src/shed.h index 913bb843..8beab85d 100644 --- a/runtime/src/shed.h +++ b/runtime/src/shed.h @@ -38,4 +38,6 @@ typedef struct ShedClosure* ShedClosurePointer; typedef ShedObject* ShedEnv; +void* shed__runtime__alloc(size_t size); + #endif diff --git a/runtime/src/strings.c b/runtime/src/strings.c new file mode 100644 index 00000000..9a81a4fd --- /dev/null +++ b/runtime/src/strings.c @@ -0,0 +1,21 @@ +#include "./shed.h" + +ShedString shed__runtime__string_alloc(ShedStringLength length) { + return shed__runtime__alloc(sizeof(ShedStringLength) + length); +} + +ShedString shed__runtime__string_add(ShedString left, ShedString right) { + ShedStringLength length = left->length + right->length; + ShedString string = shed__runtime__string_alloc(length); + string->length = length; + + for(ShedStringLength i = 0; i < left->length; i++) { + string->data[i] = left->data[i]; + } + + for(ShedStringLength i = 0; i < right->length; i++) { + string->data[left->length + i] = right->data[i]; + } + + return string; +} -- cgit v1.2.3