cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Removed more casts

Browse Source
This commit is contained in:
obscuren 2015-03-19 22:45:03 +01:00
parent 013427bde2
commit df5901fdc5
5 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ethtest/main.go
View File

@ -24,7 +24,6 @@ package main
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
@ -210,7 +209,7 @@ func RunVmTest(r io.Reader) (failed int) {
} }
if failed == 1 { if failed == 1 {
fmt.Println(string(statedb.Dump())) helper.Log.Infoln(string(statedb.Dump()))
} }
logger.Flush() logger.Flush()

4
common/big.go
View File

@ -104,7 +104,7 @@ func BigCopy(src *big.Int) *big.Int {
// //
// Returns the maximum size big integer // Returns the maximum size big integer
func BigMax(x, y *big.Int) *big.Int { func BigMax(x, y *big.Int) *big.Int {
if x.Cmp(y) <= 0 { if x.Cmp(y) < 0 {
return y return y
} }
@ -115,7 +115,7 @@ func BigMax(x, y *big.Int) *big.Int {
// //
// Returns the minimum size big integer // Returns the minimum size big integer
func BigMin(x, y *big.Int) *big.Int { func BigMin(x, y *big.Int) *big.Int {
if x.Cmp(y) >= 0 { if x.Cmp(y) > 0 {
return y return y
} }

9
vm/common.go
View File

@ -73,9 +73,10 @@ func toValue(val *big.Int) interface{} {
return val return val
} }
func getData(data []byte, start, size uint64) []byte { func getData(data []byte, start, size *big.Int) []byte {
x := uint64(math.Min(float64(start), float64(len(data)))) dlen := big.NewInt(int64(len(data)))
y := uint64(math.Min(float64(x+size), float64(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()))
} }

4
vm/context.go
View File

@ -64,10 +64,6 @@ func (c *Context) GetRangeValue(x, size uint64) []byte {
return common.RightPadBytes(c.Code[x:y], int(size)) 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 { func (c *Context) Return(ret []byte) []byte {
// Return the remaining gas to the caller // Return the remaining gas to the caller
c.caller.ReturnGas(c.Gas, c.Price) c.caller.ReturnGas(c.Gas, c.Price)

18
vm/vm.go
View File

@ -445,14 +445,11 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
cOff = stack.pop() cOff = stack.pop()
l = stack.pop() l = stack.pop()
) )
var data []byte data := getData(callData, cOff, l)
if cOff.Cmp(big.NewInt(int64(len(callData)))) <= 0 {
data = getData(callData, cOff.Uint64(), l.Uint64())
}
mem.Set(mOff.Uint64(), l.Uint64(), data) 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: case CODESIZE, EXTCODESIZE:
var code []byte var code []byte
if op == EXTCODESIZE { if op == EXTCODESIZE {
@ -482,10 +479,7 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
l = stack.pop() l = stack.pop()
) )
var codeCopy []byte codeCopy := getData(code, cOff, l)
if cOff.Cmp(big.NewInt(int64(len(code)))) <= 0 {
codeCopy = getData(code, cOff.Uint64(), l.Uint64())
}
mem.Set(mOff.Uint64(), l.Uint64(), codeCopy) 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) self.Printf(" => 0x%x", val)
case MSTORE8: 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: case SLOAD:
loc := common.BigToHash(stack.pop()) loc := common.BigToHash(stack.pop())
val := common.Bytes2Big(statedb.GetState(context.Address(), loc)) val := common.Bytes2Big(statedb.GetState(context.Address(), loc))