gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-10-31 13:17:31 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix Windows failed to relocate __ymm symbol error (#1047)

Browse Source 
Resolve the "__ymm@" prefixed symbols like "__xmm@" and "__real@" symbols
in Windows platform.
This commit is contained in:
Wenyong Huang 2022-03-16 11:07:11 +08:00 committed by GitHub
parent 21d89135da
commit b1a4dd2e46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
core/iwasm/aot/aot_loader.c
View File

@ -19,6 +19,7 @@
#include "debug/jit_debug.h" #include "debug/jit_debug.h"
#endif #endif
#define YMM_PLT_PREFIX "__ymm@"
#define XMM_PLT_PREFIX "__xmm@" #define XMM_PLT_PREFIX "__xmm@"
#define REAL_PLT_PREFIX "__real@" #define REAL_PLT_PREFIX "__real@"
@ -1805,7 +1806,8 @@ do_text_relocation(AOTModule *module, AOTRelocationGroup *group,
is_literal ? module->literal_size : module->code_size; is_literal ? module->literal_size : module->code_size;
uint32 i, func_index, symbol_len; uint32 i, func_index, symbol_len;
#if defined(BH_PLATFORM_WINDOWS) #if defined(BH_PLATFORM_WINDOWS)
uint32 xmm_plt_index = 0, real_plt_index = 0, float_plt_index = 0; uint32 ymm_plt_index = 0, xmm_plt_index = 0;
uint32 real_plt_index = 0, float_plt_index = 0, j;
#endif #endif
char symbol_buf[128] = { 0 }, *symbol, *p; char symbol_buf[128] = { 0 }, *symbol, *p;
void *symbol_addr; void *symbol_addr;
@ -1860,31 +1862,45 @@ do_text_relocation(AOTModule *module, AOTRelocationGroup *group,
symbol_addr = module->literal; symbol_addr = module->literal;
} }
#if defined(BH_PLATFORM_WINDOWS) #if defined(BH_PLATFORM_WINDOWS)
/* Relocation for symbols which start with "__xmm@" or "__real@" and /* Relocation for symbols which start with "__ymm@", "__xmm@" or
end with the xmm value or real value. In Windows PE file, the data "__real@" and end with the ymm value, xmm value or real value.
is stored in some individual ".rdata" sections. We simply create In Windows PE file, the data is stored in some individual ".rdata"
extra plt data, parse the values from the symbols and stored them sections. We simply create extra plt data, parse the values from
into the extra plt data. */ the symbols and stored them into the extra plt data. */
else if (!strcmp(group->section_name, ".text")
&& !strncmp(symbol, YMM_PLT_PREFIX, strlen(YMM_PLT_PREFIX))
&& strlen(symbol) == strlen(YMM_PLT_PREFIX) + 64) {
char ymm_buf[17] = { 0 };
symbol_addr = module->extra_plt_data + ymm_plt_index * 32;
for (j = 0; j < 4; j++) {
bh_memcpy_s(ymm_buf, sizeof(ymm_buf),
symbol + strlen(YMM_PLT_PREFIX) + 48 - 16 * j, 16);
if (!str2uint64(ymm_buf,
(uint64 *)((uint8 *)symbol_addr + 8 * j))) {
set_error_buf_v(error_buf, error_buf_size,
"resolve symbol %s failed", symbol);
goto check_symbol_fail;
}
}
ymm_plt_index++;
}
else if (!strcmp(group->section_name, ".text") else if (!strcmp(group->section_name, ".text")
&& !strncmp(symbol, XMM_PLT_PREFIX, strlen(XMM_PLT_PREFIX)) && !strncmp(symbol, XMM_PLT_PREFIX, strlen(XMM_PLT_PREFIX))
&& strlen(symbol) == strlen(XMM_PLT_PREFIX) + 32) { && strlen(symbol) == strlen(XMM_PLT_PREFIX) + 32) {
char xmm_buf[17] = { 0 }; char xmm_buf[17] = { 0 };
symbol_addr = module->extra_plt_data + xmm_plt_index * 16; symbol_addr = module->extra_plt_data + module->ymm_plt_count * 32
bh_memcpy_s(xmm_buf, sizeof(xmm_buf), + xmm_plt_index * 16;
symbol + strlen(XMM_PLT_PREFIX) + 16, 16); for (j = 0; j < 2; j++) {
if (!str2uint64(xmm_buf, (uint64 *)symbol_addr)) { bh_memcpy_s(xmm_buf, sizeof(xmm_buf),
set_error_buf_v(error_buf, error_buf_size, symbol + strlen(XMM_PLT_PREFIX) + 16 - 16 * j, 16);
"resolve symbol %s failed", symbol); if (!str2uint64(xmm_buf,
goto check_symbol_fail; (uint64 *)((uint8 *)symbol_addr + 8 * j))) {
} set_error_buf_v(error_buf, error_buf_size,
"resolve symbol %s failed", symbol);
bh_memcpy_s(xmm_buf, sizeof(xmm_buf), goto check_symbol_fail;
symbol + strlen(XMM_PLT_PREFIX), 16); }
if (!str2uint64(xmm_buf, (uint64 *)((uint8 *)symbol_addr + 8))) {
set_error_buf_v(error_buf, error_buf_size,
"resolve symbol %s failed", symbol);
goto check_symbol_fail;
} }
xmm_plt_index++; xmm_plt_index++;
} }
@ -1893,8 +1909,8 @@ do_text_relocation(AOTModule *module, AOTRelocationGroup *group,
&& strlen(symbol) == strlen(REAL_PLT_PREFIX) + 16) { && strlen(symbol) == strlen(REAL_PLT_PREFIX) + 16) {
char real_buf[17] = { 0 }; char real_buf[17] = { 0 };
symbol_addr = module->extra_plt_data + module->xmm_plt_count * 16 symbol_addr = module->extra_plt_data + module->ymm_plt_count * 32
+ real_plt_index * 8; + module->xmm_plt_count * 16 + real_plt_index * 8;
bh_memcpy_s(real_buf, sizeof(real_buf), bh_memcpy_s(real_buf, sizeof(real_buf),
symbol + strlen(REAL_PLT_PREFIX), 16); symbol + strlen(REAL_PLT_PREFIX), 16);
if (!str2uint64(real_buf, (uint64 *)symbol_addr)) { if (!str2uint64(real_buf, (uint64 *)symbol_addr)) {
@ -1909,7 +1925,8 @@ do_text_relocation(AOTModule *module, AOTRelocationGroup *group,
&& strlen(symbol) == strlen(REAL_PLT_PREFIX) + 8) { && strlen(symbol) == strlen(REAL_PLT_PREFIX) + 8) {
char float_buf[9] = { 0 }; char float_buf[9] = { 0 };
symbol_addr = module->extra_plt_data + module->xmm_plt_count * 16 symbol_addr = module->extra_plt_data + module->ymm_plt_count * 32
+ module->xmm_plt_count * 16
+ module->real_plt_count * 8 + float_plt_index * 4; + module->real_plt_count * 8 + float_plt_index * 4;
bh_memcpy_s(float_buf, sizeof(float_buf), bh_memcpy_s(float_buf, sizeof(float_buf),
symbol + strlen(REAL_PLT_PREFIX), 8); symbol + strlen(REAL_PLT_PREFIX), 8);
@ -2121,11 +2138,19 @@ load_relocation_section(const uint8 *buf, const uint8 *buf_end,
|| (module->is_indirect_mode || (module->is_indirect_mode
&& group_name_len == strlen(".text") + 1)) && group_name_len == strlen(".text") + 1))
&& !strncmp(group_name, ".text", strlen(".text"))) { && !strncmp(group_name, ".text", strlen(".text"))) {
if ((symbol_name_len == strlen(XMM_PLT_PREFIX) + 32 if ((symbol_name_len == strlen(YMM_PLT_PREFIX) + 64
|| (module->is_indirect_mode || (module->is_indirect_mode
&& symbol_name_len == strlen(XMM_PLT_PREFIX) + 32 + 1)) && symbol_name_len == strlen(YMM_PLT_PREFIX) + 64 + 1))
&& !strncmp(symbol_name, XMM_PLT_PREFIX, && !strncmp(symbol_name, YMM_PLT_PREFIX,
strlen(XMM_PLT_PREFIX))) { strlen(YMM_PLT_PREFIX))) {
module->ymm_plt_count++;
}
else if ((symbol_name_len == strlen(XMM_PLT_PREFIX) + 32
|| (module->is_indirect_mode
&& symbol_name_len
== strlen(XMM_PLT_PREFIX) + 32 + 1))
&& !strncmp(symbol_name, XMM_PLT_PREFIX,
strlen(XMM_PLT_PREFIX))) {
module->xmm_plt_count++; module->xmm_plt_count++;
} }
else if ((symbol_name_len == strlen(REAL_PLT_PREFIX) + 16 else if ((symbol_name_len == strlen(REAL_PLT_PREFIX) + 16
@ -2149,7 +2174,8 @@ load_relocation_section(const uint8 *buf, const uint8 *buf_end,
} }
/* Allocate memory for extra plt data */ /* Allocate memory for extra plt data */
size = sizeof(uint64) * 2 * module->xmm_plt_count size = sizeof(uint64) * 4 * module->ymm_plt_count
+ sizeof(uint64) * 2 * module->xmm_plt_count
+ sizeof(uint64) * module->real_plt_count + sizeof(uint64) * module->real_plt_count
+ sizeof(uint32) * module->float_plt_count; + sizeof(uint32) * module->float_plt_count;
if (size > 0) { if (size > 0) {

3
core/iwasm/aot/aot_runtime.h
View File

@ -197,10 +197,11 @@ typedef struct AOTModule {
uint32 literal_size; uint32 literal_size;
#if defined(BH_PLATFORM_WINDOWS) #if defined(BH_PLATFORM_WINDOWS)
/* extra plt data area for __xmm and __real constants /* extra plt data area for __ymm, __xmm and __real constants
in Windows platform, NULL for JIT mode */ in Windows platform, NULL for JIT mode */
uint8 *extra_plt_data; uint8 *extra_plt_data;
uint32 extra_plt_data_size; uint32 extra_plt_data_size;
uint32 ymm_plt_count;
uint32 xmm_plt_count; uint32 xmm_plt_count;
uint32 real_plt_count; uint32 real_plt_count;
uint32 float_plt_count; uint32 float_plt_count;