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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
15ad214
use latest cpp-ethereum/hera
cdetrio May 16, 2018
7c8190c
try develop
cdetrio May 16, 2018
095e532
try older commit
cdetrio May 17, 2018
d84ae51
try develop 2
cdetrio May 17, 2018
5a03555
update EEI params for CALL
cdetrio May 17, 2018
c039bd0
dump state in cpp-ethereum
cdetrio May 17, 2018
5c5d5cb
fix endianness for i128 and address outputs
cdetrio May 17, 2018
1cb96f0
use hera branch code-size
cdetrio May 17, 2018
f9e6a30
CALL with 2300 gas subsidy
cdetrio May 17, 2018
27aab0e
let Hera handle the 2300 gas subsidy for CALL
cdetrio May 17, 2018
225fde0
delete 6th and 7th CALL params from stack
cdetrio May 18, 2018
b4fd098
unpin hera
cdetrio May 18, 2018
6a797ef
flip CALL result from EEI/POSIX convention to EVM convention
cdetrio May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,29 @@ defaults:
# cd hera
# git fetch origin evm2wasm-trace
# git checkout evm2wasm-trace
# cpp-ethereum 39298c7c2ed658dcb1e35bff4f88d09f26e1df11 was working locally
# hera branch code-size has the getCodeSize fix https://github.com/ewasm/hera/pull/217
command: |
git clone https://github.com/ethereum/cpp-ethereum --branch ewasm-json-trace --single-branch
git clone https://github.com/cdetrio/cpp-ethereum --branch ewasm-dump-state --single-branch
cd cpp-ethereum
git submodule update --init --recursive
git submodule update --init
cd hera
git pull origin master
git fetch origin gas-63-64ths
git checkout gas-63-64ths
git submodule update --init
cd evmc
ls -al

build-cpp-eth: &build-cpp-eth
run:
name: "Build cpp-ethereum and hera"
working_directory: ~/
# cmake ../cpp-ethereum -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHERA=ON -DHERA_DEBUGGING=ON -DHERA_EVM2WASM=ON
command: |
mkdir -p build
cd build
cmake ../cpp-ethereum -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHERA=ON -DHERA_DEBUGGING=ON -DHERA_EVM2WASM=ON
cmake ../cpp-ethereum -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHERA=ON
make -j4

print-cpp-hera-version: &print-cpp-hera-version
Expand All @@ -85,8 +94,9 @@ defaults:
echo 'export PATH=~/evm2wasm/bin:$PATH' >> $BASH_ENV
source $BASH_ENV
echo "running testeth command..."
test/testeth -t GeneralStateTests/stExample -- --testpath ~/cpp-ethereum/test/jsontests --singlenet "Byzantium" --singletest "add11" --vm hera --evmc evm2wasm.js=true --evmc evm2wasm.js-trace=true --evmc fallback=false
test/testeth -t GeneralStateTests/stStackTests -- --testpath ~/cpp-ethereum/test/jsontests --singlenet "Byzantium" --vm hera --evmc evm2wasm.js=true --evmc fallback=false
test/testeth -t GeneralStateTests/stExample -- --testpath ~/cpp-ethereum/test/jsontests --singlenet "Byzantium" --singletest "add11" --vm hera --evmc evm2wasm=true --evmc evm2wasm.js=true --evmc evm2wasm.js-trace=true --evmc fallback=false
test/testeth -t GeneralStateTests/stCallCodes -- --testpath ~/cpp-ethereum/test/jsontests --singlenet "Byzantium" --singletest "callcall_00" --vm hera --evmc evm2wasm=true --evmc evm2wasm.js=true --evmc evm2wasm.js-trace=true --evmc fallback=false
test/testeth -t GeneralStateTests/stStackTests -- --testpath ~/cpp-ethereum/test/jsontests --singlenet "Byzantium" --vm hera --evmc evm2wasm=true --evmc evm2wasm.js=true --evmc fallback=false
echo "ran the state tests."

