aboutsummaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-12 00:37:17 +0800
committerobscuren <geffobscura@gmail.com>2015-03-12 00:37:17 +0800
commit239e17de126a3d7afa29da7ee423ffc79757877f (patch)
treee2f844a7b2a1ad88010745449863aa6f1cc14da4 /vm
parent61bf29be36a6678ba16c457229ca306339ea4ebc (diff)
parentc01d4c2f4c8704656e407ab4d80d9ec82e016731 (diff)
downloaddexon-239e17de126a3d7afa29da7ee423ffc79757877f.tar
dexon-239e17de126a3d7afa29da7ee423ffc79757877f.tar.gz
dexon-239e17de126a3d7afa29da7ee423ffc79757877f.tar.bz2
dexon-239e17de126a3d7afa29da7ee423ffc79757877f.tar.lz
dexon-239e17de126a3d7afa29da7ee423ffc79757877f.tar.xz
dexon-239e17de126a3d7afa29da7ee423ffc79757877f.tar.zst
dexon-239e17de126a3d7afa29da7ee423ffc79757877f.zip
Merge branch 'rpcfrontier' into develop
Diffstat (limited to 'vm')
-rw-r--r--vm/vm.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/vm/vm.go b/vm/vm.go
index 6f3945472..6e4a54844 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -37,7 +37,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
context := NewContext(caller, me, code, gas, price)
- vmlogger.Debugf("(%d) (%x) %x (code=%d) gas: %v (d) %x\n", self.env.Depth(), caller.Address()[:4], context.Address(), len(code), context.Gas, callData)
+ self.Printf("(%d) (%x) %x (code=%d) gas: %v (d) %x", self.env.Depth(), caller.Address()[:4], context.Address(), len(code), context.Gas, callData).Endl()
if self.Recoverable {
// Recover from any require exception
@@ -696,7 +696,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
if err != nil {
stack.push(ethutil.BigFalse)
- vmlogger.Debugln(err)
+ self.Printf("%v").Endl()
} else {
stack.push(ethutil.BigTrue)
@@ -726,7 +726,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
return context.Return(nil), nil
default:
- vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
+ self.Printf("(pc) %-3v Invalid opcode %x\n", pc, op).Endl()
panic(fmt.Errorf("Invalid opcode %x", op))
}
@@ -894,7 +894,7 @@ func (self *Vm) Printf(format string, v ...interface{}) VirtualMachine {
func (self *Vm) Endl() VirtualMachine {
if self.debug {
if self.logTy == LogTyPretty {
- vmlogger.Debugln(self.logStr)
+ vmlogger.Infoln(self.logStr)
self.logStr = ""
}
}