some update

TianlongLiang · Mar 18, 2024 · 8d8bf3b · 8d8bf3b
1 parent ac1f00b
commit 8d8bf3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/build-scripts/config_common.cmake b/build-scripts/config_common.cmake
@@ -249,6 +249,12 @@ else ()
   add_definitions (-DWASM_ENABLE_SHARED_MEMORY=0)
 endif ()
 if (WAMR_BUILD_MEMORY64 EQUAL 1)
+  # if native is 32-bit or cross-compiled to 32-bit
+  include(CheckCCompilerFlag)
+  Check_C_Compiler_Flag(-m32 M32_OK)
+  if ((NOT CMAKE_SIZEOF_VOID_P EQUAL 8) OR M32_OK OR (WAMR_BUILD_TARGET STREQUAL "X86_32"))
+    message (FATAL_ERROR "-- Memory64 is only available on the 64-bit platform/target")
+  endif()
   add_definitions (-DWASM_ENABLE_MEMORY64=1)
   set(WAMR_DISABLE_HW_BOUND_CHECK 1)
   message ("     Memory64 memory enabled")

diff --git a/core/iwasm/interpreter/wasm_runtime.h b/core/iwasm/interpreter/wasm_runtime.h
@@ -103,7 +103,7 @@ struct WASMMemoryInstance {
     /* Whether the memory is shared */
     uint8 is_shared_memory;
 
-    /* Whether the memory is 64-bit memory addresses */
+    /* Whether the memory has 64-bit memory addresses */
     uint8 is_memory64;
 
     /* Reference count of the memory instance: