misimplemented some cranelift functions, fix that

iximeow · iximeow · commit 9a40df4ddd08 · 2020-01-16T11:38:50.000-08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lucet-runtime/lucet-runtime-tests/src/host.rs b/lucet-runtime/lucet-runtime-tests/src/host.rs
@@ -470,7 +470,7 @@ macro_rules! host_tests {
                 .new_instance(module)
                 .expect("instance can be created");
             assert_eq!(
-                u64::from(inst.run("entrypoint_restore", &[]).unwrap()),
+                u64::from(inst.run("entrypoint_restore", &[]).unwrap().returned().unwrap()),
                 6148914668330025056
             );
         }
diff --git a/lucetc/src/function.rs b/lucetc/src/function.rs
@@ -278,7 +278,8 @@ impl<'a> TargetEnvironment for FuncInfo<'a> {
 use cranelift_codegen::ir::{Function, Heap, Table, Value};
 impl<'a> FuncEnvironment for FuncInfo<'a> {
     fn is_wasm_parameter(&self, f: &Function, u: usize) -> bool {
-        false
+        use cranelift_codegen::ir::ArgumentPurpose;
+        f.signature.params.get(u).expect("parameter index is valid").purpose == ArgumentPurpose::Normal
     }
 
     fn translate_memory_copy(&mut self, cursor: FuncCursor, idx: MemoryIndex, heap: Heap, value: Value, v2: Value, v3: Value) -> Result<(), WasmError> {

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ macro_rules! host_tests {`
`470`	`470`	`.new_instance(module)`
`471`	`471`	`.expect("instance can be created");`
`472`	`472`	`assert_eq!(`
`473`		`- u64::from(inst.run("entrypoint_restore", &[]).unwrap()),`
	`473`	`+ u64::from(inst.run("entrypoint_restore", &[]).unwrap().returned().unwrap()),`
`474`	`474`	`6148914668330025056`
`475`	`475`	`);`
`476`	`476`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,8 @@ impl<'a> TargetEnvironment for FuncInfo<'a> {`
`278`	`278`	`use cranelift_codegen::ir::{Function, Heap, Table, Value};`
`279`	`279`	`impl<'a> FuncEnvironment for FuncInfo<'a> {`
`280`	`280`	`fn is_wasm_parameter(&self, f: &Function, u: usize) -> bool {`
`281`		`- false`
	`281`	`+ use cranelift_codegen::ir::ArgumentPurpose;`
	`282`	`+ f.signature.params.get(u).expect("parameter index is valid").purpose == ArgumentPurpose::Normal`
`282`	`283`	`}`
`283`	`284`
`284`	`285`	`fn translate_memory_copy(&mut self, cursor: FuncCursor, idx: MemoryIndex, heap: Heap, value: Value, v2: Value, v3: Value) -> Result<(), WasmError> {`