This commit is contained in:
obscuren 2014-06-18 00:36:23 +02:00
parent 2565a79575
commit dc9c9369e0

@ -323,7 +323,8 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
case EQ: case EQ:
require(2) require(2)
x, y := stack.Popn() x, y := stack.Popn()
fmt.Printf("%x == %x\n", x, y) vm.Printf(" %v == %v", y, x)
// x == y // x == y
if x.Cmp(y) == 0 { if x.Cmp(y) == 0 {
stack.Push(ethutil.BigTrue) stack.Push(ethutil.BigTrue)
@ -343,15 +344,21 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
case AND: case AND:
require(2) require(2)
x, y := stack.Popn() x, y := stack.Popn()
vm.Printf(" %v & %v", y, x)
stack.Push(base.And(y, x)) stack.Push(base.And(y, x))
case OR: case OR:
require(2) require(2)
x, y := stack.Popn() x, y := stack.Popn()
vm.Printf(" %v | %v", y, x)
stack.Push(base.Or(y, x)) stack.Push(base.Or(y, x))
case XOR: case XOR:
require(2) require(2)
x, y := stack.Popn() x, y := stack.Popn()
stack.Push(base.Xor(x, y)) vm.Printf(" %v ^ %v", y, x)
stack.Push(base.Xor(y, x))
case BYTE: case BYTE:
require(2) require(2)
val, th := stack.Popn() val, th := stack.Popn()