Merge branch 'develop' into conversion

2015-03-19 14:31:41 +01:00
parent e13c673980 cf45b939a0
commit d4e5747d04
408 changed files with 33298 additions and 2270 deletions
--- a/vm/context.go
+++ b/vm/context.go
@@ -65,7 +65,7 @@ func (c *Context) GetRangeValue(x, size uint64) []byte {
 }

 func (c *Context) GetCode(x, size uint64) []byte {
-	return getCode(c.Code, x, size)
+	return getData(c.Code, x, size)
 }

 func (c *Context) Return(ret []byte) []byte {