diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-12-17 14:48:05 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-12-17 14:48:05 +0100 |
| commit | 13f5ec1524d6bb2891115fc4c9a68822e7265223 (patch) | |
| tree | 631d0c2ad36c97cfb747ba2d3fd864ed7df2edae /src | |
| parent | e751d41ba77846e6f62d49d238d9bd31cbaa8cbd (diff) | |
| download | box64-13f5ec1524d6bb2891115fc4c9a68822e7265223.tar.gz box64-13f5ec1524d6bb2891115fc4c9a68822e7265223.zip | |
[BOX32] Small change on how tls memory is allocated
Diffstat (limited to 'src')
| -rw-r--r-- | src/box64context.c | 4 | ||||
| -rw-r--r-- | src/emu/x64tls.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/box64context.c b/src/box64context.c index b88f3808..d88d8530 100644 --- a/src/box64context.c +++ b/src/box64context.c @@ -77,8 +77,8 @@ void free_tlsdatasize(void* p) if(!p) return; tlsdatasize_t *data = (tlsdatasize_t*)p; - box_free(data->ptr); - box_free(p); + actual_free(data->ptr); + actual_free(p); if(my_context) pthread_setspecific(my_context->tlskey, NULL); } diff --git a/src/emu/x64tls.c b/src/emu/x64tls.c index 99ae188c..16d4193e 100644 --- a/src/emu/x64tls.c +++ b/src/emu/x64tls.c @@ -266,10 +266,10 @@ static tlsdatasize_t* setupTLSData(box64context_t* context) // Setup the GS segment: int dtssize = sizeDTS(context); int datasize = sizeTLSData(context->tlssize); - void *ptr_oversized = (char*)box_malloc(dtssize+(box64_is32bits?POS_TLS_32:POS_TLS)+datasize); + void *ptr_oversized = (char*)actual_malloc(dtssize+(box64_is32bits?POS_TLS_32:POS_TLS)+datasize); void *ptr = (void*)((uintptr_t)ptr_oversized + datasize); memcpy((void*)((uintptr_t)ptr-context->tlssize), context->tlsdata, context->tlssize); - tlsdatasize_t *data = (tlsdatasize_t*)box_calloc(1, sizeof(tlsdatasize_t)); + tlsdatasize_t *data = (tlsdatasize_t*)actual_calloc(1, sizeof(tlsdatasize_t)); data->data = ptr; data->tlssize = context->tlssize; data->ptr = ptr_oversized; |