From cb4d168ecc9f6c2ecdb1a8f3308f8f3eb9f02376 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 2 Dec 2014 17:22:33 +0100
Subject: Updated LOG to match proper gas in all cases

---
 vm/types.go    | 8 +-------
 vm/vm_debug.go | 5 +++--
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'vm')

diff --git a/vm/types.go b/vm/types.go
index 0b20fb655..530dbf400 100644
--- a/vm/types.go
+++ b/vm/types.go
@@ -163,8 +163,8 @@ const (
 	// 0xf0 range - closures
 	CREATE OpCode = 0xf0 + iota
 	CALL
-	RETURN
 	CALLCODE
+	RETURN
 
 	// 0x70 range - other
 	SUICIDE = 0xff
@@ -309,12 +309,6 @@ var opCodeToString = map[OpCode]string{
 	SWAP15: "SWAP15",
 	SWAP16: "SWAP16",
 
-	LOG0: "LOG0",
-	LOG1: "LOG1",
-	LOG2: "LOG2",
-	LOG3: "LOG3",
-	LOG4: "LOG4",
-
 	// 0xf0 range
 	CREATE:   "CREATE",
 	CALL:     "CALL",
diff --git a/vm/vm_debug.go b/vm/vm_debug.go
index ea94987d1..dbab8fbcb 100644
--- a/vm/vm_debug.go
+++ b/vm/vm_debug.go
@@ -165,10 +165,11 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
 			n := int(op - LOG0)
 			require(n + 2)
 
-			mSize, mStart := stack.Peekn()
 			gas.Set(GasLog)
 			addStepGasUsage(new(big.Int).Mul(big.NewInt(int64(n)), GasLog))
-			addStepGasUsage(new(big.Int).Add(mSize, mStart))
+
+			mSize, _ := stack.Peekn()
+			addStepGasUsage(mSize)
 		case EXP:
 			require(2)
 
-- 
cgit