diff options
| author | obscuren <geffobscura@gmail.com> | 2014-08-22 02:25:38 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-08-22 02:25:38 +0800 |
| commit | 088bbc6bb73739811ea6a533ebb7af879fe8517e (patch) | |
| tree | 12cf90bbe2fc7cf996b208c0bce183193cf6872f | |
| parent | 732573ba512aa215e88aed3f20393c3c42c1aeb0 (diff) | |
| parent | d03ab3c97652d61a9f179215f31e107c91bd6058 (diff) | |
| download | dexon-088bbc6bb73739811ea6a533ebb7af879fe8517e.tar dexon-088bbc6bb73739811ea6a533ebb7af879fe8517e.tar.gz dexon-088bbc6bb73739811ea6a533ebb7af879fe8517e.tar.bz2 dexon-088bbc6bb73739811ea6a533ebb7af879fe8517e.tar.lz dexon-088bbc6bb73739811ea6a533ebb7af879fe8517e.tar.xz dexon-088bbc6bb73739811ea6a533ebb7af879fe8517e.tar.zst dexon-088bbc6bb73739811ea6a533ebb7af879fe8517e.zip | |
Merge branch 'release/0.6.4' into develop
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ethvm/types.go | 12 | ||||
| -rw-r--r-- | ethvm/vm.go | 4 |
3 files changed, 7 insertions, 11 deletions
@@ -6,7 +6,7 @@ Ethereum Ethereum Go Development package (C) Jeffrey Wilcke Ethereum is currently in its testing phase. The current state is "Proof -of Concept 0.6.3". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)). +of Concept 0.6.4". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)). Ethereum Go is split up in several sub packages Please refer to each individual package for more information. diff --git a/ethvm/types.go b/ethvm/types.go index 98fd8fba0..36ba395d6 100644 --- a/ethvm/types.go +++ b/ethvm/types.go @@ -59,9 +59,9 @@ const ( GASLIMIT = 0x45 // 0x50 range - 'storage' and execution - POP = 0x50 - DUP = 0x51 - SWAP = 0x52 + POP = 0x50 + //DUP = 0x51 + //SWAP = 0x52 MLOAD = 0x53 MSTORE = 0x54 MSTORE8 = 0x55 @@ -204,9 +204,9 @@ var opCodeToString = map[OpCode]string{ GASLIMIT: "GASLIMIT", // 0x50 range - 'storage' and execution - POP: "POP", - DUP: "DUP", - SWAP: "SWAP", + POP: "POP", + //DUP: "DUP", + //SWAP: "SWAP", MLOAD: "MLOAD", MSTORE: "MSTORE", MSTORE8: "MSTORE8", diff --git a/ethvm/vm.go b/ethvm/vm.go index 29dc2515c..873a80c44 100644 --- a/ethvm/vm.go +++ b/ethvm/vm.go @@ -640,10 +640,6 @@ func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) { x, y := stack.Swapn(n) self.Printf(" => [%d] %x [0] %x", n, x.Bytes(), y.Bytes()) - case DUP: - // NOP - case SWAP: - // NOP case MLOAD: require(1) offset := stack.Pop() |