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

fixed bug in memory handling

Browse source
This commit is contained in:
artur-zawlocki 2014-10-01 16:32:59 +02:00
parent e1abb20f9b
commit eea755cfc6
3 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
evmcc/Memory.cpp
View file

@ -63,10 +63,11 @@ Memory::Memory(llvm::IRBuilder<>& _builder, llvm::Module* _module)
llvm::Value* Memory::loadWord(llvm::Value* _addr) llvm::Value* Memory::loadWord(llvm::Value* _addr)
{ {
// trunc _addr (an i256) to i64 index and use it to index the memory // trunc _addr (an i256) to i64 index and use it to index the memory
auto index = m_builder.CreateTrunc(_addr, m_builder.getInt64Ty(), "index"); auto index = m_builder.CreateTrunc(_addr, m_builder.getInt64Ty(), "mem.index");
auto index31 = m_builder.CreateAdd(index, llvm::ConstantInt::get(m_builder.getInt64Ty(), 31), "mem.index.31");
// load from evmccrt_memory_require()[index] // load from evmccrt_memory_require()[index]
auto base = m_builder.CreateCall(m_memRequire, index, "base"); auto base = m_builder.CreateCall(m_memRequire, index31, "base");
auto ptr = m_builder.CreateGEP(base, index, "ptr"); auto ptr = m_builder.CreateGEP(base, index, "ptr");
auto i256ptrTy = m_builder.getIntNTy(256)->getPointerTo(); auto i256ptrTy = m_builder.getIntNTy(256)->getPointerTo();
@ -79,10 +80,10 @@ llvm::Value* Memory::loadWord(llvm::Value* _addr)
void Memory::storeWord(llvm::Value* _addr, llvm::Value* _word) void Memory::storeWord(llvm::Value* _addr, llvm::Value* _word)
{ {
auto index = m_builder.CreateTrunc(_addr, m_builder.getInt64Ty(), "index"); auto index = m_builder.CreateTrunc(_addr, m_builder.getInt64Ty(), "mem.index");
auto index32 = m_builder.CreateAdd(index, llvm::ConstantInt::get(m_builder.getInt64Ty(), 32), "index32"); auto index31 = m_builder.CreateAdd(index, llvm::ConstantInt::get(m_builder.getInt64Ty(), 31), "mem.index31");
auto base = m_builder.CreateCall(m_memRequire, index32, "base"); auto base = m_builder.CreateCall(m_memRequire, index31, "base");
auto ptr = m_builder.CreateGEP(base, index, "ptr"); auto ptr = m_builder.CreateGEP(base, index, "ptr");
auto i256ptrTy = m_builder.getIntNTy(256)->getPointerTo(); auto i256ptrTy = m_builder.getIntNTy(256)->getPointerTo();
@ -141,21 +142,24 @@ EXPORT void evmccrt_memory_create(void)
// Resizes memory to contain at least _index + 1 bytes and returns the base address. // Resizes memory to contain at least _index + 1 bytes and returns the base address.
EXPORT uint8_t* evmccrt_memory_require(uint64_t _index) EXPORT uint8_t* evmccrt_memory_require(uint64_t _index)
{ {
uint64_t size = _index + 1; uint64_t requiredSize = (_index / 32 + 1) * 32;
std::cerr << "MEMORY: require(), current size = " << evmccrt_memory->size() if (evmccrt_memory->size() < requiredSize)
<< ", required size = " << size {
<< std::endl; std::cerr << "MEMORY: current size: " << std::dec
<< evmccrt_memory->size() << " bytes, required size: "
<< requiredSize << " bytes"
<< std::endl;
if (evmccrt_memory->size() < size) evmccrt_memory->resize(requiredSize);
evmccrt_memory->resize(size); }
return &(*evmccrt_memory)[0]; return &(*evmccrt_memory)[0];
} }
EXPORT uint64_t evmccrt_memory_size() EXPORT uint64_t evmccrt_memory_size()
{ {
return (evmccrt_memory->size() + 31) / 32; return evmccrt_memory->size() / 32;
} }
EXPORT void evmccrt_memory_dump(uint64_t _begin, uint64_t _end) EXPORT void evmccrt_memory_dump(uint64_t _begin, uint64_t _end)
@ -163,8 +167,10 @@ EXPORT void evmccrt_memory_dump(uint64_t _begin, uint64_t _end)
if (_end == 0) if (_end == 0)
_end = evmccrt_memory->size(); _end = evmccrt_memory->size();
std::cerr << "Active memory size: " << evmccrt_memory_size() << " words\n"; std::cerr << "MEMORY: active size: " << std::dec
std::cerr << "Memory dump from " << std::hex << _begin << " to " << std::hex << _end << ":"; << evmccrt_memory_size() << " words\n";
std::cerr << "MEMORY: dump from " << std::dec
<< _begin << " to " << _end << ":";
if (_end <= _begin) if (_end <= _begin)
return; return;

1
evmcc/bytecode/memtest1.evm Normal file
View file

@ -0,0 +1 @@
6002600055600360015560005360015301600254

9
evmcc/lll/memtest1.lll
View file

@ -9,9 +9,10 @@ MSTORE8 ;; [02 03]
0 0
MLOAD ;; [2 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] MLOAD ;; [2 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]
1 1
MLOAD ;; [2 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] MLOAD ;; [2 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
;; 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]
ADD ADD
2 2
MSTORE ;; [2 3 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 MSTORE ;; [2 3 5 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
;; 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ] ;; 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]
) )