From 4547a05a689e6a0f29dd2d90e840e84de7f564f4 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 31 Dec 2014 11:12:40 +0100 Subject: Minor improvements * Moved gas and mem size to its own function --- vm/stack.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'vm/stack.go') diff --git a/vm/stack.go b/vm/stack.go index 6091479cb..b9eaa10cd 100644 --- a/vm/stack.go +++ b/vm/stack.go @@ -91,6 +91,12 @@ func (st *Stack) Get(amount *big.Int) []*big.Int { return nil } +func (st *Stack) require(n int) { + if st.Len() < n { + panic(fmt.Sprintf("stack underflow (%d <=> %d)", st.Len(), n)) + } +} + func (st *Stack) Print() { fmt.Println("### stack ###") if len(st.data) > 0 { -- cgit v1.2.3 From 5c8c0ae04e83389e3b97c527c11c819f219e344d Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 9 Jan 2015 15:30:46 +0100 Subject: Fixed size 0 bug --- vm/stack.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vm/stack.go') diff --git a/vm/stack.go b/vm/stack.go index b9eaa10cd..f20470db3 100644 --- a/vm/stack.go +++ b/vm/stack.go @@ -152,6 +152,10 @@ func (m *Memory) Get(offset, size int64) []byte { } func (self *Memory) Geti(offset, size int64) (cpy []byte) { + if size == 0 { + return nil + } + if len(self.store) > int(offset) { cpy = make([]byte, size) copy(cpy, self.store[offset:offset+size]) -- cgit v1.2.3 From 905b8cc82f3dc29131f45ccf29bd1d6c967fe132 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 9 Jan 2015 17:38:35 +0100 Subject: mem fixes for vm. Changed uncle inclusion tests --- vm/stack.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vm/stack.go') diff --git a/vm/stack.go b/vm/stack.go index f20470db3..e31f3eb57 100644 --- a/vm/stack.go +++ b/vm/stack.go @@ -142,6 +142,10 @@ func (m *Memory) Resize(size uint64) { } func (m *Memory) Get(offset, size int64) []byte { + if size == 0 { + return nil + } + if len(m.store) > int(offset) { end := int(math.Min(float64(len(m.store)), float64(offset+size))) -- cgit v1.2.3 From 8c7b764d47ce55ba6abe437ae8232cc537c4e0d9 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 9 Jan 2015 21:18:34 +0100 Subject: updated tests --- vm/stack.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'vm/stack.go') diff --git a/vm/stack.go b/vm/stack.go index e31f3eb57..a9aafdb9d 100644 --- a/vm/stack.go +++ b/vm/stack.go @@ -2,7 +2,6 @@ package vm import ( "fmt" - "math" "math/big" ) @@ -141,21 +140,7 @@ func (m *Memory) Resize(size uint64) { } } -func (m *Memory) Get(offset, size int64) []byte { - if size == 0 { - return nil - } - - if len(m.store) > int(offset) { - end := int(math.Min(float64(len(m.store)), float64(offset+size))) - - return m.store[offset:end] - } - - return nil -} - -func (self *Memory) Geti(offset, size int64) (cpy []byte) { +func (self *Memory) Get(offset, size int64) (cpy []byte) { if size == 0 { return nil } -- cgit v1.2.3