lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1355 from imapp-pl/pr/evmjit_bugfix 

EVM JIT: broken constant folding disabled
cl-refactor
Gav Wood 10 years ago
parent
5131f24929 cc1be11d6c
commit
763e983c42
1 changed files with 24 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      evmjit/libevmjit/Arith256.cpp

46
evmjit/libevmjit/Arith256.cpp
View File

@ -371,17 +371,18 @@ llvm::Value* Arith256::mul(llvm::Value* _arg1, llvm::Value* _arg2)
std::pair<llvm::Value*, llvm::Value*> Arith256::div(llvm::Value* _arg1, llvm::Value* _arg2) std::pair<llvm::Value*, llvm::Value*> Arith256::div(llvm::Value* _arg1, llvm::Value* _arg2)
{ {
if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1)) // FIXME: Disabled because of llvm::APInt::urem bug
{ // if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1))
if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2)) // {
{ // if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2))
if (!c2->getValue()) // {
return std::make_pair(Constant::get(0), Constant::get(0)); // if (!c2->getValue())
auto div = Constant::get(c1->getValue().udiv(c2->getValue())); // return std::make_pair(Constant::get(0), Constant::get(0));
auto mod = Constant::get(c1->getValue().urem(c2->getValue())); // auto div = Constant::get(c1->getValue().udiv(c2->getValue()));
return std::make_pair(div, mod); // auto mod = Constant::get(c1->getValue().urem(c2->getValue()));
} // return std::make_pair(div, mod);
} // }
// }
auto r = createCall(getDivFunc(Type::Word), {_arg1, _arg2}); auto r = createCall(getDivFunc(Type::Word), {_arg1, _arg2});
auto div = m_builder.CreateExtractValue(r, 0, "div"); auto div = m_builder.CreateExtractValue(r, 0, "div");
@ -391,17 +392,18 @@ std::pair<llvm::Value*, llvm::Value*> Arith256::div(llvm::Value* _arg1, llvm::Va
std::pair<llvm::Value*, llvm::Value*> Arith256::sdiv(llvm::Value* _x, llvm::Value* _y) std::pair<llvm::Value*, llvm::Value*> Arith256::sdiv(llvm::Value* _x, llvm::Value* _y)
{ {
if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_x)) // FIXME: Disabled because of llvm::APInt::urem bug
{ // if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_x))
if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_y)) // {
{ // if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_y))
if (!c2->getValue()) // {
return std::make_pair(Constant::get(0), Constant::get(0)); // if (!c2->getValue())
auto div = Constant::get(c1->getValue().sdiv(c2->getValue())); // return std::make_pair(Constant::get(0), Constant::get(0));
auto mod = Constant::get(c1->getValue().srem(c2->getValue())); // auto div = Constant::get(c1->getValue().sdiv(c2->getValue()));
return std::make_pair(div, mod); // auto mod = Constant::get(c1->getValue().srem(c2->getValue()));
} // return std::make_pair(div, mod);
} // }
// }
auto xIsNeg = m_builder.CreateICmpSLT(_x, Constant::get(0)); auto xIsNeg = m_builder.CreateICmpSLT(_x, Constant::get(0));
auto xNeg = m_builder.CreateSub(Constant::get(0), _x); auto xNeg = m_builder.CreateSub(Constant::get(0), _x);

Write Preview
Loading…
Cancel
Save