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

Using RuntimeData pointer in ext functions [#81470252]

Browse source
This commit is contained in:
Paweł Bylica 2014-10-27 16:46:53 +01:00
parent a076ced3c3
commit 734dd31587
3 changed files with 53 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
libevmjit/Ext.cpp
View file

@ -8,10 +8,9 @@
#include <libdevcrypto/SHA3.h> #include <libdevcrypto/SHA3.h>
#include "Runtime.h" #include "Runtime.h"
#include "Type.h"
#include "Endianness.h" #include "Endianness.h"
using namespace llvm;
namespace dev namespace dev
{ {
namespace eth namespace eth
@ -51,26 +50,27 @@ Ext::Ext(RuntimeManager& _runtimeManager):
m_arg7 = m_builder.CreateAlloca(i256Ty, nullptr, "ext.arg7"); m_arg7 = m_builder.CreateAlloca(i256Ty, nullptr, "ext.arg7");
m_arg8 = m_builder.CreateAlloca(i256Ty, nullptr, "ext.arg8"); m_arg8 = m_builder.CreateAlloca(i256Ty, nullptr, "ext.arg8");
using llvm::types::i;
using Linkage = llvm::GlobalValue::LinkageTypes; using Linkage = llvm::GlobalValue::LinkageTypes;
m_store = Function::Create(TypeBuilder<void(i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_store", module);
m_setStore = Function::Create(TypeBuilder<void(i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_setStore", module); llvm::Type* argsTypes[] = {Type::RuntimePtr, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr};
m_calldataload = Function::Create(TypeBuilder<void(i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_calldataload", module);
m_balance = Function::Create(TypeBuilder<void(i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_balance", module); m_store = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 3}, false), Linkage::ExternalLinkage, "ext_store", module);
m_suicide = Function::Create(TypeBuilder<void(i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_suicide", module); m_setStore = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 3}, false), Linkage::ExternalLinkage, "ext_setStore", module);
m_create = Function::Create(TypeBuilder<void(i<256>*, i<256>*, i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_create", module); m_calldataload = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 3}, false), Linkage::ExternalLinkage, "ext_calldataload", module);
Type* args[] = {i256PtrTy, i256PtrTy, i256PtrTy, i256PtrTy, i256PtrTy, i256PtrTy, i256PtrTy, i256PtrTy, i256PtrTy}; m_balance = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 3}, false), Linkage::ExternalLinkage, "ext_balance", module);
m_call = Function::Create(FunctionType::get(m_builder.getVoidTy(), args, false), Linkage::ExternalLinkage, "ext_call", module); m_suicide = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 2}, false), Linkage::ExternalLinkage, "ext_suicide", module);
m_sha3 = Function::Create(TypeBuilder<void(i<256>*, i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_sha3", module); m_create = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 5}, false), Linkage::ExternalLinkage, "ext_create", module);
m_exp = Function::Create(TypeBuilder<void(i<256>*, i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_exp", module); m_call = llvm::Function::Create(llvm::FunctionType::get(Type::Void, argsTypes, false), Linkage::ExternalLinkage, "ext_call", module);
m_codeAt = Function::Create(TypeBuilder<i<8>*(i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_codeAt", module); m_sha3 = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 4}, false), Linkage::ExternalLinkage, "ext_sha3", module);
m_codesizeAt = Function::Create(TypeBuilder<void(i<256>*, i<256>*), true>::get(ctx), Linkage::ExternalLinkage, "ext_codesizeAt", module); m_exp = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 4}, false), Linkage::ExternalLinkage, "ext_exp", module);
m_codeAt = llvm::Function::Create(llvm::FunctionType::get(Type::BytePtr, Type::WordPtr, false), Linkage::ExternalLinkage, "ext_codeAt", module);
m_codesizeAt = llvm::Function::Create(llvm::FunctionType::get(Type::Void, {argsTypes, 3}, false), Linkage::ExternalLinkage, "ext_codesizeAt", module);
} }
llvm::Value* Ext::store(llvm::Value* _index) llvm::Value* Ext::store(llvm::Value* _index)
{ {
m_builder.CreateStore(_index, m_args[0]); m_builder.CreateStore(_index, m_args[0]);
m_builder.CreateCall(m_store, m_args); // Uses native endianness m_builder.CreateCall3(m_store, getRuntimeManager().getRuntimePtr(), m_args[0], m_args[1]); // Uses native endianness
return m_builder.CreateLoad(m_args[1]); return m_builder.CreateLoad(m_args[1]);
} }
@ -78,40 +78,40 @@ void Ext::setStore(llvm::Value* _index, llvm::Value* _value)
{ {
m_builder.CreateStore(_index, m_args[0]); m_builder.CreateStore(_index, m_args[0]);
m_builder.CreateStore(_value, m_args[1]); m_builder.CreateStore(_value, m_args[1]);
m_builder.CreateCall(m_setStore, m_args); // Uses native endianness m_builder.CreateCall3(m_setStore, getRuntimeManager().getRuntimePtr(), m_args[0], m_args[1]); // Uses native endianness
} }
Value* Ext::calldataload(Value* _index) llvm::Value* Ext::calldataload(llvm::Value* _index)
{ {
m_builder.CreateStore(_index, m_args[0]); m_builder.CreateStore(_index, m_args[0]);
m_builder.CreateCall(m_calldataload, m_args); m_builder.CreateCall3(m_calldataload, getRuntimeManager().getRuntimePtr(), m_args[0], m_args[1]);
auto ret = m_builder.CreateLoad(m_args[1]); auto ret = m_builder.CreateLoad(m_args[1]);
return Endianness::toNative(m_builder, ret); return Endianness::toNative(m_builder, ret);
} }
Value* Ext::balance(Value* _address) llvm::Value* Ext::balance(llvm::Value* _address)
{ {
auto address = Endianness::toBE(m_builder, _address); auto address = Endianness::toBE(m_builder, _address);
m_builder.CreateStore(address, m_args[0]); m_builder.CreateStore(address, m_args[0]);
m_builder.CreateCall(m_balance, m_args); m_builder.CreateCall3(m_balance, getRuntimeManager().getRuntimePtr(), m_args[0], m_args[1]);
return m_builder.CreateLoad(m_args[1]); return m_builder.CreateLoad(m_args[1]);
} }
void Ext::suicide(Value* _address) void Ext::suicide(llvm::Value* _address)
{ {
auto address = Endianness::toBE(m_builder, _address); auto address = Endianness::toBE(m_builder, _address);
m_builder.CreateStore(address, m_args[0]); m_builder.CreateStore(address, m_args[0]);
m_builder.CreateCall(m_suicide, m_args[0]); m_builder.CreateCall2(m_suicide, getRuntimeManager().getRuntimePtr(), m_args[0]);
} }
Value* Ext::create(llvm::Value* _endowment, llvm::Value* _initOff, llvm::Value* _initSize) llvm::Value* Ext::create(llvm::Value* _endowment, llvm::Value* _initOff, llvm::Value* _initSize)
{ {
m_builder.CreateStore(_endowment, m_args[0]); m_builder.CreateStore(_endowment, m_args[0]);
m_builder.CreateStore(_initOff, m_arg2); m_builder.CreateStore(_initOff, m_arg2);
m_builder.CreateStore(_initSize, m_arg3); m_builder.CreateStore(_initSize, m_arg3);
Value* args[] = {m_args[0], m_arg2, m_arg3, m_args[1]}; llvm::Value* args[] = {getRuntimeManager().getRuntimePtr(), m_args[0], m_arg2, m_arg3, m_args[1]};
m_builder.CreateCall(m_create, args); m_builder.CreateCall(m_create, args);
Value* address = m_builder.CreateLoad(m_args[1]); llvm::Value* address = m_builder.CreateLoad(m_args[1]);
address = Endianness::toNative(m_builder, address); address = Endianness::toNative(m_builder, address);
return address; return address;
} }
@ -129,7 +129,7 @@ llvm::Value* Ext::call(llvm::Value*& _gas, llvm::Value* _receiveAddress, llvm::V
auto codeAddress = Endianness::toBE(m_builder, _codeAddress); auto codeAddress = Endianness::toBE(m_builder, _codeAddress);
m_builder.CreateStore(codeAddress, m_arg8); m_builder.CreateStore(codeAddress, m_arg8);
llvm::Value* args[] = {m_args[0], m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_args[1]}; llvm::Value* args[] = {getRuntimeManager().getRuntimePtr(), m_args[0], m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_args[1]};
m_builder.CreateCall(m_call, args); m_builder.CreateCall(m_call, args);
_gas = m_builder.CreateLoad(m_args[0]); // Return gas _gas = m_builder.CreateLoad(m_args[0]); // Return gas
return m_builder.CreateLoad(m_args[1]); return m_builder.CreateLoad(m_args[1]);
@ -139,9 +139,9 @@ llvm::Value* Ext::sha3(llvm::Value* _inOff, llvm::Value* _inSize)
{ {
m_builder.CreateStore(_inOff, m_args[0]); m_builder.CreateStore(_inOff, m_args[0]);
m_builder.CreateStore(_inSize, m_arg2); m_builder.CreateStore(_inSize, m_arg2);
llvm::Value* args[] = {m_args[0], m_arg2, m_args[1]}; llvm::Value* args[] = {getRuntimeManager().getRuntimePtr(), m_args[0], m_arg2, m_args[1]};
m_builder.CreateCall(m_sha3, args); m_builder.CreateCall(m_sha3, args);
Value* hash = m_builder.CreateLoad(m_args[1]); llvm::Value* hash = m_builder.CreateLoad(m_args[1]);
hash = Endianness::toNative(m_builder, hash); hash = Endianness::toNative(m_builder, hash);
return hash; return hash;
} }
@ -150,7 +150,7 @@ llvm::Value* Ext::exp(llvm::Value* _left, llvm::Value* _right)
{ {
m_builder.CreateStore(_left, m_args[0]); m_builder.CreateStore(_left, m_args[0]);
m_builder.CreateStore(_right, m_arg2); m_builder.CreateStore(_right, m_arg2);
llvm::Value* args[] = {m_args[0], m_arg2, m_args[1]}; llvm::Value* args[] = {getRuntimeManager().getRuntimePtr(), m_args[0], m_arg2, m_args[1]};
m_builder.CreateCall(m_exp, args); m_builder.CreateCall(m_exp, args);
return m_builder.CreateLoad(m_args[1]); return m_builder.CreateLoad(m_args[1]);
} }
@ -159,14 +159,14 @@ llvm::Value* Ext::codeAt(llvm::Value* _addr)
{ {
auto addr = Endianness::toBE(m_builder, _addr); auto addr = Endianness::toBE(m_builder, _addr);
m_builder.CreateStore(addr, m_args[0]); m_builder.CreateStore(addr, m_args[0]);
return m_builder.CreateCall(m_codeAt, m_args[0]); return m_builder.CreateCall2(m_codeAt, getRuntimeManager().getRuntimePtr(), m_args[0]);
} }
llvm::Value* Ext::codesizeAt(llvm::Value* _addr) llvm::Value* Ext::codesizeAt(llvm::Value* _addr)
{ {
auto addr = Endianness::toBE(m_builder, _addr); auto addr = Endianness::toBE(m_builder, _addr);
m_builder.CreateStore(addr, m_args[0]); m_builder.CreateStore(addr, m_args[0]);
llvm::Value* args[] = {m_args[0], m_args[1]}; llvm::Value* args[] = {getRuntimeManager().getRuntimePtr(), m_args[0], m_args[1]};
m_builder.CreateCall(m_codesizeAt, args); m_builder.CreateCall(m_codesizeAt, args);
return m_builder.CreateLoad(m_args[1]); return m_builder.CreateLoad(m_args[1]);
} }
@ -179,51 +179,44 @@ extern "C"
using namespace dev::eth::jit; using namespace dev::eth::jit;
EXPORT void ext_init(ExtData* _extData) EXPORT void ext_store(Runtime* _rt, i256* _index, i256* _value)
{
auto&& ext = Runtime::getExt();
_extData->calldata = ext.data.data();
_extData->code = ext.code.data();
}
EXPORT void ext_store(i256* _index, i256* _value)
{ {
auto index = llvm2eth(*_index); auto index = llvm2eth(*_index);
auto value = Runtime::getExt().store(index); // Interface uses native endianness auto value = _rt->getExt().store(index); // Interface uses native endianness
*_value = eth2llvm(value); *_value = eth2llvm(value);
} }
EXPORT void ext_setStore(i256* _index, i256* _value) EXPORT void ext_setStore(Runtime* _rt, i256* _index, i256* _value)
{ {
auto index = llvm2eth(*_index); auto index = llvm2eth(*_index);
auto value = llvm2eth(*_value); auto value = llvm2eth(*_value);
Runtime::getExt().setStore(index, value); // Interface uses native endianness _rt->getExt().setStore(index, value); // Interface uses native endianness
} }
EXPORT void ext_calldataload(i256* _index, i256* _value) EXPORT void ext_calldataload(Runtime* _rt, i256* _index, i256* _value)
{ {
auto index = static_cast<size_t>(llvm2eth(*_index)); auto index = static_cast<size_t>(llvm2eth(*_index));
assert(index + 31 > index); // TODO: Handle large index assert(index + 31 > index); // TODO: Handle large index
auto b = reinterpret_cast<byte*>(_value); auto b = reinterpret_cast<byte*>(_value);
for (size_t i = index, j = 0; i <= index + 31; ++i, ++j) for (size_t i = index, j = 0; i <= index + 31; ++i, ++j)
b[j] = i < Runtime::getExt().data.size() ? Runtime::getExt().data[i] : 0; // Keep Big Endian b[j] = i < _rt->getExt().data.size() ? _rt->getExt().data[i] : 0; // Keep Big Endian
// TODO: It all can be done by adding padding to data or by using min() algorithm without branch // TODO: It all can be done by adding padding to data or by using min() algorithm without branch
} }
EXPORT void ext_balance(h256* _address, i256* _value) EXPORT void ext_balance(Runtime* _rt, h256* _address, i256* _value)
{ {
auto u = Runtime::getExt().balance(right160(*_address)); auto u = _rt->getExt().balance(right160(*_address));
*_value = eth2llvm(u); *_value = eth2llvm(u);
} }
EXPORT void ext_suicide(h256* _address) EXPORT void ext_suicide(Runtime* _rt, h256* _address)
{ {
Runtime::getExt().suicide(right160(*_address)); _rt->getExt().suicide(right160(*_address));
} }
EXPORT void ext_create(i256* _endowment, i256* _initOff, i256* _initSize, h256* _address) EXPORT void ext_create(Runtime* _rt, i256* _endowment, i256* _initOff, i256* _initSize, h256* _address)
{ {
auto&& ext = Runtime::getExt(); auto&& ext = _rt->getExt();
auto endowment = llvm2eth(*_endowment); auto endowment = llvm2eth(*_endowment);
if (ext.balance(ext.myAddress) >= endowment) if (ext.balance(ext.myAddress) >= endowment)
@ -244,9 +237,9 @@ EXPORT void ext_create(i256* _endowment, i256* _initOff, i256* _initSize, h256*
EXPORT void ext_call(i256* _gas, h256* _receiveAddress, i256* _value, i256* _inOff, i256* _inSize, i256* _outOff, i256* _outSize, h256* _codeAddress, i256* _ret) EXPORT void ext_call(Runtime* _rt, i256* _gas, h256* _receiveAddress, i256* _value, i256* _inOff, i256* _inSize, i256* _outOff, i256* _outSize, h256* _codeAddress, i256* _ret)
{ {
auto&& ext = Runtime::getExt(); auto&& ext = _rt->getExt();
auto value = llvm2eth(*_value); auto value = llvm2eth(*_value);
auto ret = false; auto ret = false;
@ -270,7 +263,7 @@ EXPORT void ext_call(i256* _gas, h256* _receiveAddress, i256* _value, i256* _inO
_ret->a = ret ? 1 : 0; _ret->a = ret ? 1 : 0;
} }
EXPORT void ext_sha3(i256* _inOff, i256* _inSize, i256* _ret) EXPORT void ext_sha3(Runtime* _rt, i256* _inOff, i256* _inSize, i256* _ret)
{ {
auto inOff = static_cast<size_t>(llvm2eth(*_inOff)); auto inOff = static_cast<size_t>(llvm2eth(*_inOff));
auto inSize = static_cast<size_t>(llvm2eth(*_inSize)); auto inSize = static_cast<size_t>(llvm2eth(*_inSize));
@ -279,7 +272,7 @@ EXPORT void ext_sha3(i256* _inOff, i256* _inSize, i256* _ret)
*_ret = *reinterpret_cast<i256*>(&hash); *_ret = *reinterpret_cast<i256*>(&hash);
} }
EXPORT void ext_exp(i256* _left, i256* _right, i256* _ret) EXPORT void ext_exp(Runtime* _rt, i256* _left, i256* _right, i256* _ret)
{ {
bigint left = llvm2eth(*_left); bigint left = llvm2eth(*_left);
bigint right = llvm2eth(*_right); bigint right = llvm2eth(*_right);
@ -287,17 +280,17 @@ EXPORT void ext_exp(i256* _left, i256* _right, i256* _ret)
*_ret = eth2llvm(ret); *_ret = eth2llvm(ret);
} }
EXPORT unsigned char* ext_codeAt(h256* _addr256) EXPORT unsigned char* ext_codeAt(Runtime* _rt, h256* _addr256) //FIXME: Check endianess
{ {
auto&& ext = Runtime::getExt(); auto&& ext = _rt->getExt();
auto addr = right160(*_addr256); auto addr = right160(*_addr256);
auto& code = ext.codeAt(addr); auto& code = ext.codeAt(addr);
return const_cast<unsigned char*>(code.data()); return const_cast<unsigned char*>(code.data());
} }
EXPORT void ext_codesizeAt(h256* _addr256, i256* _ret) EXPORT void ext_codesizeAt(Runtime* _rt, h256* _addr256, i256* _ret) //FIXME: Check endianess
{ {
auto&& ext = Runtime::getExt(); auto&& ext = _rt->getExt();
auto addr = right160(*_addr256); auto addr = right160(*_addr256);
auto& code = ext.codeAt(addr); auto& code = ext.codeAt(addr);
*_ret = eth2llvm(u256(code.size())); *_ret = eth2llvm(u256(code.size()));

6
libevmjit/Runtime.cpp
View file

@ -91,12 +91,6 @@ void Runtime::set(RuntimeData::Index _index, u256 _value)
m_data.elems[_index] = eth2llvm(_value); m_data.elems[_index] = eth2llvm(_value);
} }
ExtVMFace& Runtime::getExt()
{
return g_runtime->m_ext;
}
u256 Runtime::getGas() const u256 Runtime::getGas() const
{ {
return llvm2eth(m_data.elems[RuntimeData::Gas]); return llvm2eth(m_data.elems[RuntimeData::Gas]);

2
libevmjit/Runtime.h
View file

@ -67,7 +67,7 @@ public:
StackImpl& getStack() { return m_stack; } StackImpl& getStack() { return m_stack; }
MemoryImpl& getMemory() { return m_memory; } MemoryImpl& getMemory() { return m_memory; }
static ExtVMFace& getExt(); ExtVMFace& getExt() { return m_ext; }
u256 getGas() const; u256 getGas() const;
bytesConstRef getReturnData() const; bytesConstRef getReturnData() const;