shared-platform: Remove dependency on shared-utils' bh_memory_remap_slow

Author: wenyongh

core/shared/platform/common/memory/mremap.c

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#include "bh_memutils.h"
+#include "platform_api_vmcore.h"
 
 void *
 os_mremap(void *old_addr, size_t old_size, size_t new_size)
 {
-    return bh_memory_remap_slow(old_addr, old_size, new_size);
+    return os_mremap_slow(old_addr, old_size, new_size);
 }

core/shared/platform/common/posix/platform_api_posix.cmake

@@ -25,6 +25,7 @@ list (REMOVE_AT CMAKE_REQUIRED_DEFINITIONS 0)
 
 if(MREMAP_EXISTS)
     add_definitions (-DWASM_HAVE_MREMAP=1)
+    add_definitions (-D_GNU_SOURCE)
 else()
     add_definitions (-DWASM_HAVE_MREMAP=0)
     include (${CMAKE_CURRENT_LIST_DIR}/../memory/platform_api_memory.cmake)

core/shared/platform/common/posix/posix_memmap.c

@@ -3,12 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#if !defined(_GNU_SOURCE) && WASM_HAVE_MREMAP != 0
-/* Enable mremap */
-#define _GNU_SOURCE
-#include "bh_memutils.h"
-#endif
-
 #include "platform_api_vmcore.h"
 
 #if defined(__APPLE__) || defined(__MACH__)
@@ -252,7 +246,7 @@ os_mremap(void *old_addr, size_t old_size, size_t new_size)
 #if BH_ENABLE_TRACE_MMAP != 0
         os_printf("mremap failed: %d\n", errno);
 #endif
-        return bh_memory_remap_slow(old_addr, old_size, new_size);
+        return os_mremap_slow(old_addr, old_size, new_size);
     }
 
     return ptr;

core/shared/platform/include/platform_api_vmcore.h

@@ -142,6 +142,24 @@ os_munmap(void *addr, size_t size);
 int
 os_mprotect(void *addr, size_t size, int prot);
 
+static inline void *
+os_mremap_slow(void *old_addr, size_t old_size, size_t new_size)
+{
+    void *new_memory =
+        os_mmap(NULL, new_size, MMAP_PROT_WRITE | MMAP_PROT_READ, 0, -1);
+    if (!new_memory) {
+        return NULL;
+    }
+    /*
+     * bh_memcpy_s can't be used as it doesn't support values bigger than
+     * UINT32_MAX
+     */
+    memcpy(new_memory, old_addr, new_size < old_size ? new_size : old_size);
+    os_munmap(old_addr, old_size);
+
+    return new_memory;
+}
+
 /* Doesn't guarantee that protection flags will be preserved.
    os_mprotect() must be called after remapping. */
 void *

core/shared/utils/bh_memutils.c

@@ -8,17 +8,5 @@
 void *
 bh_memory_remap_slow(void *old_addr, size_t old_size, size_t new_size)
 {
-    void *new_memory =
-        os_mmap(NULL, new_size, MMAP_PROT_WRITE | MMAP_PROT_READ, 0, -1);
-    if (!new_memory) {
-        return NULL;
-    }
-    /*
-     * bh_memcpy_s can't be used as it doesn't support values bigger than
-     * UINT32_MAX
-     */
-    memcpy(new_memory, old_addr, new_size < old_size ? new_size : old_size);
-    os_munmap(old_addr, old_size);
-
-    return new_memory;
+    return os_mremap_slow(old_addr, old_size, new_size);
 }