Skip to content

G
Geth-Modification
Commit 2d00027f authored by obscuren's avatar obscuren
Browse files
Options

Merge branch 'release/0.6.4'

parents fb90ecc8 d03ab3c9
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
ethvm/types.go
View file @ 2d00027f
...@@ -60,8 +60,8 @@ const ( ...@@ -60,8 +60,8 @@ const (
// 0x50 range - 'storage' and execution // 0x50 range - 'storage' and execution
POP = 0x50 POP = 0x50
DUP = 0x51 //DUP = 0x51
SWAP = 0x52 //SWAP = 0x52
MLOAD = 0x53 MLOAD = 0x53
MSTORE = 0x54 MSTORE = 0x54
MSTORE8 = 0x55 MSTORE8 = 0x55
...@@ -205,8 +205,8 @@ var opCodeToString = map[OpCode]string{ ...@@ -205,8 +205,8 @@ var opCodeToString = map[OpCode]string{
// 0x50 range - 'storage' and execution // 0x50 range - 'storage' and execution
POP: "POP", POP: "POP",
DUP: "DUP", //DUP: "DUP",
SWAP: "SWAP", //SWAP: "SWAP",
MLOAD: "MLOAD", MLOAD: "MLOAD",
MSTORE: "MSTORE", MSTORE: "MSTORE",
MSTORE8: "MSTORE8", MSTORE8: "MSTORE8",
......
ethvm/vm.go
View file @ 2d00027f
...@@ -640,10 +640,6 @@ func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) { ...@@ -640,10 +640,6 @@ func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
x, y := stack.Swapn(n) x, y := stack.Swapn(n)
self.Printf(" => [%d] %x [0] %x", n, x.Bytes(), y.Bytes()) self.Printf(" => [%d] %x [0] %x", n, x.Bytes(), y.Bytes())
case DUP:
// NOP
case SWAP:
// NOP
case MLOAD: case MLOAD:
require(1) require(1)
offset := stack.Pop() offset := stack.Pop()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment