This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
WASM Runtime refactoring #6596
Merged
WASM Runtime refactoring #6596
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NikVolf
added
A0-pleasereview 🤓
rphmeier
reviewed
Sep 26, 2017
ethcore/wasm/src/lib.rs
Outdated
| params.data.unwrap_or(Vec::with_capacity(0)), | ||
| ) | ||
| ).map_err(|e| Error(e))?; | ||
| let d_ptr = runtime.write_descriptor(params.data.unwrap_or(Vec::with_capacity(0))) |
There was a problem hiding this comment.
Vec::new is guaranteed not to allocate. unwrap_or_else would be nicer looking for the same behavior
rphmeier
reviewed
Sep 26, 2017
ethcore/wasm/src/lib.rs
Outdated
| ) | ||
| ).map_err(|e| Error(e))?; | ||
| let d_ptr = runtime.write_descriptor(params.data.unwrap_or(Vec::with_capacity(0))) | ||
| .map_err(|e| Error(e))?; |
rphmeier
reviewed
Sep 26, 2017
ethcore/wasm/src/runtime.rs
Outdated
| @@ -442,10 +434,10 @@ impl<'a, 'b> Runtime<'a, 'b> { | |||
| } | |||
|
|
|||
| /// Write call descriptor to wasm memory | |||
| pub fn write_descriptor(&mut self, call_args: CallArgs) -> Result<WasmPtr, InterpreterError> { | |||
| pub fn write_descriptor(&mut self, input: Vec<u8>) -> Result<WasmPtr, InterpreterError> { | |||
There was a problem hiding this comment.
seems to only require an &[u8] and not ownership of a Vec
rphmeier
added
A5-grumble 🔥
NikVolf
added
A0-pleasereview 🤓
|
@rphmeier updated, thanks |
gavofyork
reviewed
Sep 26, 2017
ethcore/wasm/src/tests.rs
Outdated
| @@ -88,7 +88,7 @@ fn logger() { | |||
| }; | |||
|
|
|||
| println!("ext.store: {:?}", ext.store); | |||
| assert_eq!(gas_left, U256::from(98417)); | |||
| assert_eq!(gas_left, U256::from(98731)); | |||
There was a problem hiding this comment.
missing _ for consistency with the others.
gavofyork
reviewed
Sep 26, 2017
ethcore/wasm/src/tests.rs
Outdated
| sender_address: None, | ||
| receive_address: None, | ||
| value: Some(1_000_000_000.into()), | ||
| data: vec![0u8, 2, 4, 8, 16, 32, 64, 128], | ||
| code_address: None, | ||
| } | ||
| )); | ||
| assert_eq!(gas_left, U256::from(98_860)); | ||
| assert_eq!(gas_left, U256::from(99113)); |
gavofyork
reviewed
Sep 26, 2017
ethcore/wasm/src/tests.rs
Outdated
| @@ -441,7 +443,7 @@ fn keccak() { | |||
| }; | |||
|
|
|||
| assert_eq!(H256::from_slice(&result), H256::from("68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87")); | |||
| assert_eq!(gas_left, U256::from(84003)); | |||
| assert_eq!(gas_left, U256::from(84026)); | |||
There was a problem hiding this comment.
missing _ (and others below)
gavofyork
reviewed
Sep 26, 2017
| fn sender(&mut self, context: InterpreterCallerContext) | ||
| -> Result<Option<interpreter::RuntimeValue>, InterpreterError> | ||
| { | ||
| let return_ptr = context.value_stack.pop_as::<i32>()? as u32; |
There was a problem hiding this comment.
why doesn't context.value_stack.pop_as::<u32>()? work?
There was a problem hiding this comment.
it's not native webassembly type
there are only four i32, i64, f32, f64
|
looks ok to me except for the questions/formatting. |
svyatonik
added
A8-looksgood 🦄
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
message arguments are not copied to wasm memory always anymore, they can be retrieved by externs as other blockchain-related stuff