tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into conversion

Browse Source
This commit is contained in:
obscuren 2015-03-19 15:07:47 +01:00
commit 797bbce15e
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vm/vm.go
View File

@ -441,13 +441,16 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
self.Printf(" => %d", l) self.Printf(" => %d", l)
case CALLDATACOPY: case CALLDATACOPY:
var ( var (
mOff = stack.pop().Uint64() mOff = stack.pop()
cOff = stack.pop().Uint64() cOff = stack.pop()
l = stack.pop().Uint64() l = stack.pop()
) )
data := getData(callData, cOff, l) var data []byte
if cOff.Cmp(big.NewInt(int64(len(callData)))) <= 0 {
data = getData(callData, cOff.Uint64(), l.Uint64())
}
mem.Set(mOff, l, data) mem.Set(mOff.Uint64(), l.Uint64(), data)
self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, data) self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, data)
case CODESIZE, EXTCODESIZE: case CODESIZE, EXTCODESIZE:
@ -472,14 +475,19 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
} else { } else {
code = context.Code code = context.Code
} }
var (
mOff = stack.pop().Uint64()
cOff = stack.pop().Uint64()
l = stack.pop().Uint64()
)
codeCopy := getData(code, cOff, l)
mem.Set(mOff, l, codeCopy) var (
mOff = stack.pop()
cOff = stack.pop()
l = stack.pop()
)
var codeCopy []byte
if cOff.Cmp(big.NewInt(int64(len(code)))) <= 0 {
codeCopy = getData(code, cOff.Uint64(), l.Uint64())
}
mem.Set(mOff.Uint64(), l.Uint64(), codeCopy)
self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy) self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy)
case GASPRICE: case GASPRICE: