forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 20:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

RETURN implementation: JIT returns data

Browse source
This commit is contained in:
Paweł Bylica 2015-01-15 16:27:57 +01:00
parent 2c10328ef9
commit 06e0da25bc
3 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
evmjit/libevmjit/interface.cpp
View file

@ -5,14 +5,12 @@
extern "C"
{
int evmjit_run(void* _data, void* _env)
evmjit_result evmjit_run(void* _data, void* _env)
{
using namespace dev::eth::jit;
auto data = static_cast<RuntimeData*>(_data);
std::cerr << "GAS: " << data->elems[RuntimeData::Gas].a << "\n";
ExecutionEngine engine;
auto codePtr = data->code;
@ -20,30 +18,17 @@ int evmjit_run(void* _data, void* _env)
bytes bytecode;
bytecode.insert(bytecode.end(), codePtr, codePtr + codeSize);
auto result = engine.run(bytecode, data, static_cast<Env*>(_env));
return static_cast<int>(result);
}
// Runtime callback functions - implementations must be provided by external language (Go, C++, Python)
void evm_jit_rt_sload(evm_jit_rt* _rt, i256* _index, i256* _ret);
void evm_jit_rt_sstore(evm_jit_rt* _rt, i256* _index, i256* _value);
void evm_jit_rt_balance(evm_jit_rt* _rt, h256* _address, i256* _ret);
// And so on...
evm_jit* evm_jit_create(evm_jit_rt*)
auto returnCode = engine.run(bytecode, data, static_cast<Env*>(_env));
evmjit_result result = {static_cast<int32_t>(returnCode), 0, nullptr};
if (returnCode == ReturnCode::Return && !engine.returnData.empty())
{
printf("EVM JIT create");
int* a = nullptr;
*a = 1;
return nullptr;
// TODO: Optimized returning data. Allocating memory on client side by callback function might be a good idea
result.returnDataSize = engine.returnData.size();
result.returnData = std::malloc(result.returnDataSize);
std::memcpy(result.returnData, engine.returnData.data(), result.returnDataSize);
}
evm_jit_return_code evm_jit_execute(evm_jit* _jit);
void evm_jit_get_return_data(evm_jit* _jit, char* _return_data_offset, size_t* _return_data_size);
void evm_jit_destroy(evm_jit* _jit);
return result;
}
}

11
evmjit/libevmjit/interface.h
View file

@ -1,10 +1,19 @@
#include <stddef.h>
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
int evmjit_run(void* _data, void* _env);
typedef struct evmjit_result
{
int32_t returnCode;
uint64_t returnDataSize;
void* returnData;
} evmjit_result;
evmjit_result evmjit_run(void* _data, void* _env);
// JIT object opaque type
typedef struct evm_jit evm_jit;

15
vm/vm_jit.go
View file

@ -8,6 +8,7 @@ import "github.com/ethereum/go-ethereum/state"
/*
#include "../evmjit/libevmjit/interface.h"
#include <stdlib.h>
#cgo LDFLAGS: -L/home/chfast/go/src/github.com/ethereum/go-ethereum/evmjit/build/libevmjit -levmjit
*/
@ -146,18 +147,24 @@ func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *bi
data.callData = getDataPtr(callData)
data.code = getDataPtr(code)
r := C.evmjit_run(unsafe.Pointer(&data), unsafe.Pointer(self))
result := C.evmjit_run(unsafe.Pointer(&data), unsafe.Pointer(self))
//fmt.Printf("JIT result: %d\n", r)
if r >= 100 {
if result.returnCode >= 100 {
err = errors.New("OOG from JIT")
gas.SetInt64(0) // Set gas to 0, JIT do not bother
gas.SetInt64(0) // Set gas to 0, JIT does not bother
} else {
gasLeft := llvm2big(&data.elems[Gas]) // TODO: Set value directly to gas instance
gas.Set(gasLeft)
if result.returnCode == 1 { // RETURN
returnData := llvm2bytes((*byte)(result.returnData), uint64(result.returnDataSize))
ret = make([]byte, len(returnData))
copy(ret, returnData)
C.free(result.returnData)
}
}
return ret, err
return
}
func (self *JitVm) Printf(format string, v ...interface{}) VirtualMachine {