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

Added missing changes [#79450108]

Browse source
This commit is contained in:
artur-zawlocki 2014-10-28 09:50:42 +00:00
parent 68ca6962cf
commit d5ddbfadbb
2 changed files with 35 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
libevmjit/Compiler.cpp
View file

@ -22,6 +22,7 @@
#include "GasMeter.h" #include "GasMeter.h"
#include "Utils.h" #include "Utils.h"
#include "Endianness.h" #include "Endianness.h"
#include "Arith256.h"
#include "Runtime.h" #include "Runtime.h"
namespace dev namespace dev
@ -185,6 +186,7 @@ std::unique_ptr<llvm::Module> Compiler::compile(bytesConstRef bytecode)
Memory memory(m_builder, gasMeter, runtimeManager); Memory memory(m_builder, gasMeter, runtimeManager);
Ext ext(runtimeManager); Ext ext(runtimeManager);
Stack stack(m_builder, runtimeManager); Stack stack(m_builder, runtimeManager);
Arith256 arith(m_builder);
m_builder.CreateBr(basicBlocks.begin()->second); m_builder.CreateBr(basicBlocks.begin()->second);
@ -194,7 +196,7 @@ std::unique_ptr<llvm::Module> Compiler::compile(bytesConstRef bytecode)
auto iterCopy = basicBlockPairIt; auto iterCopy = basicBlockPairIt;
++iterCopy; ++iterCopy;
auto nextBasicBlock = (iterCopy != basicBlocks.end()) ? iterCopy->second.llvm() : nullptr; auto nextBasicBlock = (iterCopy != basicBlocks.end()) ? iterCopy->second.llvm() : nullptr;
compileBasicBlock(basicBlock, bytecode, runtimeManager, memory, ext, gasMeter, nextBasicBlock); compileBasicBlock(basicBlock, bytecode, runtimeManager, arith, memory, ext, gasMeter, nextBasicBlock);
} }
// Code for special blocks: // Code for special blocks:
@ -280,7 +282,7 @@ std::unique_ptr<llvm::Module> Compiler::compile(bytesConstRef bytecode)
} }
void Compiler::compileBasicBlock(BasicBlock& basicBlock, bytesConstRef bytecode, RuntimeManager& _runtimeManager, Memory& memory, Ext& ext, GasMeter& gasMeter, llvm::BasicBlock* nextBasicBlock) void Compiler::compileBasicBlock(BasicBlock& basicBlock, bytesConstRef bytecode, RuntimeManager& _runtimeManager, Arith256& arith, Memory& memory, Ext& ext, GasMeter& gasMeter, llvm::BasicBlock* nextBasicBlock)
{ {
m_builder.SetInsertPoint(basicBlock.llvm()); m_builder.SetInsertPoint(basicBlock.llvm());
auto& stack = basicBlock.localStack(); auto& stack = basicBlock.localStack();
@ -314,61 +316,46 @@ void Compiler::compileBasicBlock(BasicBlock& basicBlock, bytesConstRef bytecode,
case Instruction::MUL: case Instruction::MUL:
{ {
auto lhs256 = stack.pop(); auto lhs = stack.pop();
auto rhs256 = stack.pop(); auto rhs = stack.pop();
auto lhs128 = m_builder.CreateTrunc(lhs256, Type::lowPrecision); auto res = arith.mul(lhs, rhs);
auto rhs128 = m_builder.CreateTrunc(rhs256, Type::lowPrecision); stack.push(res);
auto res128 = m_builder.CreateMul(lhs128, rhs128);
auto res256 = m_builder.CreateZExt(res128, Type::i256);
stack.push(res256);
break; break;
} }
case Instruction::DIV: case Instruction::DIV:
{ {
auto lhs256 = stack.pop(); auto lhs = stack.pop();
auto rhs256 = stack.pop(); auto rhs = stack.pop();
auto lhs128 = m_builder.CreateTrunc(lhs256, Type::lowPrecision); auto res = arith.div(lhs, rhs);
auto rhs128 = m_builder.CreateTrunc(rhs256, Type::lowPrecision); stack.push(res);
auto res128 = m_builder.CreateUDiv(lhs128, rhs128);
auto res256 = m_builder.CreateZExt(res128, Type::i256);
stack.push(res256);
break; break;
} }
case Instruction::SDIV: case Instruction::SDIV:
{ {
auto lhs256 = stack.pop(); auto lhs = stack.pop();
auto rhs256 = stack.pop(); auto rhs = stack.pop();
auto lhs128 = m_builder.CreateTrunc(lhs256, Type::lowPrecision); auto res = arith.sdiv(lhs, rhs);
auto rhs128 = m_builder.CreateTrunc(rhs256, Type::lowPrecision); stack.push(res);
auto res128 = m_builder.CreateSDiv(lhs128, rhs128);
auto res256 = m_builder.CreateSExt(res128, Type::i256);
stack.push(res256);
break; break;
} }
case Instruction::MOD: case Instruction::MOD:
{ {
auto lhs256 = stack.pop(); auto lhs = stack.pop();
auto rhs256 = stack.pop(); auto rhs = stack.pop();
auto lhs128 = m_builder.CreateTrunc(lhs256, Type::lowPrecision); auto res = arith.mod(lhs, rhs);
auto rhs128 = m_builder.CreateTrunc(rhs256, Type::lowPrecision); stack.push(res);
auto res128 = m_builder.CreateURem(lhs128, rhs128);
auto res256 = m_builder.CreateZExt(res128, Type::i256);
stack.push(res256);
break; break;
} }
case Instruction::SMOD: case Instruction::SMOD:
{ {
auto lhs256 = stack.pop(); auto lhs = stack.pop();
auto rhs256 = stack.pop(); auto rhs = stack.pop();
auto lhs128 = m_builder.CreateTrunc(lhs256, Type::lowPrecision); auto res = arith.smod(lhs, rhs);
auto rhs128 = m_builder.CreateTrunc(rhs256, Type::lowPrecision); stack.push(res);
auto res128 = m_builder.CreateSRem(lhs128, rhs128);
auto res256 = m_builder.CreateSExt(res128, Type::i256);
stack.push(res256);
break; break;
} }
@ -496,31 +483,23 @@ void Compiler::compileBasicBlock(BasicBlock& basicBlock, bytesConstRef bytecode,
case Instruction::ADDMOD: case Instruction::ADDMOD:
{ {
auto val1 = stack.pop(); auto lhs = stack.pop();
auto val2 = stack.pop(); auto rhs = stack.pop();
auto sum = m_builder.CreateAdd(val1, val2); auto sum = m_builder.CreateAdd(lhs, rhs);
auto mod = stack.pop(); auto mod = stack.pop();
auto res = arith.mod(sum, mod);
auto sum128 = m_builder.CreateTrunc(sum, Type::lowPrecision); stack.push(res);
auto mod128 = m_builder.CreateTrunc(mod, Type::lowPrecision);
auto res128 = m_builder.CreateURem(sum128, mod128);
auto res256 = m_builder.CreateZExt(res128, Type::i256);
stack.push(res256);
break; break;
} }
case Instruction::MULMOD: case Instruction::MULMOD:
{ {
auto val1 = stack.pop(); auto lhs = stack.pop();
auto val2 = stack.pop(); auto rhs = stack.pop();
auto prod = m_builder.CreateMul(val1, val2); auto prod = m_builder.CreateMul(lhs, rhs);
auto mod = stack.pop(); auto mod = stack.pop();
auto res = arith.mod(prod, mod);
auto prod128 = m_builder.CreateTrunc(prod, Type::lowPrecision); stack.push(res);
auto mod128 = m_builder.CreateTrunc(mod, Type::lowPrecision);
auto res128 = m_builder.CreateURem(prod128, mod128);
auto res256 = m_builder.CreateZExt(res128, Type::i256);
stack.push(res256);
break; break;
} }

2
libevmjit/Compiler.h
View file

@ -31,7 +31,7 @@ private:
void createBasicBlocks(bytesConstRef bytecode); void createBasicBlocks(bytesConstRef bytecode);
void compileBasicBlock(BasicBlock& basicBlock, bytesConstRef bytecode, class RuntimeManager& _runtimeManager, class Memory& memory, class Ext& ext, class GasMeter& gasMeter, llvm::BasicBlock* nextBasicBlock); void compileBasicBlock(BasicBlock& basicBlock, bytesConstRef bytecode, class RuntimeManager& _runtimeManager, class Arith256& arith, class Memory& memory, class Ext& ext, class GasMeter& gasMeter, llvm::BasicBlock* nextBasicBlock);
void removeDeadBlocks(); void removeDeadBlocks();