Skip to content
This repository has been archived by the owner on Jan 5, 2019. It is now read-only.

fixes for stCallCodes/callcall_00 #246

Closed
wants to merge 13 commits into from
Closed

fixes for stCallCodes/callcall_00 #246

wants to merge 13 commits into from

Conversation

cdetrio
Copy link
Collaborator

@cdetrio cdetrio commented May 16, 2018 •
edited by axic
Loading

Part of #184.

axic
axic reviewed May 16, 2018
View reviewed changes
circle.yml Outdated
@@ -51,10 +51,12 @@ defaults:
# git fetch origin evm2wasm-trace
# git checkout evm2wasm-trace
command: |
git clone https://github.com/ethereum/cpp-ethereum --branch ewasm-json-trace --single-branch
git clone https://github.com/ethereum/cpp-ethereum --branch develop --single-branch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be using the ewasm branch IIRC.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ewasm branch last commit was 23 days ago. I've been using develop locally and it works.

Copy link
Member

@axic axic May 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just rebase ewasm against develop and push it. The last decision was to keep it up to date. However I do not think there were any relevant changes on develop.

@cdetrio cdetrio force-pushed the callcall branch 2 times, most recently from 6b0563c to a793093 Compare May 16, 2018 22:38
@cdetrio
Copy link
Collaborator Author

cdetrio commented May 17, 2018

The cpp-ethereum build step kept failing with this error:

[ 72%] Building CXX object test/CMakeFiles/testeth.dir/tools/jsontests/BlockChainTests.cpp.o
[ 73%] Building CXX object test/CMakeFiles/testeth.dir/tools/jsontests/StateTests.cpp.o
[ 73%] Building CXX object test/CMakeFiles/testeth.dir/tools/jsontests/TransactionTests.cpp.o
c++: internal compiler error: Killed (program cc1plus)
Please submit a full bug report,
with preprocessed source if appropriate.
See <file:///usr/share/doc/gcc-6/README.Bugs> for instructions.
eth/CMakeFiles/eth.dir/build.make:86: recipe for target 'eth/CMakeFiles/eth.dir/main.cpp.o' failed
make[2]: *** [eth/CMakeFiles/eth.dir/main.cpp.o] Error 4
CMakeFiles/Makefile2:1043: recipe for target 'eth/CMakeFiles/eth.dir/all' failed
make[1]: *** [eth/CMakeFiles/eth.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

It started building successfully again at commit d84ae51 "try develop 2". I also updated the node-cpp-build-env docker image before that though, so not exactly sure what fixed it.

axic
axic reviewed May 25, 2018
View reviewed changes
wasm/generateInterface.js
`(i64.store
(i32.add (get_global $sp) (i32.const ${spOffset * 32}))
(i64.extend_u/i32
(i32.xor (i32.const 1) ${call}) ;; flip CALL result from EVM convention to POSIX convention, 0 -> 1, 1 -> 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not enough, because it could return 2, which is xor'd into 3.

@axic axic mentioned this pull request May 26, 2018
Merged
@lrettig
Copy link
Member

lrettig commented May 27, 2018

Note that this partially overlaps with #196 e.g. https://github.com/ewasm/evm2wasm/pull/196/files#diff-e7aee89bb9a80fcf0c9c6ade2d73b4c8R125

@lrettig lrettig mentioned this pull request May 27, 2018
Closed
@axic axic mentioned this pull request May 27, 2018
Merged
@lrettig lrettig closed this in #264 May 28, 2018
@axic axic deleted the callcall branch May 29, 2018 01:48
@lrettig lrettig mentioned this pull request May 31, 2018
Open
16 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@axic axic axic left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cdetrio @lrettig @axic