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

Fixed merge issues

Browse Source
This commit is contained in:
ptitSeb
2023-03-08 17:22:14 +01:00
parent 4bf34da06f
commit 241504f200
6 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ impl Memory {
/// Creates a view into the memory that then allows for /// Creates a view into the memory that then allows for
/// read and write /// read and write
pub fn view<'a>(&'a self, store: &impl AsStoreRef) -> MemoryView<'a> { pub fn view<'a>(&self, store: &'a impl AsStoreRef) -> MemoryView<'a> {
MemoryView::new(self, store) MemoryView::new(self, store)
} }

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

@@ -19,7 +19,7 @@ use crate::sys::externals::memory_view as memory_view_impl;
pub struct MemoryView<'a>(pub(crate) memory_view_impl::MemoryView<'a>); pub struct MemoryView<'a>(pub(crate) memory_view_impl::MemoryView<'a>);
impl<'a> MemoryView<'a> { impl<'a> MemoryView<'a> {
pub(crate) fn new(memory: &'a Memory, store: &impl AsStoreRef) -> Self { pub(crate) fn new(memory: &Memory, store: &'a impl AsStoreRef) -> Self {
MemoryView(memory_view_impl::MemoryView::new(&memory.0, store)) MemoryView(memory_view_impl::MemoryView::new(&memory.0, store))
} }

4
lib/api/src/js/externals/memory.rs vendored
View File

@@ -106,13 +106,9 @@ impl Memory {
self.handle.ty self.handle.ty
} }
<<<<<<< HEAD
/// Creates a view into the memory that then allows for /// Creates a view into the memory that then allows for
/// read and write /// read and write
pub fn view<'a>(&self, store: &'a impl AsStoreRef) -> MemoryView<'a> { pub fn view<'a>(&self, store: &'a impl AsStoreRef) -> MemoryView<'a> {
=======
pub fn view(&self, store: &impl AsStoreRef) -> MemoryView {
>>>>>>> master
MemoryView::new(self, store) MemoryView::new(self, store)
} }

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

@@ -42,7 +42,7 @@ impl Memory {
/// Creates a view into the memory that then allows for /// Creates a view into the memory that then allows for
/// read and write /// read and write
pub fn view<'a>(&'a self, store: &impl AsStoreRef) -> MemoryView<'a> { pub fn view<'a>(&self, store: &'a impl AsStoreRef) -> MemoryView<'a> {
MemoryView::new(self, store) MemoryView::new(self, store)
} }

2
lib/api/src/sys/externals/memory_view.rs vendored
View File

@@ -22,7 +22,7 @@ pub struct MemoryView<'a> {
} }
impl<'a> MemoryView<'a> { impl<'a> MemoryView<'a> {
pub(crate) fn new(memory: &'a Memory, store: &impl AsStoreRef) -> Self { pub(crate) fn new(memory: &Memory, store: &'a impl AsStoreRef) -> Self {
let size = memory.handle.get(store.as_store_ref().objects()).size(); let size = memory.handle.get(store.as_store_ref().objects()).size();
let definition = memory.handle.get(store.as_store_ref().objects()).vmmemory(); let definition = memory.handle.get(store.as_store_ref().objects()).vmmemory();

20
lib/wasi/src/bindings/wasix_http_client_v1.rs
View File

@@ -251,18 +251,16 @@ where
); );
match result { match result {
Ok(e) => { Ok(e) => {
let val = wai_bindgen_wasmer::rt::as_i32({
let data_mut = store.data_mut();
let mut tables = data_mut.tables.borrow_mut();
tables.client_table.insert(e) as i32
});
let _memory_view = _memory.view(&store); let _memory_view = _memory.view(&store);
let caller_memory = unsafe { _memory_view.data_unchecked_mut() }; let caller_memory = unsafe { _memory_view.data_unchecked_mut() };
caller_memory caller_memory
.store(arg0 + 0, wai_bindgen_wasmer::rt::as_i32(0i32) as u8)?; .store(arg0 + 0, wai_bindgen_wasmer::rt::as_i32(0i32) as u8)?;
caller_memory.store( caller_memory.store(arg0 + 4, val)?;
arg0 + 4,
wai_bindgen_wasmer::rt::as_i32({
let data_mut = store.data_mut();
let mut tables = data_mut.tables.borrow_mut();
tables.client_table.insert(e) as i32
}),
)?;
} }
Err(e) => { Err(e) => {
let _memory_view = _memory.view(&store); let _memory_view = _memory.view(&store);
@@ -312,12 +310,12 @@ where
.unwrap() .unwrap()
.func_canonical_abi_realloc .func_canonical_abi_realloc
.clone(); .clone();
let _memory: wasmer::Memory = store.data().lazy.get().unwrap().memory.clone(); let (data_mut, alt_store) = store.data_and_store_mut();
let _memory_view = _memory.view(&store); let _memory: wasmer::Memory = data_mut.lazy.get().unwrap().memory.clone();
let _memory_view = _memory.view(&alt_store);
let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe { let mut _bc = wai_bindgen_wasmer::BorrowChecker::new(unsafe {
_memory_view.data_unchecked_mut() _memory_view.data_unchecked_mut()
}); });
let data_mut = store.data_mut();
let tables = data_mut.tables.borrow_mut(); let tables = data_mut.tables.borrow_mut();
let load0 = _bc.load::<i32>(arg0 + 0)?; let load0 = _bc.load::<i32>(arg0 + 0)?;
let load1 = _bc.load::<i32>(arg0 + 4)?; let load1 = _bc.load::<i32>(arg0 + 4)?;