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

Fix opcodes.

Browse Source
This commit is contained in:
chriseth 2022-03-03 20:21:06 +01:00
parent 118a0f2125
commit d3aa06dc12
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libyul/optimiser/ReasoningBasedSimplifier.cpp
View File

@ -138,6 +138,7 @@ smtutil::Expression ReasoningBasedSimplifier::encodeEVMBuiltin(
return result; return result;
} }
case evmasm::Instruction::MUL: case evmasm::Instruction::MUL:
// TODO this only works for multiplication by constants.
return wrap(arguments.at(0) * arguments.at(1)); return wrap(arguments.at(0) * arguments.at(1));
case evmasm::Instruction::SUB: case evmasm::Instruction::SUB:
{ {
@ -146,13 +147,18 @@ smtutil::Expression ReasoningBasedSimplifier::encodeEVMBuiltin(
return result; return result;
} }
case evmasm::Instruction::DIV: case evmasm::Instruction::DIV:
break;
/*
// TODO add assertion that result is <= input // TODO add assertion that result is <= input
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(1) == constantValue(0), arguments.at(1) == constantValue(0),
constantValue(0), constantValue(0),
arguments.at(0) / arguments.at(1) arguments.at(0) / arguments.at(1)
); );
*/
case evmasm::Instruction::SDIV: case evmasm::Instruction::SDIV:
break;
/*
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(1) == constantValue(0), arguments.at(1) == constantValue(0),
constantValue(0), constantValue(0),
@ -164,13 +170,19 @@ smtutil::Expression ReasoningBasedSimplifier::encodeEVMBuiltin(
twosComplementToUpscaledUnsigned(arguments.at(1)) twosComplementToUpscaledUnsigned(arguments.at(1))
)) ))
); );
*/
case evmasm::Instruction::MOD: case evmasm::Instruction::MOD:
break;
/*
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(1) == constantValue(0), arguments.at(1) == constantValue(0),
constantValue(0), constantValue(0),
arguments.at(0) % arguments.at(1) arguments.at(0) % arguments.at(1)
); );
*/
case evmasm::Instruction::SMOD: case evmasm::Instruction::SMOD:
break;
/*
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(1) == constantValue(0), arguments.at(1) == constantValue(0),
constantValue(0), constantValue(0),
@ -179,6 +191,7 @@ smtutil::Expression ReasoningBasedSimplifier::encodeEVMBuiltin(
twosComplementToUpscaledUnsigned(arguments.at(1)) twosComplementToUpscaledUnsigned(arguments.at(1))
)) ))
); );
*/
case evmasm::Instruction::LT: case evmasm::Instruction::LT:
return booleanValue(arguments.at(0) < arguments.at(1)); return booleanValue(arguments.at(0) < arguments.at(1));
case evmasm::Instruction::SLT: case evmasm::Instruction::SLT:
@ -202,49 +215,58 @@ smtutil::Expression ReasoningBasedSimplifier::encodeEVMBuiltin(
(arguments.at(0) == 0 || arguments.at(0) == 1) && (arguments.at(0) == 0 || arguments.at(0) == 1) &&
(arguments.at(1) == 0 || arguments.at(1) == 1), (arguments.at(1) == 0 || arguments.at(1) == 1),
booleanValue(arguments.at(0) == 1 && arguments.at(1) == 1), booleanValue(arguments.at(0) == 1 && arguments.at(1) == 1),
bv2int(int2bv(arguments.at(0)) & int2bv(arguments.at(1))) // TODO we could probably restrict it a bit more
newRestrictedVariable()
); );
case evmasm::Instruction::OR: case evmasm::Instruction::OR:
return smtutil::Expression::ite( return smtutil::Expression::ite(
(arguments.at(0) == 0 || arguments.at(0) == 1) && (arguments.at(0) == 0 || arguments.at(0) == 1) &&
(arguments.at(1) == 0 || arguments.at(1) == 1), (arguments.at(1) == 0 || arguments.at(1) == 1),
booleanValue(arguments.at(0) == 1 || arguments.at(1) == 1), booleanValue(arguments.at(0) == 1 || arguments.at(1) == 1),
bv2int(int2bv(arguments.at(0)) | int2bv(arguments.at(1))) // TODO we could probably restrict it a bit more
newRestrictedVariable()
); );
case evmasm::Instruction::XOR: case evmasm::Instruction::XOR:
return bv2int(int2bv(arguments.at(0)) ^ int2bv(arguments.at(1))); break;
//return bv2int(int2bv(arguments.at(0)) ^ int2bv(arguments.at(1)));
case evmasm::Instruction::NOT: case evmasm::Instruction::NOT:
return smtutil::Expression(u256(-1)) - arguments.at(0); return smtutil::Expression(u256(-1)) - arguments.at(0);
case evmasm::Instruction::SHL: case evmasm::Instruction::SHL:
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(0) > 255, arguments.at(0) > 255,
constantValue(0), constantValue(0),
bv2int(int2bv(arguments.at(1)) << int2bv(arguments.at(0))) newRestrictedVariable() // TODO bv2int(int2bv(arguments.at(1)) << int2bv(arguments.at(0)))
); );
case evmasm::Instruction::SHR: case evmasm::Instruction::SHR:
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(0) > 255, arguments.at(0) > 255,
constantValue(0), constantValue(0),
bv2int(int2bv(arguments.at(1)) >> int2bv(arguments.at(0))) newRestrictedVariable() // TODO bv2int(int2bv(arguments.at(1)) >> int2bv(arguments.at(0)))
); );
case evmasm::Instruction::SAR: case evmasm::Instruction::SAR:
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(0) > 255, arguments.at(0) > 255,
constantValue(0), constantValue(0),
bv2int(smtutil::Expression::ashr(int2bv(arguments.at(1)), int2bv(arguments.at(0)))) newRestrictedVariable() // TODO bv2int(smtutil::Expression::ashr(int2bv(arguments.at(1)), int2bv(arguments.at(0))))
); );
case evmasm::Instruction::ADDMOD: case evmasm::Instruction::ADDMOD:
break;
/*
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(2) == constantValue(0), arguments.at(2) == constantValue(0),
constantValue(0), constantValue(0),
(arguments.at(0) + arguments.at(1)) % arguments.at(2) (arguments.at(0) + arguments.at(1)) % arguments.at(2)
); );
*/
case evmasm::Instruction::MULMOD: case evmasm::Instruction::MULMOD:
break;
/*
return smtutil::Expression::ite( return smtutil::Expression::ite(
arguments.at(2) == constantValue(0), arguments.at(2) == constantValue(0),
constantValue(0), constantValue(0),
(arguments.at(0) * arguments.at(1)) % arguments.at(2) (arguments.at(0) * arguments.at(1)) % arguments.at(2)
); );
*/
// TODO SIGNEXTEND // TODO SIGNEXTEND
default: default:
break; break;