cerc-io/solidity
10
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

Use plain strings for comparison.

Browse Source
This commit is contained in:
chriseth 2020-07-09 14:56:34 +02:00
parent ec2393d3b6
commit 3cf5ed9514
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
View File

@ -76,11 +76,12 @@ u256 EwasmBuiltinInterpreter::evalBuiltin(YulString _fun, vector<u256> const& _a
for (u256 const& a: _arguments) for (u256 const& a: _arguments)
arg.emplace_back(uint64_t(a & uint64_t(-1))); arg.emplace_back(uint64_t(a & uint64_t(-1)));
if (_fun == "datasize"_yulstring) string fun = _fun.str();
if (fun == "datasize")
return u256(keccak256(h256(_arguments.at(0)))) & 0xfff; return u256(keccak256(h256(_arguments.at(0)))) & 0xfff;
else if (_fun == "dataoffset"_yulstring) else if (fun == "dataoffset")
return u256(keccak256(h256(_arguments.at(0) + 2))) & 0xfff; return u256(keccak256(h256(_arguments.at(0) + 2))) & 0xfff;
else if (_fun == "datacopy"_yulstring) else if (fun == "datacopy")
{ {
// This is identical to codecopy. // This is identical to codecopy.
if (accessMemory(_arguments.at(0), _arguments.at(2))) if (accessMemory(_arguments.at(0), _arguments.at(2)))
@ -93,49 +94,49 @@ u256 EwasmBuiltinInterpreter::evalBuiltin(YulString _fun, vector<u256> const& _a
); );
return 0; return 0;
} }
else if (_fun == "i32.drop"_yulstring || _fun == "i64.drop"_yulstring || _fun == "nop"_yulstring) else if (fun == "i32.drop" || fun == "i64.drop" || fun == "nop")
return {}; return {};
else if (_fun == "i32.wrap_i64"_yulstring) else if (fun == "i32.wrap_i64")
return arg.at(0) & uint32_t(-1); return arg.at(0) & uint32_t(-1);
else if (_fun == "i64.extend_i32_u"_yulstring) else if (fun == "i64.extend_i32_u")
// Return the same as above because everything is u256 anyway. // Return the same as above because everything is u256 anyway.
return arg.at(0) & uint32_t(-1); return arg.at(0) & uint32_t(-1);
else if (_fun == "unreachable"_yulstring) else if (fun == "unreachable")
{ {
logTrace(evmasm::Instruction::INVALID, {}); logTrace(evmasm::Instruction::INVALID, {});
throw ExplicitlyTerminated(); throw ExplicitlyTerminated();
} }
else if (_fun == "i64.store"_yulstring) else if (fun == "i64.store")
{ {
accessMemory(arg[0], 8); accessMemory(arg[0], 8);
writeMemoryWord(arg[0], arg[1]); writeMemoryWord(arg[0], arg[1]);
return 0; return 0;
} }
else if (_fun == "i64.store8"_yulstring || _fun == "i32.store8"_yulstring) else if (fun == "i64.store8" || fun == "i32.store8")
{ {
accessMemory(arg[0], 1); accessMemory(arg[0], 1);
writeMemoryByte(arg[0], static_cast<uint8_t>(arg[1] & 0xff)); writeMemoryByte(arg[0], static_cast<uint8_t>(arg[1] & 0xff));
return 0; return 0;
} }
else if (_fun == "i64.load"_yulstring) else if (fun == "i64.load")
{ {
accessMemory(arg[0], 8); accessMemory(arg[0], 8);
return readMemoryWord(arg[0]); return readMemoryWord(arg[0]);
} }
else if (_fun == "i32.store"_yulstring) else if (fun == "i32.store")
{ {
accessMemory(arg[0], 4); accessMemory(arg[0], 4);
writeMemoryHalfWord(arg[0], arg[1]); writeMemoryHalfWord(arg[0], arg[1]);
return 0; return 0;
} }
else if (_fun == "i32.load"_yulstring) else if (fun == "i32.load")
{ {
accessMemory(arg[0], 4); accessMemory(arg[0], 4);
return readMemoryHalfWord(arg[0]); return readMemoryHalfWord(arg[0]);
} }
string prefix = _fun.str(); string prefix = fun;
string suffix; string suffix;
auto dot = prefix.find("."); auto dot = prefix.find(".");
if (dot != string::npos) if (dot != string::npos)