diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-19 21:41:57 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-19 21:41:57 +0800 |
| commit | f8d98f7fcd08bd2eff36d5366ac2a14b52255d57 (patch) | |
| tree | 99111d4f80ee4c436c99813ef8ffe7a7b16ee8ce /core/vm/opcodes.go | |
| parent | c305005d831eccf9d65c7b55f817390d2334e666 (diff) | |
| parent | 5b283663b40dbc06c56cc481ef90f4365ab85724 (diff) | |
| download | go-tangerine-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar go-tangerine-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.gz go-tangerine-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.bz2 go-tangerine-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.lz go-tangerine-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.xz go-tangerine-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.tar.zst go-tangerine-f8d98f7fcd08bd2eff36d5366ac2a14b52255d57.zip | |
Merge pull request #2116 from obscuren/homestead
core, core/vm: consensus changes necessary for the homestead release
Diffstat (limited to 'core/vm/opcodes.go')
| -rw-r--r-- | core/vm/opcodes.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go index dc4139092..7d861f1de 100644 --- a/core/vm/opcodes.go +++ b/core/vm/opcodes.go @@ -200,6 +200,7 @@ const ( CALL CALLCODE RETURN + DELEGATECALL SUICIDE = 0xff ) @@ -349,11 +350,12 @@ var opCodeToString = map[OpCode]string{ LOG4: "LOG4", // 0xf0 range - CREATE: "CREATE", - CALL: "CALL", - RETURN: "RETURN", - CALLCODE: "CALLCODE", - SUICIDE: "SUICIDE", + CREATE: "CREATE", + CALL: "CALL", + RETURN: "RETURN", + CALLCODE: "CALLCODE", + DELEGATECALL: "DELEGATECALL", + SUICIDE: "SUICIDE", PUSH: "PUSH", DUP: "DUP", @@ -402,6 +404,7 @@ var stringToOp = map[string]OpCode{ "CALLDATALOAD": CALLDATALOAD, "CALLDATASIZE": CALLDATASIZE, "CALLDATACOPY": CALLDATACOPY, + "DELEGATECALL": DELEGATECALL, "CODESIZE": CODESIZE, "CODECOPY": CODECOPY, "GASPRICE": GASPRICE, |