diff options
| author | chriseth <chris@ethereum.org> | 2017-05-31 01:34:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 01:34:28 +0800 |
| commit | d4a57d81ba7f2a9b5db57397d36f1a17adb4b142 (patch) | |
| tree | 15d8048ad9ed48dc7d010e37fd2125df8d5db436 /libevmasm/Instruction.cpp | |
| parent | 254b55728f66ea164e9085700a294ac4837f2029 (diff) | |
| parent | dcb7c51920a947e57371b7dc92417f47ee5cc65c (diff) | |
| download | dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.gz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.bz2 dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.lz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.xz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.zst dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.zip | |
Merge pull request #2317 from ethereum/keccak256
Use keccak256 in tests and replace the SHA3 instruction in assembly
Diffstat (limited to 'libevmasm/Instruction.cpp')
| -rw-r--r-- | libevmasm/Instruction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index 5e92c6e6..25eab60b 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -53,7 +53,7 @@ const std::map<std::string, Instruction> dev::solidity::c_instructions = { "ADDMOD", Instruction::ADDMOD }, { "MULMOD", Instruction::MULMOD }, { "SIGNEXTEND", Instruction::SIGNEXTEND }, - { "SHA3", Instruction::SHA3 }, + { "KECCAK256", Instruction::KECCAK256 }, { "ADDRESS", Instruction::ADDRESS }, { "BALANCE", Instruction::BALANCE }, { "ORIGIN", Instruction::ORIGIN }, @@ -189,7 +189,7 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo = { Instruction::ADDMOD, { "ADDMOD", 0, 3, 1, false, Tier::Mid } }, { Instruction::MULMOD, { "MULMOD", 0, 3, 1, false, Tier::Mid } }, { Instruction::SIGNEXTEND, { "SIGNEXTEND", 0, 2, 1, false, Tier::Low } }, - { Instruction::SHA3, { "SHA3", 0, 2, 1, false, Tier::Special } }, + { Instruction::KECCAK256, { "KECCAK256", 0, 2, 1, false, Tier::Special } }, { Instruction::ADDRESS, { "ADDRESS", 0, 0, 1, false, Tier::Base } }, { Instruction::BALANCE, { "BALANCE", 0, 1, 1, false, Tier::Balance } }, { Instruction::ORIGIN, { "ORIGIN", 0, 0, 1, false, Tier::Base } }, |