cli-tests: &cli-tests
Expand Down
80 changes: 74 additions & 6 deletions wasm/generateInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const interfaceManifest = {
CALL: {
name: 'call',
async: true,
input: ['i64', 'address', 'i128', 'readOffset', 'length', 'writeOffset', 'length'],
input: ['i64', 'address', 'i128', 'readOffset', 'length'],
output: ['i32']
},
CALLCODE: {
Expand Down Expand Up @@ -223,13 +223,33 @@ function generateManifest (interfaceManifest, opts) {
// the wasm memory offset is a new item on the EVM stack
spOffset++
call += `(i32.add (get_global $sp) (i32.const ${spOffset * 32}))`
} else if (input === 'i64' && opcode === 'CALL') {
// i64 param for CALL is the gas
// add 2300 gas subsidy
// for now this only works if the gas is a 64-bit value
// TODO: use 256-bit arithmetic
/*
call += `(call $check_overflow_i64
(i64.add (i64.const 2300)
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32}))))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3}))))`
*/

// 2300 gas subsidy is done in Hera
call += `(call $check_overflow_i64
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3}))))`
} else if (input === 'i32') {
call += `(call $check_overflow
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3}))))`
} else if (input === 'i64') {
} else if (input === 'i64' && opcode !== 'CALL') {
call += `(call $check_overflow_i64
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
Expand All @@ -245,7 +265,44 @@ function generateManifest (interfaceManifest, opts) {
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})))))`
call += `(get_local $offset${numOfLocals})`
} else if (input === 'length') {
} else if (input === 'length' && opcode === 'CALL') {
// CALLs in EVM have 7 arguments
// but in ewasm CALLs only have 5 arguments
// so delete the bottom two stack elements, after processing the 5th argument

locals += `(local $length${numOfLocals} i32)`
body += `(set_local $length${numOfLocals}
(call $check_overflow
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
(i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})))))

(call $memusegas (get_local $offset${numOfLocals}) (get_local $length${numOfLocals}))
(set_local $offset${numOfLocals} (i32.add (get_global $memstart) (get_local $offset${numOfLocals})))`

call += `(get_local $length${numOfLocals})`
numOfLocals++

// delete 6th stack element
spOffset--
call += `
;; zero out mem
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 4})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 1})) (i64.const 0))`

// delete 7th stack element
spOffset--
call += `
;; zero out mem
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 4})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 1})) (i64.const 0))`

} else if (input === 'length' && opcode !== 'CALL') {
locals += `(local $length${numOfLocals} i32)`
body += `(set_local $length${numOfLocals}
(call $check_overflow
Expand Down Expand Up @@ -281,7 +338,7 @@ function generateManifest (interfaceManifest, opts) {
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})) (i64.const 0))`

if (!op.async) {
call += '(drop (call $bswap_m128 (i32.add (i32.const 32)(get_global $sp))))'
call += '(drop (i32.add (i32.const 32)(get_global $sp)))'
}
} else if (output === 'address') {
call =
Expand All @@ -292,7 +349,7 @@ function generateManifest (interfaceManifest, opts) {
}

call += `)
(drop (call $bswap_m160 (i32.add (get_global $sp) (i32.const ${spOffset * 32}))))
(drop (i32.add (get_global $sp) (i32.const ${spOffset * 32})))
;; zero out mem
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})) (i64.const 0))
(i32.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2 + 4})) (i32.const 0))`
Expand All @@ -313,16 +370,27 @@ function generateManifest (interfaceManifest, opts) {
call += '(get_local $callback)'
}

if (opcode === 'CALL') {
call =
`(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.

)))`
} else {
call =
`(i64.store
(i32.add (get_global $sp) (i32.const ${spOffset * 32}))
(i64.extend_u/i32
${call})))
${call})))`
}

call += `
;; zero out mem
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})) (i64.const 0))
(i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})) (i64.const 0))`

} else if (output === 'i64') {
if (useAsyncAPI && op.async) {
call += '(get_local $callback)'
Expand Down
Loading