fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-07-02 18:11:34 +00:00
Code Issues Projects Releases Wiki Activity

feat(llvm-backend) Update ImportedFunc structure.

Browse Source 
`vm::ImportedFunc` in `runtime-core` has changed. Update LLVM accordingly.
This commit is contained in:
Ivan Enderlin
2019-11-12 00:46:28 +01:00
parent 06c6b3c8e8
commit bb81614be4
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/llvm-backend/src/intrinsics.rs
View File

@ -210,8 +210,13 @@ impl Intrinsics {
context.struct_type(&[i8_ptr_ty_basic, i64_ty_basic, i8_ptr_ty_basic], false); context.struct_type(&[i8_ptr_ty_basic, i64_ty_basic, i8_ptr_ty_basic], false);
let local_table_ty = local_memory_ty; let local_table_ty = local_memory_ty;
let local_global_ty = i64_ty; let local_global_ty = i64_ty;
let imported_func_ty = let func_ctx_ty =
context.struct_type(&[i8_ptr_ty_basic, ctx_ptr_ty.as_basic_type_enum()], false); context.struct_type(&[ctx_ptr_ty.as_basic_type_enum(), i8_ptr_ty_basic], false);
let func_ctx_ptr_ty = func_ctx_ty.ptr_type(AddressSpace::Generic);
let imported_func_ty = context.struct_type(
&[i8_ptr_ty_basic, func_ctx_ptr_ty.as_basic_type_enum()],
false,
);
let sigindex_ty = i32_ty; let sigindex_ty = i32_ty;
let rt_intrinsics_ty = i8_ty; let rt_intrinsics_ty = i8_ty;
let stack_lower_bound_ty = i8_ty; let stack_lower_bound_ty = i8_ty;
@ -1118,16 +1123,20 @@ impl<'a> CtxType<'a> {
"imported_func_ptr", "imported_func_ptr",
) )
}; };
let (func_ptr_ptr, ctx_ptr_ptr) = unsafe { let (func_ptr_ptr, func_ctx_ptr_ptr) = unsafe {
( (
cache_builder.build_struct_gep(imported_func_ptr, 0, "func_ptr_ptr"), cache_builder.build_struct_gep(imported_func_ptr, 0, "func_ptr_ptr"),
cache_builder.build_struct_gep(imported_func_ptr, 1, "ctx_ptr_ptr"), cache_builder.build_struct_gep(imported_func_ptr, 1, "func_ctx_ptr_ptr"),
) )
}; };
let func_ptr = cache_builder let func_ptr = cache_builder
.build_load(func_ptr_ptr, "func_ptr") .build_load(func_ptr_ptr, "func_ptr")
.into_pointer_value(); .into_pointer_value();
let func_ctx_ptr = cache_builder
.build_load(func_ctx_ptr_ptr, "func_ctx_ptr")
.into_pointer_value();
let ctx_ptr_ptr = unsafe { cache_builder.build_struct_gep(func_ctx_ptr, 0, "ctx_ptr") };
let ctx_ptr = cache_builder let ctx_ptr = cache_builder
.build_load(ctx_ptr_ptr, "ctx_ptr") .build_load(ctx_ptr_ptr, "ctx_ptr")
.into_pointer_value(); .into_pointer_value();