mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-06 20:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(vm) Rename the instance_allocator fields to instance_ref.

Browse Source
This commit is contained in:
Ivan Enderlin
2020-12-14 10:28:38 +01:00
parent 7835e78ae6
commit facd41412a
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/api/src/externals/function.rs vendored
View File

@@ -110,7 +110,7 @@ impl Function {
vmctx, vmctx,
signature: ty.clone(), signature: ty.clone(),
call_trampoline: None, call_trampoline: None,
instance_allocator: None, instance_ref: None,
}, },
}, },
} }
@@ -173,7 +173,7 @@ impl Function {
vmctx, vmctx,
signature: ty.clone(), signature: ty.clone(),
call_trampoline: None, call_trampoline: None,
instance_allocator: None, instance_ref: None,
}, },
}, },
} }
@@ -227,7 +227,7 @@ impl Function {
signature, signature,
kind: VMFunctionKind::Static, kind: VMFunctionKind::Static,
call_trampoline: None, call_trampoline: None,
instance_allocator: None, instance_ref: None,
}, },
}, },
} }
@@ -297,7 +297,7 @@ impl Function {
vmctx, vmctx,
signature, signature,
call_trampoline: None, call_trampoline: None,
instance_allocator: None, instance_ref: None,
}, },
}, },
} }
@@ -350,7 +350,7 @@ impl Function {
vmctx, vmctx,
signature, signature,
call_trampoline: None, call_trampoline: None,
instance_allocator: None, instance_ref: None,
}, },
}, },
} }

2
lib/api/src/externals/global.rs vendored
View File

@@ -220,7 +220,7 @@ impl<'a> Exportable<'a> for Global {
ExportGlobal { ExportGlobal {
vm_global: VMExportGlobal { vm_global: VMExportGlobal {
from: self.global.clone(), from: self.global.clone(),
instance_allocator: None, instance_ref: None,
}, },
} }
.into() .into()

2
lib/api/src/externals/memory.rs vendored
View File

@@ -250,7 +250,7 @@ impl<'a> Exportable<'a> for Memory {
ExportMemory { ExportMemory {
vm_memory: VMExportMemory { vm_memory: VMExportMemory {
from: self.memory.clone(), from: self.memory.clone(),
instance_allocator: None, instance_ref: None,
}, },
} }
.into() .into()

2
lib/api/src/externals/table.rs vendored
View File

@@ -158,7 +158,7 @@ impl<'a> Exportable<'a> for Table {
ExportTable { ExportTable {
vm_table: VMExportTable { vm_table: VMExportTable {
from: self.table.clone(), from: self.table.clone(),
instance_allocator: None, instance_ref: None,
}, },
} }
.into() .into()

2
lib/api/src/native.rs
View File

@@ -75,7 +75,7 @@ where
signature, signature,
kind: other.arg_kind, kind: other.arg_kind,
call_trampoline: None, call_trampoline: None,
instance_allocator: None, instance_ref: None,
} }
} }
}*/ }*/

2
lib/api/src/types.rs
View File

@@ -85,7 +85,7 @@ impl ValFuncRef for Val {
kind: wasmer_vm::VMFunctionKind::Static, kind: wasmer_vm::VMFunctionKind::Static,
vmctx: item.vmctx, vmctx: item.vmctx,
call_trampoline: None, call_trampoline: None,
instance_allocator: None, instance_ref: None,
}, },
}; };
let f = Function::from_vm_export(store, export); let f = Function::from_vm_export(store, export);

14
lib/vm/src/export.rs
View File

@@ -50,7 +50,7 @@ pub struct VMExportFunction {
/// A “reference” to the instance through the /// A “reference” to the instance through the
/// `InstanceRef`. `None` if it is a host function. /// `InstanceRef`. `None` if it is a host function.
pub instance_allocator: Option<InstanceRef>, pub instance_ref: Option<InstanceRef>,
} }
/// # Safety /// # Safety
@@ -74,8 +74,8 @@ pub struct VMExportTable {
pub from: Arc<dyn Table>, pub from: Arc<dyn Table>,
/// A “reference” to the instance through the /// A “reference” to the instance through the
/// `InstanceRef`. `None` if it is a host function. /// `InstanceRef`. `None` if it is a host table.
pub instance_allocator: Option<InstanceRef>, pub instance_ref: Option<InstanceRef>,
} }
/// # Safety /// # Safety
@@ -120,8 +120,8 @@ pub struct VMExportMemory {
pub from: Arc<dyn Memory>, pub from: Arc<dyn Memory>,
/// A “reference” to the instance through the /// A “reference” to the instance through the
/// `InstanceRef`. `None` if it is a host function. /// `InstanceRef`. `None` if it is a host memory.
pub instance_allocator: Option<InstanceRef>, pub instance_ref: Option<InstanceRef>,
} }
/// # Safety /// # Safety
@@ -166,8 +166,8 @@ pub struct VMExportGlobal {
pub from: Arc<Global>, pub from: Arc<Global>,
/// A “reference” to the instance through the /// A “reference” to the instance through the
/// `InstanceRef`. `None` if it is a host function. /// `InstanceRef`. `None` if it is a host global.
pub instance_allocator: Option<InstanceRef>, pub instance_ref: Option<InstanceRef>,
} }
/// # Safety /// # Safety

8
lib/vm/src/instance/mod.rs
View File

@@ -1119,7 +1119,7 @@ impl InstanceHandle {
signature, signature,
vmctx, vmctx,
call_trampoline, call_trampoline,
instance_allocator: Some(instance), instance_ref: Some(instance),
} }
.into() .into()
} }
@@ -1132,7 +1132,7 @@ impl InstanceHandle {
}; };
VMExportTable { VMExportTable {
from, from,
instance_allocator: Some(instance), instance_ref: Some(instance),
} }
.into() .into()
} }
@@ -1145,7 +1145,7 @@ impl InstanceHandle {
}; };
VMExportMemory { VMExportMemory {
from, from,
instance_allocator: Some(instance), instance_ref: Some(instance),
} }
.into() .into()
} }
@@ -1160,7 +1160,7 @@ impl InstanceHandle {
}; };
VMExportGlobal { VMExportGlobal {
from, from,
instance_allocator: Some(instance), instance_ref: Some(instance),
} }
.into() .into()
} }