From 0ed19d9f2024744ba93d0e34db6939766b3cfed5 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 26 Jun 2014 11:26:42 +0200
Subject: Logging, variable rearrangement

---
 ethchain/vm.go | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'ethchain/vm.go')

diff --git a/ethchain/vm.go b/ethchain/vm.go
index 4c6c5e24d..199eaae50 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -99,22 +99,21 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
 
 	ethutil.Config.Log.Debugf("[VM] (~) %x gas: %v (d) %x\n", closure.object.Address(), closure.Gas, closure.Args)
 
-	// Memory for the current closure
-	mem := &Memory{}
-	// New stack (should this be shared?)
-	stack := NewStack()
-	require := func(m int) {
-		if stack.Len() < m {
-			isRequireError = true
-			panic(fmt.Sprintf("stack err = %d, req = %d", stack.Len(), m))
+	var (
+		op OpCode
+
+		mem      = &Memory{}
+		stack    = NewStack()
+		pc       = big.NewInt(0)
+		step     = 0
+		prevStep = 0
+		require  = func(m int) {
+			if stack.Len() < m {
+				isRequireError = true
+				panic(fmt.Sprintf("%04v (%v) stack err size = %d, required = %d", pc, op, stack.Len(), m))
+			}
 		}
-	}
-
-	// Program counter
-	pc := big.NewInt(0)
-	// Current step count
-	step := 0
-	prevStep := 0
+	)
 
 	for {
 		prevStep = step
@@ -125,7 +124,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
 		// Get the memory location of pc
 		val := closure.Get(pc)
 		// Get the opcode (it must be an opcode!)
-		op := OpCode(val.Uint())
+		op = OpCode(val.Uint())
 
 		gas := new(big.Int)
 		addStepGasUsage := func(amount *big.Int) {
-- 
cgit