Skip to content

Fix compile warning on non-x86 targets, fix alios build error #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Dec 30, 2021
Merged

Fix compile warning on non-x86 targets, fix alios build error #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5dea3f4
Merge pull request #423 from bytecodealliance/main
wenyongh Dec 19, 2021
9f98032
Merge pull request #424 from bytecodealliance/main
wenyongh Dec 20, 2021
06f4a78
Remove PRI macro control, fix read leb issue
wenyongh Dec 20, 2021
4b4dbad
Merge pull request #425 from bytecodealliance/main
wenyongh Dec 20, 2021
ac9de70
Merge pull request #430 from bytecodealliance/main
wenyongh Dec 25, 2021
48a9d90
Implement GetCurrentThreadStackLimits() for Windows 7
wenyongh Dec 25, 2021
6e1fab6
Fix compilation error/warning on windows platform
wenyongh Dec 25, 2021
0d1ec2d
Fix code format issue
wenyongh Dec 25, 2021
427a449
Merge pull request #431 from bytecodealliance/main
wenyongh Dec 27, 2021
9b6a3bd
Merge pull request #434 from bytecodealliance/main
wenyongh Dec 28, 2021
a139b67
Merge pull request #435 from bytecodealliance/main
wenyongh Dec 29, 2021
3343694
Refine some error msg, comment and document
wenyongh Dec 29, 2021
df66540
Fix code format issue
wenyongh Dec 29, 2021
16213ab
Address comment
wenyongh Dec 29, 2021
928a264
Merge pull request #436 from bytecodealliance/main
wenyongh Dec 29, 2021
c322cc7
Fix alios platform compile error
wenyongh Dec 29, 2021
2dfd432
Fix compile warning on non x86 targets
wenyongh Dec 29, 2021
b690447
Fix os_thread_signal_init issue
wenyongh Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions core/iwasm/common/wasm_runtime_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,22 @@ GET_F64_FROM_ADDR(uint32 *addr)
/* For STORE opcodes */
#define STORE_I64(addr, value) \
do { \
uintptr_t addr1 = (uintptr_t)(addr); \
uintptr_t addr_ = (uintptr_t)(addr); \
union { \
int64 val; \
uint32 u32[2]; \
uint16 u16[4]; \
uint8 u8[8]; \
} u; \
if ((addr1 & (uintptr_t)7) == 0) \
if ((addr_ & (uintptr_t)7) == 0) \
*(int64 *)(addr) = (int64)(value); \
else { \
u.val = (int64)(value); \
if ((addr1 & (uintptr_t)3) == 0) { \
if ((addr_ & (uintptr_t)3) == 0) { \
((uint32 *)(addr))[0] = u.u32[0]; \
((uint32 *)(addr))[1] = u.u32[1]; \
} \
else if ((addr1 & (uintptr_t)1) == 0) { \
else if ((addr_ & (uintptr_t)1) == 0) { \
((uint16 *)(addr))[0] = u.u16[0]; \
((uint16 *)(addr))[1] = u.u16[1]; \
((uint16 *)(addr))[2] = u.u16[2]; \
Expand All @@ -146,17 +146,17 @@ GET_F64_FROM_ADDR(uint32 *addr)

#define STORE_U32(addr, value) \
do { \
uintptr_t addr1 = (uintptr_t)(addr); \
uintptr_t addr_ = (uintptr_t)(addr); \
union { \
uint32 val; \
uint16 u16[2]; \
uint8 u8[4]; \
} u; \
if ((addr1 & (uintptr_t)3) == 0) \
if ((addr_ & (uintptr_t)3) == 0) \
*(uint32 *)(addr) = (uint32)(value); \
else { \
u.val = (uint32)(value); \
if ((addr1 & (uintptr_t)1) == 0) { \
if ((addr_ & (uintptr_t)1) == 0) { \
((uint16 *)(addr))[0] = u.u16[0]; \
((uint16 *)(addr))[1] = u.u16[1]; \
} \
Expand Down
2 changes: 1 addition & 1 deletion core/shared/platform/windows/win_thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ os_thread_signal_init()
bool ret;

if (thread_signal_inited)
return true;
return 0;

ret = SetThreadStackGuarantee(&StackSizeInBytes);
if (ret)
Expand Down
3 changes: 2 additions & 1 deletion product-mini/platforms/alios-things/aos.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ endif
ifeq (${WAMR_BUILD_AOT}, 1)
$(NAME)_SOURCES += ${IWASM_ROOT}/aot/aot_loader.c \
${IWASM_ROOT}/aot/arch/${AOT_RELOC} \
${IWASM_ROOT}/aot/aot_runtime.c
${IWASM_ROOT}/aot/aot_runtime.c \
${IWASM_ROOT}/aot/aot_intrinsic.c
endif