gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-08 20:56:13 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix compile warnings on windows platform (#2208)

Browse Source
This commit is contained in:
Wenyong Huang 2023-05-15 13:48:48 +08:00 committed by GitHub
parent 0899638ece
commit 1e5f206464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/iwasm/common/wasm_shared_memory.c
View File

@ -384,7 +384,7 @@ wasm_runtime_atomic_wait(WASMModuleInstanceCommon *module, void *address,
/* unit of timeout is nsec, convert it to usec */ /* unit of timeout is nsec, convert it to usec */
timeout_left = (uint64)timeout / 1000; timeout_left = (uint64)timeout / 1000;
timeout_1sec = 1e6; timeout_1sec = (uint64)1e6;
while (1) { while (1) {
if (timeout < 0) { if (timeout < 0) {

6
core/iwasm/interpreter/wasm_interp_classic.c
View File

@ -270,7 +270,7 @@ local_copysignf(float x, float y)
{ {
union { union {
float f; float f;
uint32_t i; uint32 i;
} ux = { x }, uy = { y }; } ux = { x }, uy = { y };
ux.i &= 0x7fffffff; ux.i &= 0x7fffffff;
ux.i |= uy.i & 0x80000000; ux.i |= uy.i & 0x80000000;
@ -282,9 +282,9 @@ local_copysign(double x, double y)
{ {
union { union {
double f; double f;
uint64_t i; uint64 i;
} ux = { x }, uy = { y }; } ux = { x }, uy = { y };
ux.i &= -1ULL / 2; ux.i &= UINT64_MAX / 2;
ux.i |= uy.i & 1ULL << 63; ux.i |= uy.i & 1ULL << 63;
return ux.f; return ux.f;
} }

6
core/iwasm/interpreter/wasm_interp_fast.c
View File

@ -232,7 +232,7 @@ local_copysignf(float x, float y)
{ {
union { union {
float f; float f;
uint32_t i; uint32 i;
} ux = { x }, uy = { y }; } ux = { x }, uy = { y };
ux.i &= 0x7fffffff; ux.i &= 0x7fffffff;
ux.i |= uy.i & 0x80000000; ux.i |= uy.i & 0x80000000;
@ -244,9 +244,9 @@ local_copysign(double x, double y)
{ {
union { union {
double f; double f;
uint64_t i; uint64 i;
} ux = { x }, uy = { y }; } ux = { x }, uy = { y };
ux.i &= -1ULL / 2; ux.i &= UINT64_MAX / 2;
ux.i |= uy.i & 1ULL << 63; ux.i |= uy.i & 1ULL << 63;
return ux.f; return ux.f;
} }

1
core/iwasm/libraries/lib-pthread/lib_pthread_wrapper.c
View File

@ -561,7 +561,6 @@ pthread_create_wrapper(wasm_exec_env_t exec_env,
#if WASM_ENABLE_LIBC_WASI != 0 #if WASM_ENABLE_LIBC_WASI != 0
WASIContext *wasi_ctx; WASIContext *wasi_ctx;
#endif #endif
CApiFuncImport **new_c_api_func_imports = NULL;
bh_assert(module); bh_assert(module);
bh_assert(module_inst); bh_assert(module_inst);

1
core/shared/platform/windows/platform_internal.h
View File

@ -26,6 +26,7 @@
#include <malloc.h> #include <malloc.h>
#include <process.h> #include <process.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h>
#include <windows.h> #include <windows.h>
#include <basetsd.h> #include <basetsd.h>

2
core/shared/platform/windows/shared_platform.cmake
View File

@ -5,7 +5,7 @@ set (PLATFORM_SHARED_DIR ${CMAKE_CURRENT_LIST_DIR})
add_definitions(-DBH_PLATFORM_WINDOWS) add_definitions(-DBH_PLATFORM_WINDOWS)
add_definitions(-DHAVE_STRUCT_TIMESPEC) add_definitions(-DHAVE_STRUCT_TIMESPEC)
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
include_directories(${PLATFORM_SHARED_DIR}) include_directories(${PLATFORM_SHARED_DIR})
include_directories(${PLATFORM_SHARED_DIR}/../include) include_directories(${PLATFORM_SHARED_DIR}/../include)

1
product-mini/platforms/windows/CMakeLists.txt
View File

@ -102,7 +102,6 @@ include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
add_library(vmlib ${WAMR_RUNTIME_LIB_SOURCE}) add_library(vmlib ${WAMR_RUNTIME_LIB_SOURCE})
#set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32_LEAN_AND_MEAN") #set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32_LEAN_AND_MEAN")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WINSOCK_DEPRECATED_NO_WARNINGS")
if (NOT MINGW) if (NOT MINGW)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")