cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't ignore output selection in assembly mode

Browse Source
This commit is contained in:
Kamil Śliwak
2021-11-04 18:23:11 +01:00
parent dd0ff194d4
commit affeff18f5
29 changed files with 213 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
+1
View File
@@ -0,0 +1 @@
--assemble --optimize --yul-dialect evm --machine ewasm --asm
test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
+2
View File
@@ -0,0 +1,2 @@
======= evm_to_wasm_output_selection_asm_only/input.yul (Ewasm) =======
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
+1
View File
@@ -0,0 +1 @@
--assemble --optimize --yul-dialect evm --machine ewasm --ewasm
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
+87
View File
@@ -0,0 +1,87 @@
======= evm_to_wasm_output_selection_ewasm_only/input.yul (Ewasm) =======
==========================
Translated source:
object "object" {
code {
function main()
{
let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
i64.store(0:i32, y)
i64.store(i32.add(0:i32, 8:i32), y)
i64.store(i32.add(0:i32, 16:i32), y)
i64.store(i32.add(0:i32, 24:i32), y)
i64.store(32:i32, y)
i64.store(i32.add(32:i32, 8:i32), y)
i64.store(i32.add(32:i32, 16:i32), y)
let hi_1 := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(42))), 32)
i64.store(i32.add(32:i32, 24:i32), i64.or(hi_1, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(42, 32))))))
eth.storageStore(0:i32, 32:i32)
}
function bswap16(x:i32) -> y:i32
{
y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
}
function bswap32(x:i32) -> y:i32
{
let hi:i32 := i32.shl(bswap16(x), 16:i32)
y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
}
}
}
Text representation:
(module
(import "ethereum" "storageStore" (func $eth.storageStore (param i32 i32)))
(memory $memory (export "memory") 1)
(export "main" (func $main))
(func $main
(local $hi i64)
(local $y i64)
(local $hi_1 i64)
(block $label_
(local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 0)))) (i64.const 32)))
(local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 0) (i64.const 32)))))))
(i64.store (i32.const 0) (local.get $y))
(i64.store (i32.add (i32.const 0) (i32.const 8)) (local.get $y))
(i64.store (i32.add (i32.const 0) (i32.const 16)) (local.get $y))
(i64.store (i32.add (i32.const 0) (i32.const 24)) (local.get $y))
(i64.store (i32.const 32) (local.get $y))
(i64.store (i32.add (i32.const 32) (i32.const 8)) (local.get $y))
(i64.store (i32.add (i32.const 32) (i32.const 16)) (local.get $y))
(local.set $hi_1 (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 42)))) (i64.const 32)))
(i64.store (i32.add (i32.const 32) (i32.const 24)) (i64.or (local.get $hi_1) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 42) (i64.const 32)))))))
(call $eth.storageStore (i32.const 0) (i32.const 32))
)
)
(func $bswap16
(param $x i32)
(result i32)
(local $y i32)
(block $label__1
(local.set $y (i32.or (i32.and (i32.shl (local.get $x) (i32.const 8)) (i32.const 65280)) (i32.and (i32.shr_u (local.get $x) (i32.const 8)) (i32.const 255))))
)
(local.get $y)
)
(func $bswap32
(param $x i32)
(result i32)
(local $y i32)
(local $hi i32)
(block $label__2
(local.set $hi (i32.shl (call $bswap16 (local.get $x)) (i32.const 16)))
(local.set $y (i32.or (local.get $hi) (call $bswap16 (i32.shr_u (local.get $x) (i32.const 16)))))
)
(local.get $y)
)
)
test/cmdlineTests/strict_asm_output_selection_asm_only/args
+1
View File
@@ -0,0 +1 @@
--strict-assembly --optimize --asm
test/cmdlineTests/strict_asm_output_selection_asm_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/strict_asm_output_selection_asm_only/output
+12
View File
@@ -0,0 +1,12 @@
======= strict_asm_output_selection_asm_only/input.yul (EVM) =======
Text representation:
/* "strict_asm_output_selection_asm_only/input.yul":15:17 */
0x2a
/* "strict_asm_output_selection_asm_only/input.yul":29:30 */
0x00
/* "strict_asm_output_selection_asm_only/input.yul":22:34 */
sstore
/* "strict_asm_output_selection_asm_only/input.yul":0:36 */
stop
test/cmdlineTests/strict_asm_output_selection_bin_only/args
+1
View File
@@ -0,0 +1 @@
--strict-assembly --optimize --bin
test/cmdlineTests/strict_asm_output_selection_bin_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/strict_asm_output_selection_bin_only/output
+5
View File
@@ -0,0 +1,5 @@
======= strict_asm_output_selection_bin_only/input.yul (EVM) =======
Binary representation:
602a60005500
test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
+1
View File
@@ -0,0 +1 @@
--strict-assembly --optimize --ewasm
test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
+2
View File
@@ -0,0 +1,2 @@
======= strict_asm_output_selection_ewasm_only/input.yul (EVM) =======
test/cmdlineTests/strict_asm_output_selection_invalid/err
+1 -1
View File
@@ -1 +1 @@
The following outputs are not supported in assembler mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --ewasm, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
The following outputs are not supported in assembler mode: --abi, --asm-json, --bin-runtime, --devdoc, --hashes, --ir, --metadata, --opcodes, --storage-layout, --userdoc.
test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args
+1
View File
@@ -0,0 +1 @@
--strict-assembly --optimize --ir-optimized
test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output
+7
View File
@@ -0,0 +1,7 @@
======= strict_asm_output_selection_ir_optimized_only/input.yul (EVM) =======
Pretty printed source:
object "object" {
code { { sstore(0, 42) } }
}
test/solc/CommandLineParser.cpp
+8
View File
@@ -297,6 +297,10 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
"underflow,"
"divByZero",
"--model-checker-timeout=5", // Ignored in assembly mode
"--asm",
"--bin",
"--ir-optimized",
"--ewasm",
};
commandLine += assemblyOptions;
if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
@@ -333,6 +337,10 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
};
expectedOptions.formatting.coloredOutput = false;
expectedOptions.formatting.withErrorIds = true;
expectedOptions.compiler.outputs.asm_ = true;
expectedOptions.compiler.outputs.binary = true;
expectedOptions.compiler.outputs.irOptimized = true;
expectedOptions.compiler.outputs.ewasm = true;
if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
{
expectedOptions.optimizer.enabled = true;