christoph/wamr
1
Fork 0
Code Releases Activity

Change WASM_ANYREF to WASM_EXTERNREF (#3426)

Browse Source 
wasm-c-api wasm.h had changed WASM_ANYREF to WASM_EXTERNREF,
we had better change it in WAMR also:
2ce1367c9d/include/wasm.h (L185)
This commit is contained in:
Wenyong Huang
2024-05-14 11:08:16 +08:00
committed by GitHub
parent 004d07bb86
commit 773efc006d
12 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/iwasm/common/wasm_runtime_common.c
View File

@ -2000,7 +2000,7 @@ val_type_to_val_kind(uint8 value_type)
case VALUE_TYPE_FUNCREF:
return WASM_FUNCREF;
case VALUE_TYPE_EXTERNREF:
return WASM_ANYREF;
return WASM_EXTERNREF;
default:
bh_assert(0);
return 0;
@ -2318,7 +2318,7 @@ parse_args_to_uint32_array(WASMFuncType *type, wasm_val_t *args,
#else
case WASM_FUNCREF:
#endif
case WASM_ANYREF:
case WASM_EXTERNREF:
{
#if UINTPTR_MAX == UINT32_MAX
out_argv[p++] = args[i].of.foreign;
@ -2419,7 +2419,7 @@ parse_uint32_array_to_results(WASMFuncType *type, uint32 *argv,
#endif /* end of WASM_ENABLE_GC == 0 */
{
#if UINTPTR_MAX == UINT32_MAX
out_results[i].kind = WASM_ANYREF;
out_results[i].kind = WASM_EXTERNREF;
out_results[i].of.foreign = (uintptr_t)argv[p++];
#else
union {
@ -2428,7 +2428,7 @@ parse_uint32_array_to_results(WASMFuncType *type, uint32 *argv,
} u;
u.parts[0] = argv[p++];
u.parts[1] = argv[p++];
out_results[i].kind = WASM_ANYREF;
out_results[i].kind = WASM_EXTERNREF;
out_results[i].of.foreign = u.val;
#endif
break;
@ -2582,7 +2582,7 @@ wasm_runtime_call_wasm_v(WASMExecEnv *exec_env,
}
case VALUE_TYPE_EXTERNREF:
{
args[i].kind = WASM_ANYREF;
args[i].kind = WASM_EXTERNREF;
args[i].of.foreign = va_arg(vargs, uintptr_t);
break;
}
@ -6528,7 +6528,7 @@ argv_to_params(wasm_val_t *out_params, const uint32 *argv,
break;
#if WASM_ENABLE_GC == 0 && WASM_ENABLE_REF_TYPES != 0
case VALUE_TYPE_EXTERNREF:
param->kind = WASM_ANYREF;
param->kind = WASM_EXTERNREF;
if (!wasm_externref_ref2obj(*argv,
(void **)&param->of.foreign)) {