roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

JitVm code cleanups & refactoring. Some memory copies eliminated (i.e. in SHA3 calculation)

Browse Source
This commit is contained in:
Paweł Bylica 2015-01-23 16:45:22 +01:00
parent 3aa0410f6e
commit 94106cc41f
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vm/vm_jit.go
View File

@ -15,6 +15,8 @@ struct evmjit_result
struct evmjit_result evmjit_run(void* _data, void* _env); struct evmjit_result evmjit_run(void* _data, void* _env);
// Shared library evmjit (e.g. libevmjit.so) is expected to be installed in /usr/local/lib
// More: https://github.com/ethereum/evmjit
#cgo LDFLAGS: -levmjit #cgo LDFLAGS: -levmjit
*/ */
import "C" import "C"
@ -74,10 +76,11 @@ func hash2llvm(h []byte) i256 {
} }
func llvm2hash(m *i256) []byte { func llvm2hash(m *i256) []byte {
if len(m) != 32 { return C.GoBytes(unsafe.Pointer(m), C.int(len(m)))
panic("I don't know Go!") }
}
return C.GoBytes(unsafe.Pointer(m), 32) func llvm2hashRef(m *i256) []byte {
return (*[1 << 30]byte)(unsafe.Pointer(m))[:len(m):len(m)]
} }
func address2llvm(addr []byte) i256 { func address2llvm(addr []byte) i256 {
@ -86,6 +89,8 @@ func address2llvm(addr []byte) i256 {
return n return n
} }
// bswap swap bytes of the 256-bit integer on LLVM side
// TODO: Do not change memory on LLVM side, that can conflict with memory access optimizations
func bswap(m *i256) *i256 { func bswap(m *i256) *i256 {
for i, l := 0, len(m); i < l/2; i++ { for i, l := 0, len(m); i < l/2; i++ {
m[i], m[l-i-1] = m[l-i-1], m[i] m[i], m[l-i-1] = m[l-i-1], m[i]
@ -129,12 +134,14 @@ func llvm2big(m *i256) *big.Int {
return n return n
} }
func llvm2bytes(data *byte, length uint64) []byte { // llvm2bytesRef creates a []byte slice that references byte buffer on LLVM side (as of that not controller by GC)
// User must asure that referenced memory is available to Go until the data is copied or not needed any more
func llvm2bytesRef(data *byte, length uint64) []byte {
if length == 0 { if length == 0 {
return nil return nil
} }
if data == nil { if data == nil {
panic("llvm2bytes: nil pointer to data") panic("Unexpected nil data pointer")
} }
return (*[1 << 30]byte)(unsafe.Pointer(data))[:length:length] return (*[1 << 30]byte)(unsafe.Pointer(data))[:length:length]
} }
@ -156,8 +163,10 @@ func NewJitVm(env Environment) *JitVm {
} }
func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) { func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
// TODO: depth is increased but never checked by VM. VM should not know about it at all.
self.env.SetDepth(self.env.Depth() + 1) self.env.SetDepth(self.env.Depth() + 1)
// TODO: Move it to Env.Call() or sth
if Precompiled[string(me.Address())] != nil { if Precompiled[string(me.Address())] != nil {
// if it's address of precopiled contract // if it's address of precopiled contract
// fallback to standard VM // fallback to standard VM
@ -165,7 +174,11 @@ func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *bi
return stdVm.Run(me, caller, code, value, gas, price, callData) return stdVm.Run(me, caller, code, value, gas, price, callData)
} }
self.me = me // FIXME: Make sure Run() is not used more than once if self.me != nil {
panic("JitVm.Run() can be called only once per JitVm instance")
}
self.me = me
self.callerAddr = caller.Address() self.callerAddr = caller.Address()
self.price = price self.price = price
@ -186,7 +199,6 @@ func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *bi
self.data.code = getDataPtr(code) self.data.code = getDataPtr(code)
result := C.evmjit_run(unsafe.Pointer(&self.data), unsafe.Pointer(self)) result := C.evmjit_run(unsafe.Pointer(&self.data), unsafe.Pointer(self))
//fmt.Printf("JIT result: %d\n", r)
if result.returnCode >= 100 { if result.returnCode >= 100 {
err = errors.New("OOG from JIT") err = errors.New("OOG from JIT")
@ -198,9 +210,9 @@ func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *bi
ret = C.GoBytes(result.returnData, C.int(result.returnDataSize)) ret = C.GoBytes(result.returnData, C.int(result.returnDataSize))
C.free(result.returnData) C.free(result.returnData)
} else if result.returnCode == 2 { // SUICIDE } else if result.returnCode == 2 { // SUICIDE
// TODO: Suicide support logic should be moved to Env to be shared by VM implementations
state := self.Env().State() state := self.Env().State()
receiverAddr := llvm2hash(bswap(&self.data.elems[address])) receiverAddr := llvm2hashRef(bswap(&self.data.elems[address]))
receiverAddr = trim(receiverAddr) // TODO: trim all zeros or subslice 160bits?
receiver := state.GetOrNewStateObject(receiverAddr) receiver := state.GetOrNewStateObject(receiverAddr)
balance := state.GetBalance(me.Address()) balance := state.GetBalance(me.Address())
receiver.AddAmount(balance) receiver.AddAmount(balance)
@ -224,8 +236,8 @@ func (self *JitVm) Env() Environment {
} }
//export env_sha3 //export env_sha3
func env_sha3(dataPtr unsafe.Pointer, length uint64, resultPtr unsafe.Pointer) { func env_sha3(dataPtr *byte, length uint64, resultPtr unsafe.Pointer) {
data := C.GoBytes(dataPtr, C.int(length)) data := llvm2bytesRef(dataPtr, length)
hash := crypto.Sha3(data) hash := crypto.Sha3(data)
result := (*i256)(resultPtr) result := (*i256)(resultPtr)
*result = hash2llvm(hash) *result = hash2llvm(hash)
@ -300,7 +312,7 @@ func env_call(_vm unsafe.Pointer, _gas unsafe.Pointer, _receiveAddr unsafe.Point
if balance.Cmp(value) >= 0 { if balance.Cmp(value) >= 0 {
receiveAddr := llvm2hash((*i256)(_receiveAddr)) receiveAddr := llvm2hash((*i256)(_receiveAddr))
inData := C.GoBytes(inDataPtr, C.int(inDataLen)) inData := C.GoBytes(inDataPtr, C.int(inDataLen))
outData := llvm2bytes(outDataPtr, outDataLen) outData := llvm2bytesRef(outDataPtr, outDataLen)
codeAddr := llvm2hash((*i256)(_codeAddr)) codeAddr := llvm2hash((*i256)(_codeAddr))
llvmGas := (*i256)(_gas) llvmGas := (*i256)(_gas)
gas := llvm2big(llvmGas) gas := llvm2big(llvmGas)