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

Yul proto fuzzer: Additional blockchain opcodes

Browse Source
This commit is contained in:
Bhargava Shastry 2019-09-04 13:24:47 +02:00 committed by chriseth
parent 7dd77784b7
commit 6b27ef8fcb
3 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/tools/ossfuzz/protoToYul.cpp
View File

@ -337,6 +337,12 @@ void ProtoConverter::visit(UnaryOp const& _x)
case UnaryOp::EXTCODEHASH: case UnaryOp::EXTCODEHASH:
m_output << "extcodehash"; m_output << "extcodehash";
break; break;
case UnaryOp::BALANCE:
m_output << "balance";
break;
case UnaryOp::BLOCKHASH:
m_output << "blockhash";
break;
} }
m_output << "("; m_output << "(";
visit(_x.operand()); visit(_x.operand());
@ -385,6 +391,36 @@ void ProtoConverter::visit(NullaryOp const& _x)
case NullaryOp::RETURNDATASIZE: case NullaryOp::RETURNDATASIZE:
m_output << "returndatasize()"; m_output << "returndatasize()";
break; break;
case NullaryOp::ADDRESS:
m_output << "address()";
break;
case NullaryOp::ORIGIN:
m_output << "origin()";
break;
case NullaryOp::CALLER:
m_output << "caller()";
break;
case NullaryOp::CALLVALUE:
m_output << "callvalue()";
break;
case NullaryOp::GASPRICE:
m_output << "gasprice()";
break;
case NullaryOp::COINBASE:
m_output << "coinbase()";
break;
case NullaryOp::TIMESTAMP:
m_output << "timestamp()";
break;
case NullaryOp::NUMBER:
m_output << "number()";
break;
case NullaryOp::DIFFICULTY:
m_output << "difficulty()";
break;
case NullaryOp::GASLIMIT:
m_output << "gaslimit()";
break;
} }
} }
@ -947,6 +983,9 @@ void ProtoConverter::visit(Statement const& _x)
if (!m_inForInitScope) if (!m_inForInitScope)
visit(_x.funcdef()); visit(_x.funcdef());
break; break;
case Statement::kPop:
visit(_x.pop());
break;
case Statement::STMT_ONEOF_NOT_SET: case Statement::STMT_ONEOF_NOT_SET:
break; break;
} }
@ -1233,6 +1272,13 @@ void ProtoConverter::visit(FunctionDef const& _x)
createFunctionDefAndCall(_x, numInParams, numOutParams); createFunctionDefAndCall(_x, numInParams, numOutParams);
} }
void ProtoConverter::visit(PopStmt const& _x)
{
m_output << "pop(";
visit(_x.expr());
m_output << ")\n";
}
void ProtoConverter::visit(Program const& _x) void ProtoConverter::visit(Program const& _x)
{ {
// Initialize input size // Initialize input size

1
test/tools/ossfuzz/protoToYul.h
View File

@ -85,6 +85,7 @@ private:
void visit(TerminatingStmt const&); void visit(TerminatingStmt const&);
void visit(FunctionCall const&); void visit(FunctionCall const&);
void visit(FunctionDef const&); void visit(FunctionDef const&);
void visit(PopStmt const&);
void visit(Program const&); void visit(Program const&);
/// Creates a new scope, and adds @a _funcParams to it if it /// Creates a new scope, and adds @a _funcParams to it if it

17
test/tools/ossfuzz/yulProto.proto
View File

@ -129,6 +129,8 @@ message UnaryOp {
CALLDATALOAD = 4; CALLDATALOAD = 4;
EXTCODESIZE = 5; EXTCODESIZE = 5;
EXTCODEHASH = 6; EXTCODEHASH = 6;
BALANCE = 7;
BLOCKHASH = 8;
} }
required UOp op = 1; required UOp op = 1;
required Expression operand = 2; required Expression operand = 2;
@ -172,6 +174,16 @@ message NullaryOp {
CALLDATASIZE = 4; CALLDATASIZE = 4;
CODESIZE = 5; CODESIZE = 5;
RETURNDATASIZE = 6; RETURNDATASIZE = 6;
ADDRESS = 7;
ORIGIN = 8;
CALLER = 9;
CALLVALUE = 10;
GASPRICE = 11;
COINBASE = 12;
TIMESTAMP = 13;
NUMBER = 14;
DIFFICULTY = 15;
GASLIMIT = 16;
} }
required NOp op = 1; required NOp op = 1;
} }
@ -287,6 +299,10 @@ message FunctionDef {
required Block block = 3; required Block block = 3;
} }
message PopStmt {
required Expression expr = 1;
}
message Statement { message Statement {
oneof stmt_oneof { oneof stmt_oneof {
VarDecl decl = 1; VarDecl decl = 1;
@ -305,6 +321,7 @@ message Statement {
FunctionCall functioncall = 14; FunctionCall functioncall = 14;
BoundedForStmt boundedforstmt = 15; BoundedForStmt boundedforstmt = 15;
FunctionDef funcdef = 16; FunctionDef funcdef = 16;
PopStmt pop = 17;
} }
} }