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

Remove Memory::require(size) interface [#81773288]

Browse source
This commit is contained in:
Paweł Bylica 2014-10-31 08:50:25 +01:00
parent 273b0f634f
commit 272c568bfc
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libevmjit/Memory.cpp
View file

@ -28,8 +28,7 @@ Memory::Memory(RuntimeManager& _runtimeManager, GasMeter& _gasMeter):
RuntimeHelper(_runtimeManager) RuntimeHelper(_runtimeManager)
{ {
auto module = getModule(); auto module = getModule();
auto i64Ty = m_builder.getInt64Ty(); llvm::Type* argTypes[] = {Type::i256, Type::i256};
llvm::Type* argTypes[] = {i64Ty, i64Ty};
auto dumpTy = llvm::FunctionType::get(m_builder.getVoidTy(), llvm::ArrayRef<llvm::Type*>(argTypes), false); auto dumpTy = llvm::FunctionType::get(m_builder.getVoidTy(), llvm::ArrayRef<llvm::Type*>(argTypes), false);
m_memDump = llvm::Function::Create(dumpTy, llvm::GlobalValue::LinkageTypes::ExternalLinkage, m_memDump = llvm::Function::Create(dumpTy, llvm::GlobalValue::LinkageTypes::ExternalLinkage,
"evmccrt_memory_dump", module); "evmccrt_memory_dump", module);
@ -54,19 +53,23 @@ Memory::Memory(RuntimeManager& _runtimeManager, GasMeter& _gasMeter):
llvm::Function* Memory::createRequireFunc(GasMeter& _gasMeter, RuntimeManager& _runtimeManager) llvm::Function* Memory::createRequireFunc(GasMeter& _gasMeter, RuntimeManager& _runtimeManager)
{ {
auto func = llvm::Function::Create(llvm::FunctionType::get(Type::Void, Type::i256, false), llvm::Function::PrivateLinkage, "mem.require", getModule()); llvm::Type* argTypes[] = {Type::i256, Type::i256};
auto func = llvm::Function::Create(llvm::FunctionType::get(Type::Void, argTypes, false), llvm::Function::PrivateLinkage, "mem.require", getModule());
auto offset = func->arg_begin();
offset->setName("offset");
auto size = offset->getNextNode();
size->setName("size");
auto checkBB = llvm::BasicBlock::Create(func->getContext(), "check", func); auto checkBB = llvm::BasicBlock::Create(func->getContext(), "Check", func);
auto resizeBB = llvm::BasicBlock::Create(func->getContext(), "resize", func); auto resizeBB = llvm::BasicBlock::Create(func->getContext(), "Resize", func);
auto returnBB = llvm::BasicBlock::Create(func->getContext(), "return", func); auto returnBB = llvm::BasicBlock::Create(func->getContext(), "Return", func);
InsertPointGuard guard(m_builder); // Restores insert point at function exit InsertPointGuard guard(m_builder); // Restores insert point at function exit
// BB "check" // BB "check"
m_builder.SetInsertPoint(checkBB); m_builder.SetInsertPoint(checkBB);
llvm::Value* sizeRequired = func->arg_begin(); auto sizeRequired = m_builder.CreateNUWAdd(offset, size, "sizeRequired");
sizeRequired->setName("sizeRequired"); auto currSize = m_builder.CreateLoad(m_size, "currSize");
auto size = m_builder.CreateLoad(m_size, "size");
auto resizeNeeded = m_builder.CreateICmpULE(size, sizeRequired, "resizeNeeded"); auto resizeNeeded = m_builder.CreateICmpULE(size, sizeRequired, "resizeNeeded");
m_builder.CreateCondBr(resizeNeeded, resizeBB, returnBB); // OPT branch weights? m_builder.CreateCondBr(resizeNeeded, resizeBB, returnBB); // OPT branch weights?
@ -164,15 +167,9 @@ llvm::Value* Memory::getSize()
return m_builder.CreateLoad(m_size); return m_builder.CreateLoad(m_size);
} }
void Memory::require(llvm::Value* _size)
{
m_builder.CreateCall(m_require, _size);
}
void Memory::require(llvm::Value* _offset, llvm::Value* _size) void Memory::require(llvm::Value* _offset, llvm::Value* _size)
{ {
auto sizeRequired = m_builder.CreateNUWAdd(_offset, _size, "sizeRequired"); m_builder.CreateCall2(m_require, _offset, _size);
require(sizeRequired);
} }
void Memory::copyBytes(llvm::Value* _srcPtr, llvm::Value* _srcSize, llvm::Value* _srcIdx, void Memory::copyBytes(llvm::Value* _srcPtr, llvm::Value* _srcSize, llvm::Value* _srcIdx,
@ -180,8 +177,7 @@ void Memory::copyBytes(llvm::Value* _srcPtr, llvm::Value* _srcSize, llvm::Value*
{ {
auto zero256 = llvm::ConstantInt::get(Type::i256, 0); auto zero256 = llvm::ConstantInt::get(Type::i256, 0);
auto reqMemSize = m_builder.CreateAdd(_destMemIdx, _reqBytes, "req_mem_size"); require(_destMemIdx, _reqBytes);
require(reqMemSize);
auto srcPtr = m_builder.CreateGEP(_srcPtr, _srcIdx, "src_idx"); auto srcPtr = m_builder.CreateGEP(_srcPtr, _srcIdx, "src_idx");

3
libevmjit/Memory.h
View file

@ -33,9 +33,6 @@ private:
llvm::Function* createFunc(bool _isStore, llvm::Type* _type, GasMeter& _gasMeter); llvm::Function* createFunc(bool _isStore, llvm::Type* _type, GasMeter& _gasMeter);
llvm::Function* createRequireFunc(GasMeter& _gasMeter, RuntimeManager& _runtimeManager); llvm::Function* createRequireFunc(GasMeter& _gasMeter, RuntimeManager& _runtimeManager);
/// Requires this amount of memory. And counts gas fee for that memory.
void require(llvm::Value* _size);
llvm::GlobalVariable* m_data; llvm::GlobalVariable* m_data;
llvm::GlobalVariable* m_size; llvm::GlobalVariable* m_size;