diff options
| author | Everett Hildenbrandt <hildenb2@illinois.edu> | 2018-06-01 06:00:30 +0800 |
|---|---|---|
| committer | Everett Hildenbrandt <hildenb2@illinois.edu> | 2018-06-01 06:21:37 +0800 |
| commit | 16a770ed659c620330ceb5180b4593b48fd02ee0 (patch) | |
| tree | cd99d7843ab921e5d631790ee20b6c8dddefaa0b | |
| parent | 7f03a96a7b52d0c1eb59479897ff2024bc009f61 (diff) | |
| download | tangerine-tests-16a770ed659c620330ceb5180b4593b48fd02ee0.tar tangerine-tests-16a770ed659c620330ceb5180b4593b48fd02ee0.tar.gz tangerine-tests-16a770ed659c620330ceb5180b4593b48fd02ee0.tar.bz2 tangerine-tests-16a770ed659c620330ceb5180b4593b48fd02ee0.tar.lz tangerine-tests-16a770ed659c620330ceb5180b4593b48fd02ee0.tar.xz tangerine-tests-16a770ed659c620330ceb5180b4593b48fd02ee0.tar.zst tangerine-tests-16a770ed659c620330ceb5180b4593b48fd02ee0.zip | |
src/VMTestsFiller: convert inline assembly to hex data to avoid LLL errors
9 files changed, 15 insertions, 9 deletions
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json index 71b89dbae..e389ccc08 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json @@ -12,7 +12,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "//" : "PUSH1 3 JUMP", + "//" : "3 JUMP", "code" : "0x6009436006575b566001", "storage": {} } diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json index 6676c118b..ad4939305 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json @@ -12,7 +12,8 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)", + "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)", + "code" : "0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3", "storage": {} } }, diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json index c732cf419..02104cf27 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json @@ -12,7 +12,8 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)", + "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)", + "code" : "0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3", "storage": {} } }, diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json index e0ca2c214..851354fb3 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json @@ -12,7 +12,8 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)", + "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)", + "code":"0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3", "storage": {} } }, diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json index 2e243ab28..765263d62 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json @@ -12,7 +12,8 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP POP POP 0 MSTORE MSIZE 0 RETURN)", + "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP POP POP 0 MSTORE MSIZE 0 RETURN)", + "code" : "0x60016002600334565b5050600052596000f35b50600052596000f35b505050600052596000f3", "storage": {} } }, diff --git a/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json index 5ea8b0807..901441cdc 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json @@ -12,7 +12,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "(asm PUSH1 0x03 JUMPDEST PUSH1 0x01 SWAP1 SUB DUP1 PUSH1 0x02 JUMPI PUSH9 0x010000000000000016 JUMP JUMPDEST PUSH4 0xbadf000d PUSH1 0x11 SSTORE STOP )", + "code" : "(asm 0x03 JUMPDEST 0x01 SWAP1 SUB DUP1 0x02 JUMPI 0x010000000000000016 JUMP JUMPDEST 0xbadf000d 0x11 SSTORE STOP )", "storage": {} } }, diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json index 64866671b..a8c85d898 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json @@ -19,7 +19,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ (JUMP 0xfffffff) (JUMPDEST) (JUMPDEST) (SSTORE 1 1) }", + "code" : "( asm 0xfffffff JUMP JUMPDEST JUMPDEST 0x01 0x01 SSTORE )", "storage": {} } }, diff --git a/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json index 4526795c3..bab696265 100644 --- a/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json +++ b/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json @@ -12,7 +12,8 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "(asm 10 JUMPDEST 1 DUP2 SUB DUP1 2 JUMPI 0 MSTORE8 1 MSTORE8 2 MSTORE8 3 MSTORE8 4 MSTORE8 5 MSTORE8 6 MSTORE8 7 MSTORE8 8 MSTORE8 9 MSTORE8 MSIZE 0 RETURN)", + "_code" : "(asm 10 JUMPDEST 1 DUP2 SUB DUP1 2 JUMPI 0 MSTORE8 1 MSTORE8 2 MSTORE8 3 MSTORE8 4 MSTORE8 5 MSTORE8 6 MSTORE8 7 MSTORE8 8 MSTORE8 9 MSTORE8 MSIZE 0 RETURN)", + "code" : "0x60015b6001810380600257600053600153600253600353600453600553600653600753600853600953596000f3", "storage": {} } }, diff --git a/src/VMTestsFiller/vmPushDupSwapTest/swapjump1Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swapjump1Filler.json index 52cff7a71..0a021784c 100644 --- a/src/VMTestsFiller/vmPushDupSwapTest/swapjump1Filler.json +++ b/src/VMTestsFiller/vmPushDupSwapTest/swapjump1Filler.json @@ -12,7 +12,8 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "(asm 5 2 1 12 JUMPI POP POP STOP JUMPDEST SWAP1 1 22 JUMPI POP POP STOP JUMPDEST SUB 0 MSTORE 1 31 RETURN)", + "_code" : "(asm 5 2 1 12 JUMPI POP POP STOP JUMPDEST SWAP1 1 22 JUMPI POP POP STOP JUMPDEST SUB 0 MSTORE 1 31 RETURN)", + "code" : "0x600560026001600c575050005b9060016116575050005b035b0360005260016003611ff3", "storage": {} } }, |