src/mem/util/mem_utils.c

@@ -1,43 +1,8 @@
 #include "mem_utils.h"
 #include "aliases.h"
-#include "platform.h"
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
-
-#if defined(WAPP_PLATFORM_WINDOWS)
-#include <Windows.h>
-#include <memoryapi.h>
-
-internal 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,
-};
-
-internal inline void *alloc_windows(u64 size, MemAccess access,
-                                    MemAllocFlags flags);
-#elif defined(WAPP_PLATFORM_POSIX)
-#include <sys/mman.h>
-
-internal 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,
-};
-
-internal inline void *alloc_posix(u64 size, MemAccess access,
-                                  MemAllocFlags flags);
-#else
-#error "Unrecognised platform"
-#endif
 
 internal bool is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
 
@@ -61,48 +26,3 @@ void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
 
   return (void *)p;
 }
-
-void *wapp_mem_util_alloc(u64 size, MemAccess access, MemAllocFlags flags,
-                          MemInitType type) {
-#if defined(WAPP_PLATFORM_WINDOWS)
-  void *output = alloc_windows(size, access, flags);
-#elif defined(WAPP_PLATFORM_POSIX)
-  void *output = alloc_posix(size, access, flags);
-#else
-  return NULL;
-#endif
-
-  if (type == WAPP_MEM_INIT_INITIALISED) {
-    memset(output, 0, size);
-  }
-
-  return output;
-}
-
-void wapp_mem_util_free(void *ptr, u64 size) {
-#if defined(WAPP_PLATFORM_WINDOWS)
-  VirtualFree(ptr, size, MEM_RELEASE);
-#elif defined(WAPP_PLATFORM_POSIX)
-  munmap(ptr, size);
-#endif
-}
-
-#ifdef WAPP_PLATFORM_WINDOWS
-internal inline void *alloc_windows(u64 size, MemAccess access,
-                                    MemAllocFlags flags) {
-  return VirtualAlloc2(NULL, NULL, (SIZE_T)size, flags, access_types[access]);
-}
-#endif
-
-#if defined(WAPP_PLATFORM_POSIX)
-internal inline void *alloc_posix(u64 size, MemAccess access,
-                                  MemAllocFlags flags) {
-  i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
-
-#ifdef WAPP_PLATFORM_LINUX
-  alloc_flags |= MAP_NORESERVE;
-#endif
-
-  return mmap(NULL, size, access_types[access], alloc_flags, -1, 0);
-}
-#endif

src/mem/util/mem_utils.h

@@ -2,49 +2,12 @@
 #define MEM_UTILS_H
 
 #include "aliases.h"
-#include "platform.h"
-
-#if defined(WAPP_PLATFORM_WINDOWS)
-#include <Windows.h>
-#include <memoryapi.h>
-#elif defined(WAPP_PLATFORM_POSIX)
-#include <sys/mman.h>
-#else
-#error "Unrecognised platform"
-#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-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 mem_alloc_flags {
-#if defined(WAPP_PLATFORM_WINDOWS)
-  WAPP_MEM_ALLOC_RESERVE = MEM_RESERVE,
-  WAPP_MEM_ALLOC_COMMIT = MEM_COMMIT,
-#elif defined(WAPP_PLATFORM_POSIX)
-  WAPP_MEM_ALLOC_RESERVE = 0,
-  WAPP_MEM_ALLOC_COMMIT = MAP_POPULATE,
-#endif
-} MemAllocFlags;
-
-typedef enum mem_init_type {
-  WAPP_MEM_INIT_UNINITIALISED,
-  WAPP_MEM_INIT_INITIALISED,
-} MemInitType;
-
 void *wapp_mem_util_align_forward(void *ptr, u64 alignment);
-void *wapp_mem_util_alloc(u64 size, MemAccess access, MemAllocFlags flags,
-                          MemInitType type);
-void wapp_mem_util_free(void *ptr, u64 size);
 
 #ifdef __cplusplus
 }

src/platform/platform.h

@@ -1,61 +0,0 @@
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-#if defined(__ANDROID__)
-#define WAPP_PLATFORM_ANDROID
-#define WAPP_PLATFORM_POSIX
-#elif defined(__FreeBSD__)
-#define WAPP_PLATFORM_FREE_BSD
-#define WAPP_PLATFORM_BSD
-#define WAPP_PLATFORM_POSIX
-#elif defined(__NetBSD__)
-#define WAPP_PLATFORM_NET_BSD
-#define WAPP_PLATFORM_BSD
-#define WAPP_PLATFORM_POSIX
-#elif defined(__OpenBSD__)
-#define WAPP_PLATFORM_OPEN_BSD
-#define WAPP_PLATFORM_BSD
-#define WAPP_PLATFORM_POSIX
-#elif defined(__DragonFly__)
-#define WAPP_PLATFORM_DRAGON_FLY
-#define WAPP_PLATFORM_BSD
-#define WAPP_PLATFORM_POSIX
-#elif defined(__bsdi__)
-#define WAPP_PLATFORM_BSD
-#define WAPP_PLATFORM_POSIX
-#elif defined(__linux__) || defined(linux) || defined(__linux) ||              \
-    defined(__gnu_linux__)
-#define WAPP_PLATFORM_LINUX
-#define WAPP_PLATFORM_POSIX
-#elif defined(__GNU__) || defined(__gnu_hurd__)
-#define WAPP_PLATFORM_GNU
-#define WAPP_PLATFORM_POSIX
-#elif defined(__APPLE__) || defined(__MACH__)
-#if TARGET_OS_IPHONE
-#define WAPP_PLATFORM_IOS
-#define WAPP_PLATFORM_APPLE
-#define WAPP_PLATFORM_POSIX
-#elif TARGET_OS_MAC
-#define WAPP_PLATFORM_MACOS
-#define WAPP_PLATFORM_APPLE
-#define WAPP_PLATFORM_POSIX
-#else
-#error "Unrecognised Apple platform"
-#endif
-#elif defined(_WIN64)
-#define WAPP_PLATFORM_WINDOWS64
-#define WAPP_PLATFORM_WINDOWS
-#elif defined(_WIN32)
-#define WAPP_PLATFORM_WINDOWS32
-#define WAPP_PLATFORM_WINDOWS
-#elif defined(__CYGWIN__)
-#define WAPP_PLATFORM_CYGWIN
-#define WAPP_PLATFORM_WINDOWS
-#elif defined(__unix__) || defined(__unix)
-#define WAPP_PLATFORM_UNIX
-#define WAPP_PLATFORM_POSIX
-#else
-#error "Unrecognised platform"
-#endif
-
-#endif // !PLATFORM_H