diff --git a/src/os/mem/mem_os.c b/src/os/mem/mem_os.c index 30fb872..792addf 100644 --- a/src/os/mem/mem_os.c +++ b/src/os/mem/mem_os.c @@ -15,16 +15,16 @@ #error "Unrecognised platform" #endif -void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) { - void *output = os_mem_allocate(addr, size, access, flags, type); +void *wpOsMemAlloc(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type) { + void *output = _osMemAllocate(addr, size, access, flags, type); - if (type == WAPP_MEM_INIT_INITIALISED) { + if (type == WP_MEM_INIT_INITIALISED) { memset(output, 0, size); } return output; } -void wapp_os_mem_free(void *ptr, u64 size) { - os_mem_free(ptr, size); +void wpOsMemFree(void *ptr, u64 size) { + _osMemFree(ptr, size); } diff --git a/src/os/mem/mem_os.h b/src/os/mem/mem_os.h index d508786..6ece5d4 100644 --- a/src/os/mem/mem_os.h +++ b/src/os/mem/mem_os.h @@ -20,11 +20,11 @@ BEGIN_C_LINKAGE #error "Unrecognised platform" #endif -void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type); -void wapp_os_mem_free(void *ptr, u64 size); +void *wpOsMemAlloc(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type); +void wpOsMemFree(void *ptr, u64 size); -wp_extern void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type); -wp_extern void os_mem_free(void *ptr, u64 size); +wp_extern void *_osMemAllocate(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type); +wp_extern void _osMemFree(void *ptr, u64 size); #ifdef WP_PLATFORM_CPP END_C_LINKAGE diff --git a/src/os/mem/mem_os_ops.h b/src/os/mem/mem_os_ops.h index 2c3c16f..8184e38 100644 --- a/src/os/mem/mem_os_ops.h +++ b/src/os/mem/mem_os_ops.h @@ -9,19 +9,19 @@ BEGIN_C_LINKAGE #endif // !WP_PLATFORM_CPP -typedef enum mem_access { - WAPP_MEM_ACCESS_NONE, - WAPP_MEM_ACCESS_READ_ONLY, - WAPP_MEM_ACCESS_EXEC_ONLY, - WAPP_MEM_ACCESS_READ_WRITE, - WAPP_MEM_ACCESS_READ_EXEC, - WAPP_MEM_ACCESS_READ_WRITE_EXEC, -} MemAccess; +typedef enum { + WP_MEM_ACCESS_NONE, + WP_MEM_ACCESS_READ_ONLY, + WP_MEM_ACCESS_EXEC_ONLY, + WP_MEM_ACCESS_READ_WRITE, + WP_MEM_ACCESS_READ_EXEC, + WP_MEM_ACCESS_READ_WRITE_EXEC, +} WpMemAccess; -typedef enum mem_init_type { - WAPP_MEM_INIT_UNINITIALISED, - WAPP_MEM_INIT_INITIALISED, -} MemInitType; +typedef enum { + WP_MEM_INIT_UNINITIALISED, + WP_MEM_INIT_INITIALISED, +} WpMemInitType; #ifdef WP_PLATFORM_CPP END_C_LINKAGE diff --git a/src/os/mem/posix/mem_os_posix.c b/src/os/mem/posix/mem_os_posix.c index 0a43370..23cddda 100644 --- a/src/os/mem/posix/mem_os_posix.c +++ b/src/os/mem/posix/mem_os_posix.c @@ -10,15 +10,15 @@ #include wp_intern const i32 access_types[] = { - [WAPP_MEM_ACCESS_NONE] = PROT_NONE, - [WAPP_MEM_ACCESS_READ_ONLY] = PROT_READ, - [WAPP_MEM_ACCESS_EXEC_ONLY] = PROT_EXEC, - [WAPP_MEM_ACCESS_READ_WRITE] = PROT_READ | PROT_WRITE, - [WAPP_MEM_ACCESS_READ_EXEC] = PROT_READ | PROT_EXEC, - [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC, + [WP_MEM_ACCESS_NONE] = PROT_NONE, + [WP_MEM_ACCESS_READ_ONLY] = PROT_READ, + [WP_MEM_ACCESS_EXEC_ONLY] = PROT_EXEC, + [WP_MEM_ACCESS_READ_WRITE] = PROT_READ | PROT_WRITE, + [WP_MEM_ACCESS_READ_EXEC] = PROT_READ | PROT_EXEC, + [WP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC, }; -void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) { +void *_osMemAllocate(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type) { (void)type; i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE; @@ -29,7 +29,7 @@ void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flag return mmap(addr, size, access_types[access], alloc_flags, -1, 0); } -void os_mem_free(void *ptr, u64 size) { +void _osMemFree(void *ptr, u64 size) { munmap(ptr, size); } diff --git a/src/os/mem/posix/mem_os_posix.h b/src/os/mem/posix/mem_os_posix.h index c797b93..9f2805b 100644 --- a/src/os/mem/posix/mem_os_posix.h +++ b/src/os/mem/posix/mem_os_posix.h @@ -13,18 +13,18 @@ BEGIN_C_LINKAGE #include -typedef enum mem_alloc_flags { +typedef enum { #if defined(WP_PLATFORM_LINUX) || defined(WP_PLATFORM_GNU) - WAPP_MEM_ALLOC_RESERVE = 0, - WAPP_MEM_ALLOC_COMMIT = MAP_POPULATE, + WP_MEM_ALLOC_RESERVE = 0, + WP_MEM_ALLOC_COMMIT = MAP_POPULATE, #elif defined(WP_PLATFORM_FREE_BSD) - WAPP_MEM_ALLOC_RESERVE = 0, - WAPP_MEM_ALLOC_COMMIT = MAP_PREFAULT_READ, + WP_MEM_ALLOC_RESERVE = 0, + WP_MEM_ALLOC_COMMIT = MAP_PREFAULT_READ, #elif defined(WP_PLATFORM_BSD) || defined(WP_PLATFORM_UNIX) || defined(WP_PLATFORM_APPLE) - WAPP_MEM_ALLOC_RESERVE = 0, - WAPP_MEM_ALLOC_COMMIT = 0, + WP_MEM_ALLOC_RESERVE = 0, + WP_MEM_ALLOC_COMMIT = 0, #endif -} MemAllocFlags; +} WpMemAllocFlags; #endif // !WP_PLATFORM_POSIX diff --git a/src/os/mem/win/mem_os_win.c b/src/os/mem/win/mem_os_win.c index 191c59b..a7e6e5f 100644 --- a/src/os/mem/win/mem_os_win.c +++ b/src/os/mem/win/mem_os_win.c @@ -13,24 +13,24 @@ #include wp_intern const i32 access_types[] = { - [WAPP_MEM_ACCESS_NONE] = PAGE_NOACCESS, - [WAPP_MEM_ACCESS_READ_ONLY] = PAGE_READONLY, - [WAPP_MEM_ACCESS_EXEC_ONLY] = PAGE_EXECUTE, - [WAPP_MEM_ACCESS_READ_WRITE] = PAGE_READWRITE, - [WAPP_MEM_ACCESS_READ_EXEC] = PAGE_EXECUTE_READ, - [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE, + [WP_MEM_ACCESS_NONE] = PAGE_NOACCESS, + [WP_MEM_ACCESS_READ_ONLY] = PAGE_READONLY, + [WP_MEM_ACCESS_EXEC_ONLY] = PAGE_EXECUTE, + [WP_MEM_ACCESS_READ_WRITE] = PAGE_READWRITE, + [WP_MEM_ACCESS_READ_EXEC] = PAGE_EXECUTE_READ, + [WP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE, }; -void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) { +void *_osMemAllocate(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type) { // Ensure memory is committed if it's meant to be initialised - if (type == WAPP_MEM_INIT_INITIALISED) { - flags |= WAPP_MEM_ALLOC_COMMIT; + if (type == WP_MEM_INIT_INITIALISED) { + flags |= WP_MEM_ALLOC_COMMIT; } return VirtualAlloc(addr, (SIZE_T)size, flags, access_types[access]); } -void os_mem_free(void *ptr, u64 size) { +void _osMemFree(void *ptr, u64 size) { VirtualFree(ptr, size, MEM_RELEASE); } diff --git a/src/os/mem/win/mem_os_win.h b/src/os/mem/win/mem_os_win.h index 911eae3..229caad 100644 --- a/src/os/mem/win/mem_os_win.h +++ b/src/os/mem/win/mem_os_win.h @@ -15,10 +15,10 @@ BEGIN_C_LINKAGE #include #include -typedef enum mem_alloc_flags { - WAPP_MEM_ALLOC_RESERVE = MEM_RESERVE, - WAPP_MEM_ALLOC_COMMIT = MEM_COMMIT, -} MemAllocFlags; +typedef enum { + WP_MEM_ALLOC_RESERVE = MEM_RESERVE, + WP_MEM_ALLOC_COMMIT = MEM_COMMIT, +} WpMemAllocFlags; #endif // !WP_PLATFORM_WINDOWS