forked from cerc-io/plugeth
Merge branch 'release/0.6.4' into develop
This commit is contained in:
commit
088bbc6bb7
@ -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.
|
||||
|
@ -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",
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user