EEI: implement getReturnDataSize and returnDataCopy #80
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
jakelang
reviewed
Jan 16, 2018
src/eei.cpp
Outdated
| vector<uint8_t> result(call_result.output_data, call_result.output_data + call_result.output_size); | ||
| result.resize(resultLength); | ||
| storeMemory(result, 0, resultOffset, resultLength); | ||
| lastReturnData.assign(call_result.output_data, call_result.output_data + call_result.output_size); |
There was a problem hiding this comment.
Is call not supposed to store output data at resultOffset anyway?
There was a problem hiding this comment.
There is no point doing that with returndata anymore. See ewasm/design#70
There was a problem hiding this comment.
But you are correct, perhaps I should separate these changes into two: supporting returndata and removing that option.
There was a problem hiding this comment.
Done, that will be a different PR.
jakelang
approved these changes
Jan 16, 2018
chfast
requested changes
Jan 16, 2018
src/eei.cpp
Outdated
| @@ -401,6 +401,23 @@ namespace HeraVM { | |||
| return Literal(); | |||
| } | |||
|
|
|||
| if (import->base == Name("returnDataSize")) { | |||
| HERA_DEBUG << "returnDataSize\n"; | |||
| return Literal((uint32_t)lastReturnData.size()); | |||
src/eei.cpp
Outdated
|
|
||
| lastReturnData.assign(call_result.output_data, call_result.output_data + call_result.output_size); | ||
| } else { | ||
| lastReturnData.resize(0); |
There was a problem hiding this comment.
.resize(0)===.clear().- You have to clear it unconditionally.
src/eei.h
Outdated
| @@ -104,6 +104,7 @@ struct EthereumInterface : ShellExternalInterface { | |||
| struct evm_context* context = nullptr; | |||
| std::vector<uint8_t> const& code; | |||
| struct evm_message const& msg; | |||
| std::vector<uint8_t> lastReturnData = std::vector<uint8_t>(); | |||
There was a problem hiding this comment.
You need a default initializer only for "primitive" types.
chfast
requested changes
Jan 16, 2018
| @@ -475,6 +492,10 @@ namespace HeraVM { | |||
| vector<uint8_t> result(call_result.output_data, call_result.output_data + call_result.output_size); | |||
| result.resize(resultLength); | |||
| storeMemory(result, 0, resultOffset, resultLength); | |||
|
|
|||
| lastReturnData.assign(call_result.output_data, call_result.output_data + call_result.output_size); | |||
chfast
approved these changes
Jan 16, 2018
axic
commented
Jan 17, 2018
src/eei.cpp
Outdated
| @@ -401,6 +401,23 @@ namespace HeraVM { | |||
| return Literal(); | |||
| } | |||
|
|
|||
| if (import->base == Name("returnDataSize")) { | |||
There was a problem hiding this comment.
Should be getReturnDataSize.
axic
changed the title
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
No description provided.