Removed more casts
This commit is contained in:
parent
013427bde2
commit
df5901fdc5
@ -24,7 +24,6 @@ package main
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
@ -210,7 +209,7 @@ func RunVmTest(r io.Reader) (failed int) {
|
||||
}
|
||||
|
||||
if failed == 1 {
|
||||
fmt.Println(string(statedb.Dump()))
|
||||
helper.Log.Infoln(string(statedb.Dump()))
|
||||
}
|
||||
|
||||
logger.Flush()
|
||||
|
@ -104,7 +104,7 @@ func BigCopy(src *big.Int) *big.Int {
|
||||
//
|
||||
// Returns the maximum size big integer
|
||||
func BigMax(x, y *big.Int) *big.Int {
|
||||
if x.Cmp(y) <= 0 {
|
||||
if x.Cmp(y) < 0 {
|
||||
return y
|
||||
}
|
||||
|
||||
@ -115,7 +115,7 @@ func BigMax(x, y *big.Int) *big.Int {
|
||||
//
|
||||
// Returns the minimum size big integer
|
||||
func BigMin(x, y *big.Int) *big.Int {
|
||||
if x.Cmp(y) >= 0 {
|
||||
if x.Cmp(y) > 0 {
|
||||
return y
|
||||
}
|
||||
|
||||
|
@ -73,9 +73,10 @@ func toValue(val *big.Int) interface{} {
|
||||
return val
|
||||
}
|
||||
|
||||
func getData(data []byte, start, size uint64) []byte {
|
||||
x := uint64(math.Min(float64(start), float64(len(data))))
|
||||
y := uint64(math.Min(float64(x+size), float64(len(data))))
|
||||
func getData(data []byte, start, size *big.Int) []byte {
|
||||
dlen := big.NewInt(int64(len(data)))
|
||||
|
||||
return common.RightPadBytes(data[x:y], int(size))
|
||||
s := common.BigMin(start, dlen)
|
||||
e := common.BigMin(new(big.Int).Add(s, size), dlen)
|
||||
return common.RightPadBytes(data[s.Uint64():e.Uint64()], int(size.Uint64()))
|
||||
}
|
||||
|
@ -64,10 +64,6 @@ func (c *Context) GetRangeValue(x, size uint64) []byte {
|
||||
return common.RightPadBytes(c.Code[x:y], int(size))
|
||||
}
|
||||
|
||||
func (c *Context) GetCode(x, size uint64) []byte {
|
||||
return getData(c.Code, x, size)
|
||||
}
|
||||
|
||||
func (c *Context) Return(ret []byte) []byte {
|
||||
// Return the remaining gas to the caller
|
||||
c.caller.ReturnGas(c.Gas, c.Price)
|
||||
|
18
vm/vm.go
18
vm/vm.go
@ -445,14 +445,11 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
|
||||
cOff = stack.pop()
|
||||
l = stack.pop()
|
||||
)
|
||||
var data []byte
|
||||
if cOff.Cmp(big.NewInt(int64(len(callData)))) <= 0 {
|
||||
data = getData(callData, cOff.Uint64(), l.Uint64())
|
||||
}
|
||||
data := getData(callData, cOff, l)
|
||||
|
||||
mem.Set(mOff.Uint64(), l.Uint64(), data)
|
||||
|
||||
self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, data)
|
||||
self.Printf(" => [%v, %v, %v]", mOff, cOff, l)
|
||||
case CODESIZE, EXTCODESIZE:
|
||||
var code []byte
|
||||
if op == EXTCODESIZE {
|
||||
@ -482,10 +479,7 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
|
||||
l = stack.pop()
|
||||
)
|
||||
|
||||
var codeCopy []byte
|
||||
if cOff.Cmp(big.NewInt(int64(len(code)))) <= 0 {
|
||||
codeCopy = getData(code, cOff.Uint64(), l.Uint64())
|
||||
}
|
||||
codeCopy := getData(code, cOff, l)
|
||||
|
||||
mem.Set(mOff.Uint64(), l.Uint64(), codeCopy)
|
||||
|
||||
@ -585,11 +579,11 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
|
||||
|
||||
self.Printf(" => 0x%x", val)
|
||||
case MSTORE8:
|
||||
off, val := stack.pop(), stack.pop()
|
||||
off, val := stack.pop().Int64(), stack.pop().Int64()
|
||||
|
||||
mem.store[off.Int64()] = byte(val.Int64() & 0xff)
|
||||
mem.store[off] = byte(val & 0xff)
|
||||
|
||||
self.Printf(" => [%v] 0x%x", off, val)
|
||||
self.Printf(" => [%v] 0x%x", off, mem.store[off])
|
||||
case SLOAD:
|
||||
loc := common.BigToHash(stack.pop())
|
||||
val := common.Bytes2Big(statedb.GetState(context.Address(), loc))
|
||||
|
Loading…
Reference in New Issue
Block a user