fluencelabs/interface-types
1
0
Fork 0
mirror of https://github.com/fluencelabs/interface-types synced 2024-12-04 15:20:20 +00:00
Code Issues Projects Releases Wiki Activity

add instruction tracing

Browse Source
This commit is contained in:
vms 2020-09-13 22:19:26 +03:00
parent 880f324016
commit e61b645899
10 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -47,6 +47,15 @@ dependencies = [
"static_assertions",
]
[[package]]
name = "log"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
dependencies = [
"cfg-if",
]
[[package]]
name = "memchr"
version = "2.3.3"
@ -188,6 +197,7 @@ checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
name = "wasmer-interface-types-fl"
version = "0.17.3"
dependencies = [
"log",
"nom",
"safe-transmute",
"serde",

1
Cargo.toml
View File

@ -17,6 +17,7 @@ wast = "8.0"
serde = { version = "1.0", features = ["derive"], optional = true }
serde_json = "1.0"
safe-transmute = "0.11.0"
log = "0.4.11"
[features]
default = ["serde"]

2
src/interpreter/instructions/argument_get.rs
View File

@ -15,6 +15,8 @@ executable_instruction!(
));
}
log::trace!("arg.get: pushing {:?} on the stack", invocation_inputs[index as usize]);
runtime.stack.push(invocation_inputs[index as usize].clone());
Ok(())

4
src/interpreter/instructions/byte_arrays.rs
View File

@ -59,6 +59,8 @@ executable_instruction!(
.map(Cell::get)
.collect();
log::trace!("bytearray.lift_memory: pushing {:?} on the stack", data);
runtime.stack.push(InterfaceValue::ByteArray(data));
Ok(())
@ -104,6 +106,8 @@ executable_instruction!(
memory_view[byte_array_pointer as usize + nth].set(*byte);
}
log::trace!("bytearray.lower_memory: pushing {}, {} on the stack", byte_array_pointer, byte_array_length);
runtime.stack.push(InterfaceValue::I32(byte_array_pointer as i32));
runtime.stack.push(InterfaceValue::I32(byte_array_length));

4
src/interpreter/instructions/call_core.rs
View File

@ -31,6 +31,8 @@ executable_instruction!(
super::check_function_signature(&**instance, local_or_import, &inputs, instruction)?;
log::trace!("call-core: calling {} with arguments: {:?}", function_index, inputs);
let outputs = local_or_import.call(&inputs).map_err(|_| {
InstructionError::new(
instruction,
@ -40,7 +42,7 @@ executable_instruction!(
)
})?;
log::trace!("call-core: call to {} succeeded with result {:?}", function_index, outputs);
for output in outputs.into_iter() {
runtime.stack.push(output)

1
src/interpreter/instructions/dup.rs
View File

@ -14,6 +14,7 @@ executable_instruction!(
})?;
let value = value.clone();
log::trace!("dup: duplication {:?} value on the stack", value);
runtime.stack.push(value);
Ok(())

29
src/interpreter/instructions/numbers.rs
View File

@ -15,19 +15,24 @@ macro_rules! lowering_lifting {
Some(InterfaceValue::$from_variant(value)) => {
runtime
.stack
.push(InterfaceValue::$to_variant(value.try_into().map_err(
|_| {
InstructionError::new(
instruction,
InstructionErrorKind::LoweringLifting {
from: InterfaceType::$from_variant,
to: InterfaceType::$to_variant
},
)
},
)?))
}
.push({
let converted_value = InterfaceValue::$to_variant(value.try_into().map_err(
|_| {
InstructionError::new(
instruction,
InstructionErrorKind::LoweringLifting {
from: InterfaceType::$from_variant,
to: InterfaceType::$to_variant
},
)
},
)?);
log::trace!("{}: converting {:?} to {:?}", $instruction_name, value, converted_value);
converted_value
})
}
Some(wrong_value) => {
return Err(InstructionError::new(
instruction,

3
src/interpreter/instructions/records.rs
View File

@ -288,6 +288,8 @@ where
})?;
let record = record_lift_memory_(&**instance, record_type, offset, instruction)?;
log::trace!("record.lift_memory: pushing {:?} on the stack", record);
runtime.stack.push(record);
Ok(())
@ -349,6 +351,7 @@ where
InterfaceValue::Record(values) => {
let record_ptr = record_lower_memory_(instance, instruction, values)?;
log::trace!("record.lower_memory: pushing {:?} on the stack", record_ptr);
result.push(record_ptr as _);
}
}

4
src/interpreter/instructions/strings.rs
View File

@ -62,6 +62,7 @@ executable_instruction!(
let string = String::from_utf8(data)
.map_err(|error| InstructionError::new(instruction, InstructionErrorKind::String(error)))?;
log::trace!("string.lift_memory: pushing {:?} on the stack", string);
runtime.stack.push(InterfaceValue::String(string));
Ok(())
@ -108,6 +109,7 @@ executable_instruction!(
memory_view[string_pointer as usize + nth].set(*byte);
}
log::trace!("string.lower_memory: pushing {}, {} on the stack", string_pointer, string_length);
runtime.stack.push(InterfaceValue::I32(string_pointer as i32));
runtime.stack.push(InterfaceValue::I32(string_length));
@ -122,6 +124,8 @@ executable_instruction!(
match runtime.stack.pop1() {
Some(InterfaceValue::String(string)) => {
let length = string.len() as i32;
log::trace!("string.size: pushing {} on the stack", length);
runtime.stack.push(InterfaceValue::I32(length));
Ok(())

1
src/interpreter/instructions/swap2.rs
View File

@ -13,6 +13,7 @@ executable_instruction!(
)
})?;
log::trace!("swap2: swapping {:?}, {:?} values on the stack", values[0], values[1]);
runtime.stack.push(values.remove(1));
runtime.stack.push(values.remove(0));