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

Use mem.require in mload, mstore & mstore8

Browse source
This commit is contained in:
Paweł Bylica 2014-10-14 15:48:27 +02:00
parent 0931289287
commit 82cba7a346
1 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
evmcc/Memory.cpp
View file

@ -40,11 +40,10 @@ Memory::Memory(llvm::IRBuilder<>& _builder, llvm::Module* _module, GasMeter& _ga
m_returnDataSize->setUnnamedAddr(true); // Address is not important m_returnDataSize->setUnnamedAddr(true); // Address is not important
m_resize = llvm::Function::Create(llvm::FunctionType::get(Type::BytePtr, Type::WordPtr, false), llvm::Function::ExternalLinkage, "mem_resize", _module); m_resize = llvm::Function::Create(llvm::FunctionType::get(Type::BytePtr, Type::WordPtr, false), llvm::Function::ExternalLinkage, "mem_resize", _module);
m_require = createRequireFunc(_module, _gasMeter);
m_loadWord = createFunc(false, Type::i256, _module, _gasMeter); m_loadWord = createFunc(false, Type::i256, _module, _gasMeter);
m_storeWord = createFunc(true, Type::i256, _module, _gasMeter); m_storeWord = createFunc(true, Type::i256, _module, _gasMeter);
m_storeByte = createFunc(true, Type::Byte, _module, _gasMeter); m_storeByte = createFunc(true, Type::Byte, _module, _gasMeter);
m_require = createRequireFunc(_module, _gasMeter);
} }
llvm::Function* Memory::createRequireFunc(llvm::Module* _module, GasMeter& _gasMeter) llvm::Function* Memory::createRequireFunc(llvm::Module* _module, GasMeter& _gasMeter)
@ -91,51 +90,34 @@ llvm::Function* Memory::createFunc(bool _isStore, llvm::Type* _valueType, llvm::
auto funcType = _isStore ? llvm::FunctionType::get(Type::Void, storeArgs, false) : llvm::FunctionType::get(Type::i256, Type::i256, false); auto funcType = _isStore ? llvm::FunctionType::get(Type::Void, storeArgs, false) : llvm::FunctionType::get(Type::i256, Type::i256, false);
auto func = llvm::Function::Create(funcType, llvm::Function::PrivateLinkage, name, _module); auto func = llvm::Function::Create(funcType, llvm::Function::PrivateLinkage, name, _module);
auto checkBB = llvm::BasicBlock::Create(func->getContext(), "check", func); auto origBB = m_builder.GetInsertBlock();
auto resizeBB = llvm::BasicBlock::Create(func->getContext(), "resize", func); auto origPt = m_builder.GetInsertPoint();
auto accessBB = llvm::BasicBlock::Create(func->getContext(), "access", func);
// BB "check" m_builder.SetInsertPoint(llvm::BasicBlock::Create(func->getContext(), {}, func));
llvm::IRBuilder<> builder(checkBB);
llvm::Value* index = func->arg_begin(); llvm::Value* index = func->arg_begin();
index->setName("index"); index->setName("index");
auto valueSize = _valueType->getPrimitiveSizeInBits() / 8; auto valueSize = _valueType->getPrimitiveSizeInBits() / 8;
auto sizeRequired = builder.CreateAdd(index, Constant::get(valueSize), "sizeRequired"); this->require(index, Constant::get(valueSize));
auto size = builder.CreateLoad(m_size, "size"); auto data = m_builder.CreateLoad(m_data, "data");
auto resizeNeeded = builder.CreateICmpULE(size, sizeRequired, "resizeNeeded"); auto ptr = m_builder.CreateGEP(data, index, "ptr");
builder.CreateCondBr(resizeNeeded, resizeBB, accessBB); // OPT branch weights?
// BB "resize"
builder.SetInsertPoint(resizeBB);
// Check gas first
auto wordsRequired = builder.CreateUDiv(builder.CreateAdd(sizeRequired, Constant::get(31)), Constant::get(32), "wordsRequired");
auto words = builder.CreateUDiv(builder.CreateAdd(size, Constant::get(31)), Constant::get(32), "words");
auto newWords = builder.CreateSub(wordsRequired, words, "addtionalWords");
_gasMeter.checkMemory(newWords, builder);
// Resize
builder.CreateStore(sizeRequired, m_size);
auto newData = builder.CreateCall(m_resize, m_size, "newData");
builder.CreateStore(newData, m_data);
builder.CreateBr(accessBB);
// BB "access"
builder.SetInsertPoint(accessBB);
auto data = builder.CreateLoad(m_data, "data");
auto ptr = builder.CreateGEP(data, index, "ptr");
if (isWord) if (isWord)
ptr = builder.CreateBitCast(ptr, Type::WordPtr, "wordPtr"); ptr = m_builder.CreateBitCast(ptr, Type::WordPtr, "wordPtr");
if (_isStore) if (_isStore)
{ {
llvm::Value* value = ++func->arg_begin(); llvm::Value* value = ++func->arg_begin();
value->setName("value"); value->setName("value");
builder.CreateStore(value, ptr); m_builder.CreateStore(value, ptr);
builder.CreateRetVoid(); m_builder.CreateRetVoid();
} }
else else
{ {
auto ret = builder.CreateLoad(ptr); auto ret = m_builder.CreateLoad(ptr);
builder.CreateRet(ret); m_builder.CreateRet(ret);
} }
m_builder.SetInsertPoint(origBB, origPt);
return func; return func;
} }