mirror of
https://github.com/bytecodealliance/wasm-micro-runtime.git
synced 2026-04-18 18:18:44 +00:00
Merge eda6bba505 into 4b306f0fc3
This commit is contained in:
Joe van den Heuvel
GitHub
commit
36990eb2c1
|
|
@ -30,7 +30,7 @@ set (CMAKE_C_STANDARD 99)
|
|||
# "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]",
|
||||
# "MIPS", "XTENSA", "RISCV64[sub]", "RISCV32[sub]"
|
||||
if (NOT DEFINED WAMR_BUILD_TARGET)
|
||||
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)")
|
||||
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64|ARM64|AARCH64)")
|
||||
set (WAMR_BUILD_TARGET "AARCH64")
|
||||
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
|
||||
set (WAMR_BUILD_TARGET "RISCV64")
|
||||
|
|
|
|||
|
|
@ -188,7 +188,11 @@ file (GLOB header
|
|||
LIST (APPEND RUNTIME_LIB_HEADER_LIST ${header})
|
||||
|
||||
if (WAMR_BUILD_PLATFORM STREQUAL "windows")
|
||||
enable_language (ASM_MASM)
|
||||
if(WAMR_BUILD_TARGET STREQUAL "AARCH64")
|
||||
enable_language (ASM_MARMASM)
|
||||
else()
|
||||
enable_language (ASM_MASM)
|
||||
endif()
|
||||
else()
|
||||
enable_language (ASM)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# global additional warnings.
|
||||
if (MSVC)
|
||||
# warning level 4
|
||||
add_compile_options(/W4)
|
||||
add_compile_options($<$<COMPILE_LANGUAGE:C>:/W4>)
|
||||
else ()
|
||||
# refer to https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
|
||||
add_compile_options(
|
||||
|
|
|
|||
|
|
@ -53,17 +53,15 @@ invokeNative
|
|||
mov x21, x2 ; x21 = nstacks
|
||||
mov x22, sp ; save the sp before call function
|
||||
|
||||
; Fill in floating-point registers
|
||||
; Fill in floating-point registers (Windows ARM64)
|
||||
ldp d0, d1, [x20], #16
|
||||
ldp d2, d3, [x20], #16
|
||||
ldp d4, d5, [x20], #16
|
||||
ldp d6, d7, [x20], #16
|
||||
|
||||
; Fill integer registers
|
||||
ldp x0, x1, [x20], #16 ; x0 = argv[8] = exec_env, x1 = argv[9]
|
||||
ldp x2, x3, [x20], #16
|
||||
ldp x4, x5, [x20], #16
|
||||
ldp x6, x7, [x20], #16
|
||||
ldp x0, x1, [x20], #16 ; x0 = exec_env, x1 = argv[1]
|
||||
ldp x2, x3, [x20], #16 ; x2 = argv[2], x3 = argv[3]
|
||||
ldp x4, x5, [x20], #16 ; x4 = argv[4], x5 = argv[5]
|
||||
ldp x6, x7, [x20], #16 ; x6 = argv[6], x7 = argv[7]
|
||||
|
||||
; Now x20 points to stack args
|
||||
cmp x21, #0
|
||||
|
|
|
|||
|
|
@ -4,12 +4,18 @@
|
|||
set (IWASM_COMMON_DIR ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
include_directories (${IWASM_COMMON_DIR})
|
||||
if (MSVC AND WAMR_BUILD_PLATFORM STREQUAL "windows" AND WAMR_BUILD_TARGET MATCHES "AARCH64.*")
|
||||
if (DEFINED ENV{VCToolsInstallDir})
|
||||
if (MSVC AND WAMR_BUILD_PLATFORM STREQUAL "windows" AND WAMR_BUILD_TARGET MATCHES "AARCH64.*" AND NOT WAMR_BUILD_WAMR_COMPILER)
|
||||
if (CMAKE_ASM_MARMASM_COMPILER)
|
||||
# Use the already detected assembler
|
||||
set(_ARMASM64_EXE "${CMAKE_ASM_MARMASM_COMPILER}")
|
||||
elseif (DEFINED ENV{VCToolsInstallDir} OR VCToolsInstallDir)
|
||||
if (NOT VCToolsInstallDir)
|
||||
set(VCToolsInstallDir "$ENV{VCToolsInstallDir}")
|
||||
endif()
|
||||
# Detect host tool dir
|
||||
set(_ARMASM64_CANDIDATES
|
||||
"$ENV{VCToolsInstallDir}/bin/HostX64/ARM64/armasm64.exe"
|
||||
"$ENV{VCToolsInstallDir}/bin/HostARM64/arm64/armasm64.exe")
|
||||
"${VCToolsInstallDir}bin/Hostx64/arm64/armasm64.exe"
|
||||
"${VCToolsInstallDir}bin/Hostarm64/arm64/armasm64.exe")
|
||||
set(_ARMASM64_EXE "")
|
||||
foreach(_p IN LISTS _ARMASM64_CANDIDATES)
|
||||
if (EXISTS "${_p}")
|
||||
|
|
@ -18,27 +24,42 @@ if (MSVC AND WAMR_BUILD_PLATFORM STREQUAL "windows" AND WAMR_BUILD_TARGET MATCHE
|
|||
endif()
|
||||
endforeach()
|
||||
if (_ARMASM64_EXE STREQUAL "")
|
||||
message(FATAL_ERROR "armasm64.exe not found under VCToolsInstallDir")
|
||||
message(FATAL_ERROR "armasm64.exe not found under VCToolsInstallDir: ${VCToolsInstallDir}")
|
||||
endif()
|
||||
|
||||
# Wrapper without spaces to avoid quoting hell on NMake/cmd.exe
|
||||
set(_WRAP "${CMAKE_BINARY_DIR}/armasm64_wrapper.bat")
|
||||
file(WRITE "${_WRAP}"
|
||||
"@echo off\r\n\"${_ARMASM64_EXE}\" %*\r\n")
|
||||
|
||||
# Use wrapper as compiler (no spaces in path)
|
||||
set(CMAKE_ASM_MASM_COMPILER
|
||||
"${_WRAP}"
|
||||
CACHE FILEPATH "" FORCE)
|
||||
|
||||
# Quote ONLY object and source (compiler path has no spaces now)
|
||||
set(CMAKE_ASM_MASM_COMPILE_OBJECT
|
||||
"<CMAKE_ASM_MASM_COMPILER> /nologo -o \"<OBJECT>\" \"<SOURCE>\""
|
||||
CACHE STRING "" FORCE)
|
||||
|
||||
else()
|
||||
message(FATAL_ERROR "VCToolsInstallDir is not defined. Please run from a Developer Command Prompt or specify armasm64.exe manually.")
|
||||
endif()
|
||||
|
||||
# Wrapper without spaces to avoid quoting hell on NMake/cmd.exe
|
||||
set(_WRAP "${CMAKE_BINARY_DIR}/armasm64_wrapper.bat")
|
||||
file(WRITE "${_WRAP}"
|
||||
"@echo off\r\n"
|
||||
"setlocal enabledelayedexpansion\r\n"
|
||||
"set ARGS=\r\n"
|
||||
"for %%A in (%*) do (\r\n"
|
||||
" if /I not \"%%~A\"==\"/experimental:c11atomics\" (\r\n"
|
||||
" set ARGS=!ARGS! %%A\r\n"
|
||||
" )\r\n"
|
||||
")\r\n"
|
||||
"\"${_ARMASM64_EXE}\" !ARGS!\r\n")
|
||||
|
||||
# Use wrapper as compiler (no spaces in path)
|
||||
set(CMAKE_ASM_MASM_COMPILER
|
||||
"${_WRAP}"
|
||||
CACHE FILEPATH "" FORCE)
|
||||
|
||||
set(CMAKE_ASM_MARMASM_COMPILER
|
||||
"${_WRAP}"
|
||||
CACHE FILEPATH "" FORCE)
|
||||
|
||||
# Quote ONLY object and source (compiler path has no spaces now)
|
||||
set(CMAKE_ASM_MASM_COMPILE_OBJECT
|
||||
"<CMAKE_ASM_MASM_COMPILER> /nologo -o \"<OBJECT>\" \"<SOURCE>\""
|
||||
CACHE STRING "" FORCE)
|
||||
|
||||
set(CMAKE_ASM_MARMASM_COMPILE_OBJECT
|
||||
"<CMAKE_ASM_MARMASM_COMPILER> /nologo -o \"<OBJECT>\" \"<SOURCE>\""
|
||||
CACHE STRING "" FORCE)
|
||||
endif()
|
||||
|
||||
add_definitions(-DBH_MALLOC=wasm_runtime_malloc)
|
||||
|
|
@ -61,7 +82,7 @@ if (CMAKE_OSX_ARCHITECTURES)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if (WAMR_BUILD_INVOKE_NATIVE_GENERAL EQUAL 1)
|
||||
if (WAMR_BUILD_INVOKE_NATIVE_GENERAL EQUAL 1 AND NOT (MSVC AND WAMR_BUILD_PLATFORM STREQUAL "windows" AND WAMR_BUILD_TARGET MATCHES "AARCH64.*"))
|
||||
# Use invokeNative C version instead of asm code version
|
||||
# if WAMR_BUILD_INVOKE_NATIVE_GENERAL is explicitly set.
|
||||
# Note:
|
||||
|
|
@ -117,15 +138,21 @@ elseif (WAMR_BUILD_TARGET MATCHES "AARCH64.*")
|
|||
if (NOT WAMR_BUILD_SIMD EQUAL 1)
|
||||
if (WAMR_BUILD_PLATFORM STREQUAL "windows")
|
||||
if (MSVC)
|
||||
set (source_all ${c_source_all} ${IWASM_COMMON_DIR}/arch/invokeNative_armasm64.asm)
|
||||
set(_WAMR_ARM64_MASM_SOURCES ${IWASM_COMMON_DIR}/arch/invokeNative_armasm64.asm)
|
||||
set_source_files_properties(${_WAMR_ARM64_MASM_SOURCES}
|
||||
PROPERTIES
|
||||
LANGUAGE ASM_MASM
|
||||
COMPILE_DEFINITIONS ""
|
||||
INCLUDE_DIRECTORIES ""
|
||||
COMPILE_OPTIONS "/nologo"
|
||||
set(_WAMR_ARM64_MASM_SOURCE ${IWASM_COMMON_DIR}/arch/invokeNative_armasm64.asm)
|
||||
set(_WAMR_ARM64_MASM_OBJ ${CMAKE_CURRENT_BINARY_DIR}/invokeNative_armasm64.obj)
|
||||
add_custom_command(
|
||||
OUTPUT ${_WAMR_ARM64_MASM_OBJ}
|
||||
COMMAND ${CMAKE_ASM_MASM_COMPILER} /nologo -o "${_WAMR_ARM64_MASM_OBJ}" "${_WAMR_ARM64_MASM_SOURCE}"
|
||||
DEPENDS ${_WAMR_ARM64_MASM_SOURCE}
|
||||
COMMENT "Assembling invokeNative_armasm64.asm"
|
||||
VERBATIM
|
||||
)
|
||||
set_source_files_properties(${_WAMR_ARM64_MASM_OBJ}
|
||||
PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE
|
||||
)
|
||||
set (source_all ${c_source_all} ${_WAMR_ARM64_MASM_OBJ})
|
||||
else ()
|
||||
set (source_all ${c_source_all} ${IWASM_COMMON_DIR}/arch/invokeNative_aarch64.s)
|
||||
endif ()
|
||||
else ()
|
||||
set (source_all ${c_source_all} ${IWASM_COMMON_DIR}/arch/invokeNative_aarch64.s)
|
||||
|
|
@ -133,15 +160,21 @@ elseif (WAMR_BUILD_TARGET MATCHES "AARCH64.*")
|
|||
else()
|
||||
if (WAMR_BUILD_PLATFORM STREQUAL "windows")
|
||||
if (MSVC)
|
||||
set (source_all ${c_source_all} ${IWASM_COMMON_DIR}/arch/invokeNative_armasm64_simd.asm)
|
||||
set(_WAMR_ARM64_MASM_SOURCES_SIMD ${IWASM_COMMON_DIR}/arch/invokeNative_armasm64_simd.asm)
|
||||
set_source_files_properties(${_WAMR_ARM64_MASM_SOURCES_SIMD}
|
||||
PROPERTIES
|
||||
LANGUAGE ASM_MASM
|
||||
COMPILE_DEFINITIONS ""
|
||||
INCLUDE_DIRECTORIES ""
|
||||
COMPILE_OPTIONS "/nologo"
|
||||
set(_WAMR_ARM64_MASM_SIMD_SOURCE ${IWASM_COMMON_DIR}/arch/invokeNative_armasm64_simd.asm)
|
||||
set(_WAMR_ARM64_MASM_SIMD_OBJ ${CMAKE_CURRENT_BINARY_DIR}/invokeNative_armasm64_simd.obj)
|
||||
add_custom_command(
|
||||
OUTPUT ${_WAMR_ARM64_MASM_SIMD_OBJ}
|
||||
COMMAND ${CMAKE_ASM_MASM_COMPILER} /nologo -o "${_WAMR_ARM64_MASM_SIMD_OBJ}" "${_WAMR_ARM64_MASM_SIMD_SOURCE}"
|
||||
DEPENDS ${_WAMR_ARM64_MASM_SIMD_SOURCE}
|
||||
COMMENT "Assembling invokeNative_armasm64_simd.asm"
|
||||
VERBATIM
|
||||
)
|
||||
set_source_files_properties(${_WAMR_ARM64_MASM_SIMD_OBJ}
|
||||
PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE
|
||||
)
|
||||
set (source_all ${c_source_all} ${_WAMR_ARM64_MASM_SIMD_OBJ})
|
||||
else ()
|
||||
set (source_all ${c_source_all} ${IWASM_COMMON_DIR}/arch/invokeNative_aarch64_simd.s)
|
||||
endif ()
|
||||
else ()
|
||||
set (source_all ${c_source_all} ${IWASM_COMMON_DIR}/arch/invokeNative_aarch64_simd.s)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ set(CMAKE_CXX_STANDARD 17)
|
|||
# Set WAMR_BUILD_TARGET, currently values supported:
|
||||
# "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]", "MIPS", "XTENSA"
|
||||
if (NOT DEFINED WAMR_BUILD_TARGET)
|
||||
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64|ARM64|AARCH64)")
|
||||
set (WAMR_BUILD_TARGET "AARCH64")
|
||||
elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
# Build as X86_64 by default in 64-bit platform
|
||||
set (WAMR_BUILD_TARGET "X86_64")
|
||||
elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,11 @@ if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
|
|||
project (aot-compiler)
|
||||
else()
|
||||
project (aot-compiler C ASM CXX)
|
||||
enable_language (ASM_MASM)
|
||||
if (WAMR_BUILD_TARGET STREQUAL "AARCH64")
|
||||
enable_language (ASM_MARMASM)
|
||||
else()
|
||||
enable_language (ASM_MASM)
|
||||
endif()
|
||||
add_definitions(-DCOMPILING_WASM_RUNTIME_API=1)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user