mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
[libevmasm] Add more tests.
This commit is contained in:
parent
200684a3b9
commit
ef150b7fa6
@ -55,7 +55,8 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
{
|
{
|
||||||
map<string, unsigned> indices = {
|
map<string, unsigned> indices = {
|
||||||
{ "root.asm", 0 },
|
{ "root.asm", 0 },
|
||||||
{ "sub.asm", 1 }
|
{ "sub.asm", 1 },
|
||||||
|
{ "verbatim.asm", 2 }
|
||||||
};
|
};
|
||||||
Assembly _assembly;
|
Assembly _assembly;
|
||||||
auto root_asm = make_shared<string>("root.asm");
|
auto root_asm = make_shared<string>("root.asm");
|
||||||
@ -64,11 +65,22 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
Assembly _subAsm;
|
Assembly _subAsm;
|
||||||
auto sub_asm = make_shared<string>("sub.asm");
|
auto sub_asm = make_shared<string>("sub.asm");
|
||||||
_subAsm.setSourceLocation({6, 8, sub_asm});
|
_subAsm.setSourceLocation({6, 8, sub_asm});
|
||||||
|
|
||||||
|
Assembly _verbatimAsm;
|
||||||
|
auto verbatim_asm = make_shared<string>("verbatim.asm");
|
||||||
|
_verbatimAsm.setSourceLocation({8, 18, verbatim_asm});
|
||||||
|
|
||||||
// PushImmutable
|
// PushImmutable
|
||||||
_subAsm.appendImmutable("someImmutable");
|
_subAsm.appendImmutable("someImmutable");
|
||||||
|
_subAsm.append(AssemblyItem(PushTag, 0));
|
||||||
_subAsm.append(Instruction::INVALID);
|
_subAsm.append(Instruction::INVALID);
|
||||||
shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
|
shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
|
||||||
|
|
||||||
|
_verbatimAsm.appendVerbatim({0xff,0xff}, 0, 0);
|
||||||
|
_verbatimAsm.appendVerbatim({0x74, 0x65, 0x73, 0x74}, 0, 1);
|
||||||
|
_verbatimAsm.append(Instruction::MSTORE);
|
||||||
|
shared_ptr<Assembly> _verbatimAsmPtr = make_shared<Assembly>(_verbatimAsm);
|
||||||
|
|
||||||
// Tag
|
// Tag
|
||||||
auto tag = _assembly.newTag();
|
auto tag = _assembly.newTag();
|
||||||
_assembly.append(tag);
|
_assembly.append(tag);
|
||||||
@ -89,6 +101,10 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
auto sub = _assembly.appendSubroutine(_subAsmPtr);
|
auto sub = _assembly.appendSubroutine(_subAsmPtr);
|
||||||
// PushSub
|
// PushSub
|
||||||
_assembly.pushSubroutineOffset(static_cast<size_t>(sub.data()));
|
_assembly.pushSubroutineOffset(static_cast<size_t>(sub.data()));
|
||||||
|
// PushSubSize
|
||||||
|
auto verbatim_sub = _assembly.appendSubroutine(_verbatimAsmPtr);
|
||||||
|
// PushSub
|
||||||
|
_assembly.pushSubroutineOffset(static_cast<size_t>(verbatim_sub.data()));
|
||||||
// PushDeployTimeAddress
|
// PushDeployTimeAddress
|
||||||
_assembly.append(PushDeployTimeAddress);
|
_assembly.append(PushDeployTimeAddress);
|
||||||
// AssignImmutable.
|
// AssignImmutable.
|
||||||
@ -105,12 +121,12 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
|
|
||||||
BOOST_CHECK_EQUAL(
|
BOOST_CHECK_EQUAL(
|
||||||
_assembly.assemble().toHex(),
|
_assembly.assemble().toHex(),
|
||||||
"5b6001600220606f73__$bf005014d9d0f534b8fcb268bd84c491a2$__"
|
"5b6001600220607c73__$bf005014d9d0f534b8fcb268bd84c491a2$__"
|
||||||
"6000566067602260457300000000000000000000000000000000000000005050"
|
"6000566074602460496007606d7300000000000000000000000000000000000000005050"
|
||||||
"600260010152"
|
"600260010152"
|
||||||
"00fe"
|
"00fe"
|
||||||
"7f0000000000000000000000000000000000000000000000000000000000000000"
|
"7f0000000000000000000000000000000000000000000000000000000000000000"
|
||||||
"fe010203044266eeaa"
|
"6000feffff7465737452010203044266eeaa"
|
||||||
);
|
);
|
||||||
BOOST_CHECK_EQUAL(
|
BOOST_CHECK_EQUAL(
|
||||||
_assembly.assemblyString(),
|
_assembly.assemblyString(),
|
||||||
@ -123,6 +139,8 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
" data_a6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b\n"
|
" data_a6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b\n"
|
||||||
" dataSize(sub_0)\n"
|
" dataSize(sub_0)\n"
|
||||||
" dataOffset(sub_0)\n"
|
" dataOffset(sub_0)\n"
|
||||||
|
" dataSize(sub_1)\n"
|
||||||
|
" dataOffset(sub_1)\n"
|
||||||
" deployTimeAddress()\n"
|
" deployTimeAddress()\n"
|
||||||
" assignImmutable(\"0xc3978657661c4d8e32e3d5f42597c009f0d3859e9f9d0d94325268f9799e2bfb\")\n"
|
" assignImmutable(\"0xc3978657661c4d8e32e3d5f42597c009f0d3859e9f9d0d94325268f9799e2bfb\")\n"
|
||||||
" 0x02\n"
|
" 0x02\n"
|
||||||
@ -134,13 +152,20 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
"sub_0: assembly {\n"
|
"sub_0: assembly {\n"
|
||||||
" /* \"sub.asm\":6:8 */\n"
|
" /* \"sub.asm\":6:8 */\n"
|
||||||
" immutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
|
" immutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
|
||||||
|
" tag_0\n"
|
||||||
" invalid\n"
|
" invalid\n"
|
||||||
"}\n"
|
"}\n"
|
||||||
"\n"
|
"\n"
|
||||||
|
"sub_1: assembly {\n"
|
||||||
|
" /* \"verbatim.asm\":8:18 */\n"
|
||||||
|
" verbatimbytecode_ffff\n"
|
||||||
|
" verbatimbytecode_74657374\n"
|
||||||
|
" mstore\n"
|
||||||
|
"}\n"
|
||||||
|
"\n"
|
||||||
"auxdata: 0x4266eeaa\n"
|
"auxdata: 0x4266eeaa\n"
|
||||||
);
|
);
|
||||||
BOOST_CHECK_EQUAL(
|
string json{
|
||||||
util::jsonCompactPrint(_assembly.assemblyJSON(indices)),
|
|
||||||
"{\".auxdata\":\"4266eeaa\",\".code\":["
|
"{\".auxdata\":\"4266eeaa\",\".code\":["
|
||||||
"{\"begin\":1,\"end\":3,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
|
"{\"begin\":1,\"end\":3,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
|
||||||
"{\"begin\":1,\"end\":3,\"name\":\"JUMPDEST\",\"source\":0},"
|
"{\"begin\":1,\"end\":3,\"name\":\"JUMPDEST\",\"source\":0},"
|
||||||
@ -154,6 +179,8 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
"{\"begin\":1,\"end\":3,\"name\":\"PUSH data\",\"source\":0,\"value\":\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\"},"
|
"{\"begin\":1,\"end\":3,\"name\":\"PUSH data\",\"source\":0,\"value\":\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\"},"
|
||||||
"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
|
"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
|
||||||
"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
|
"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
|
||||||
|
"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000001\"},"
|
||||||
|
"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000001\"},"
|
||||||
"{\"begin\":1,\"end\":3,\"name\":\"PUSHDEPLOYADDRESS\",\"source\":0},"
|
"{\"begin\":1,\"end\":3,\"name\":\"PUSHDEPLOYADDRESS\",\"source\":0},"
|
||||||
"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someOtherImmutable\"},"
|
"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someOtherImmutable\"},"
|
||||||
"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2\"},"
|
"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2\"},"
|
||||||
@ -161,9 +188,23 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
|
|||||||
"{\"begin\":1,\"end\":3,\"name\":\"STOP\",\"source\":0}"
|
"{\"begin\":1,\"end\":3,\"name\":\"STOP\",\"source\":0}"
|
||||||
"],\".data\":{\"0\":{\".code\":["
|
"],\".data\":{\"0\":{\".code\":["
|
||||||
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
|
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
|
||||||
|
"{\"begin\":6,\"end\":8,\"name\":\"PUSH [ErrorTag]\",\"source\":1},"
|
||||||
"{\"begin\":6,\"end\":8,\"name\":\"INVALID\",\"source\":1}"
|
"{\"begin\":6,\"end\":8,\"name\":\"INVALID\",\"source\":1}"
|
||||||
"]},\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\":\"01020304\"}}"
|
"]},"
|
||||||
);
|
"\"1\":{\".code\":["
|
||||||
|
"{\"begin\":8,\"end\":18,\"name\":\"VERBATIM\",\"source\":2,\"value\":\"ffff\"},"
|
||||||
|
"{\"begin\":8,\"end\":18,\"name\":\"VERBATIM\",\"source\":2,\"value\":\"74657374\"},"
|
||||||
|
"{\"begin\":8,\"end\":18,\"name\":\"MSTORE\",\"source\":2}"
|
||||||
|
"]},\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\":\"01020304\"},\"sourceList\":[\"root.asm\",\"sub.asm\",\"verbatim.asm\"]}"
|
||||||
|
};
|
||||||
|
Json::Value jsonValue;
|
||||||
|
BOOST_CHECK(util::jsonParseStrict(json, jsonValue));
|
||||||
|
BOOST_CHECK_EQUAL(util::jsonCompactPrint(_assembly.assemblyJSON(indices)), util::jsonCompactPrint(jsonValue));
|
||||||
|
|
||||||
|
Assembly _assemblyFromJson;
|
||||||
|
_assemblyFromJson.loadFromAssemblyJSON(_assembly.assemblyJSON(indices));
|
||||||
|
BOOST_CHECK_EQUAL(util::jsonCompactPrint(_assemblyFromJson.assemblyJSON(indices)), util::jsonCompactPrint(jsonValue));
|
||||||
|
BOOST_CHECK_EQUAL(_assembly.assemble().toHex(), _assemblyFromJson.assemble().toHex());
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
|
BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
|
||||||
@ -342,7 +383,7 @@ BOOST_AUTO_TEST_CASE(immutable)
|
|||||||
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
|
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
|
||||||
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someOtherImmutable\"},"
|
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someOtherImmutable\"},"
|
||||||
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"}"
|
"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"}"
|
||||||
"]}}}"
|
"]}},\"sourceList\":[\"root.asm\",\"sub.asm\"]}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user