abdelrahman/wizapp-stdlib
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add address parameter to wapp_mem_util_alloc

Browse Source
This commit is contained in:
Abdelrahman Said 2024-06-09 01:45:29 +01:00
parent 75bbb82058
commit ccc86342cd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mem/util/mem_utils.c
View File

@ -19,7 +19,7 @@ internal const i32 access_types[] = {
[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE, [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
}; };
internal inline void *alloc_windows(u64 size, MemAccess access, internal inline void *alloc_windows(void *addr, u64 size, MemAccess access,
MemAllocFlags flags); MemAllocFlags flags);
#elif defined(WAPP_PLATFORM_POSIX) #elif defined(WAPP_PLATFORM_POSIX)
#include <sys/mman.h> #include <sys/mman.h>
@ -33,7 +33,7 @@ internal const i32 access_types[] = {
[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC, [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC,
}; };
internal inline void *alloc_posix(u64 size, MemAccess access, internal inline void *alloc_posix(void *addr, u64 size, MemAccess access,
MemAllocFlags flags); MemAllocFlags flags);
#else #else
#error "Unrecognised platform" #error "Unrecognised platform"
@ -62,17 +62,17 @@ void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
return (void *)p; return (void *)p;
} }
void *wapp_mem_util_alloc(u64 size, MemAccess access, MemAllocFlags flags, void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access,
MemInitType type) { MemAllocFlags flags, MemInitType type) {
#if defined(WAPP_PLATFORM_WINDOWS) #if defined(WAPP_PLATFORM_WINDOWS)
// Ensure memory is committed if it's meant to be initialised // Ensure memory is committed if it's meant to be initialised
if (type == WAPP_MEM_INIT_INITIALISED) { if (type == WAPP_MEM_INIT_INITIALISED) {
flags |= WAPP_MEM_ALLOC_COMMIT; flags |= WAPP_MEM_ALLOC_COMMIT;
} }
void *output = alloc_windows(size, access, flags); void *output = alloc_windows(addr, size, access, flags);
#elif defined(WAPP_PLATFORM_POSIX) #elif defined(WAPP_PLATFORM_POSIX)
void *output = alloc_posix(size, access, flags); void *output = alloc_posix(addr, size, access, flags);
#else #else
return NULL; return NULL;
#endif #endif
@ -93,14 +93,14 @@ void wapp_mem_util_free(void *ptr, u64 size) {
} }
#ifdef WAPP_PLATFORM_WINDOWS #ifdef WAPP_PLATFORM_WINDOWS
internal inline void *alloc_windows(u64 size, MemAccess access, internal inline void *alloc_windows(void *addr, u64 size, MemAccess access,
MemAllocFlags flags) { MemAllocFlags flags) {
return VirtualAlloc2(NULL, NULL, (SIZE_T)size, flags, access_types[access]); return VirtualAlloc2(addr, NULL, (SIZE_T)size, flags, access_types[access]);
} }
#endif #endif
#if defined(WAPP_PLATFORM_POSIX) #if defined(WAPP_PLATFORM_POSIX)
internal inline void *alloc_posix(u64 size, MemAccess access, internal inline void *alloc_posix(void *addr, u64 size, MemAccess access,
MemAllocFlags flags) { MemAllocFlags flags) {
i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE; i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
@ -109,6 +109,6 @@ internal inline void *alloc_posix(u64 size, MemAccess access,
alloc_flags |= MAP_NORESERVE; alloc_flags |= MAP_NORESERVE;
#endif #endif
return mmap(NULL, size, access_types[access], alloc_flags, -1, 0); return mmap(addr, size, access_types[access], alloc_flags, -1, 0);
} }
#endif #endif

4
src/mem/util/mem_utils.h
View File

@ -49,8 +49,8 @@ typedef enum mem_init_type {
} MemInitType; } MemInitType;
void *wapp_mem_util_align_forward(void *ptr, u64 alignment); void *wapp_mem_util_align_forward(void *ptr, u64 alignment);
void *wapp_mem_util_alloc(u64 size, MemAccess access, MemAllocFlags flags, void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access,
MemInitType type); MemAllocFlags flags, MemInitType type);
void wapp_mem_util_free(void *ptr, u64 size); void wapp_mem_util_free(void *ptr, u64 size);
#ifdef __cplusplus #ifdef __cplusplus