Skip to content

more compatibility fixes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 5, 2024
Merged

more compatibility fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
36aebec
more compatibility fixes
junr03 Aug 31, 2024
7750199
more compatibility fixes
junr03 Aug 31, 2024
3d2f9a6
more
junr03 Aug 31, 2024
a817bae
more
junr03 Aug 31, 2024
4204225
more
junr03 Aug 31, 2024
d45a6e9
more
junr03 Aug 31, 2024
e486be1
more
junr03 Aug 31, 2024
7587a75
more
junr03 Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/expectations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ impl ExpectHandle {
pub fn assert_stage(&self) {
if self.staged.expect_count > 0 {
panic!(
"Error: failed to consume all expectations - total remaining: {}",
self.staged.expect_count
"Error: failed to consume all expectations - total remaining: {}\n{:?}",
self.staged.expect_count, self.staged
);
} else if self.staged.expect_count < 0 {
panic!(
Expand Down
107 changes: 58 additions & 49 deletions src/hostcalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ fn get_hostfunc(
-> i32 {
// Default Function: respond with a default header map value corresponding to map_type (if exists)
// Expectation: respond with set expected header map value for the given key and map_type
// Panics if there is no header map value in expectation or host simulator for the provided map_type and key
// Panics if there is no header map value in expectation or host simulator for the provided map_type and key and one was expected
let mem = match caller.get_export("memory") {
Some(Extern::Memory(mem)) => mem,
_ => {
Expand All @@ -832,7 +832,7 @@ fn get_hostfunc(
};

unsafe {
let (string_key, string_value) = {
let (string_key, maybe_string_value) = {
let key_data_ptr = mem
.data(&caller)
.get(key_data as u32 as usize..)
Expand All @@ -841,59 +841,64 @@ fn get_hostfunc(
.map(|string_msg| std::str::from_utf8(string_msg).unwrap())
.unwrap();

let string_value = match EXPECT
let maybe_string_value = EXPECT
.lock()
.unwrap()
.staged
.get_expect_get_header_map_value(map_type, string_key)
{
Some(expect_string_value) => expect_string_value,
None => {
match HOST.lock().unwrap().staged.get_header_map_value(map_type, &string_key) {
Some(host_string_value) => host_string_value,
None => panic!("Error: proxy_get_header_map_value | no header map value for key {}", string_key)}
}
};
(string_key.to_string(), string_value)
};

let value_data_add = {
let mut result = [Val::I32(0)];
malloc
.call(
&mut caller,
&[Val::I32(string_value.len() as i32)],
&mut result,
)
.unwrap();
result[0].i32().unwrap() as u32 as usize
.or_else(|| {
HOST.lock()
.unwrap()
.staged
.get_header_map_value(map_type, &string_key)
});
(string_key.to_string(), maybe_string_value)
};

let value_data_ptr = mem
.data_mut(&mut caller)
.get_unchecked_mut(value_data_add..value_data_add + string_value.len());
value_data_ptr.copy_from_slice((&string_value).as_bytes());

let return_value_data_ptr = mem.data_mut(&mut caller).get_unchecked_mut(
return_value_data as u32 as usize
..return_value_data as u32 as usize + 4,
);
return_value_data_ptr
.copy_from_slice(&(value_data_add as u32).to_le_bytes());

let return_value_size_ptr = mem.data_mut(&mut caller).get_unchecked_mut(
return_value_size as u32 as usize
..return_value_size as u32 as usize + 4,
);
return_value_size_ptr
.copy_from_slice(&(string_value.len() as u32).to_le_bytes());

println!("[vm->host] proxy_get_header_map_value(map_type={}, key_data={}, key_size={}) -> (...) status: {:?}",
map_type, string_key, key_size, get_status()
);
println!("[vm<-host] proxy_get_header_map_value(...) -> (return_value_data={}, return_value_size={}) return: {:?}",
string_value, string_value.len(), Status::Ok
);
match maybe_string_value {
Some(string_value) => {
let value_data_add = {
let mut result = [Val::I32(0)];
malloc
.call(
&mut caller,
&[Val::I32(string_value.len() as i32)],
&mut result,
)
.unwrap();
result[0].i32().unwrap() as u32 as usize
};

let value_data_ptr = mem.data_mut(&mut caller).get_unchecked_mut(
value_data_add..value_data_add + string_value.len(),
);
value_data_ptr.copy_from_slice((&string_value).as_bytes());

let return_value_data_ptr =
mem.data_mut(&mut caller).get_unchecked_mut(
return_value_data as u32 as usize
..return_value_data as u32 as usize + 4,
);
return_value_data_ptr
.copy_from_slice(&(value_data_add as u32).to_le_bytes());

let return_value_size_ptr =
mem.data_mut(&mut caller).get_unchecked_mut(
return_value_size as u32 as usize
..return_value_size as u32 as usize + 4,
);
return_value_size_ptr
.copy_from_slice(&(string_value.len() as u32).to_le_bytes());

println!("[vm->host] proxy_get_header_map_value(map_type={}, key_data={}, key_size={}) -> (...) status: {:?}", map_type, string_key, key_size, get_status());
println!("[vm<-host] proxy_get_header_map_value(...) -> (return_value_data={}, return_value_size={}) return: {:?}", string_value, string_value.len(), Status::Ok);
}
None => {
let mut data_ptr =
mem.data_ptr(&mut caller).offset(return_value_data as isize);
data_ptr = std::ptr::null_mut();
}
}
}
assert_ne!(get_status(), ExpectStatus::Failed);
set_status(ExpectStatus::Unexpected);
Expand Down Expand Up @@ -1729,6 +1734,10 @@ fn get_hostfunc(
|mut _caller: Caller<'_, ()>, _param1: i32| -> () { () },
)),

"sched_yield" => Some(Func::wrap(store, |mut _caller: Caller<'_, ()>| -> i32 {
Status::Ok as i32
})),

"proxy_set_effective_context" => {
Some(Func::wrap(
store,
Expand Down
Loading