Skip to content

capstone2llvmir/x86: Add support of FPU instructions. #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Sep 18, 2019
Merged

capstone2llvmir/x86: Add support of FPU instructions. #643

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
28ccac1
capstone2llvmir/x86: Add support of x87 FISTPP instruction and unit t…
JurajHolub Aug 23, 2019
d507fba
capstone2llvmir/x86: Add support of x87 FCMOVEcc instructions and uni…
JurajHolub Aug 31, 2019
701c661
capstone2llvmir/x86: Add support of x87 FPREM instructions and unit t…
JurajHolub Aug 31, 2019
0efe91a
capstone2llvmir/x86: Add tests for x87 FPREM instructions.
JurajHolub Aug 31, 2019
fef24e5
capstone2llvmir/x86: Add support of x87 F2XM1, FYL2X, FYL2xP1 instruc…
JurajHolub Sep 3, 2019
1d522ac
capstone2llvmir/x86: Add support of x87 FFREE instructions and unit t…
JurajHolub Sep 4, 2019
3dd9ca6
capstone2llvmir/x86: Add support of x87 FNSTCW instructions and unit …
JurajHolub Sep 4, 2019
e683ee7
capstone2llvmir/x86.cpp: remove extra new lines
PeterMatula Sep 11, 2019
adee5c6
capstone2llvmir/x86_impl.h: remove extra newline & indent
PeterMatula Sep 11, 2019
21997de
capstone2llvmir/x86: Fix indention of new tests + comments.
JurajHolub Sep 12, 2019
cc2aa2d
capstone2llvmir/x86: Unit tests and translation of all FPU capstone i…
JurajHolub Sep 17, 2019
4f4f626
capstone2llvmir/x86: Fix bug in FXRSTOR unit etst.
JurajHolub Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 119 additions & 7 deletions src/capstone2llvmir/x86/x86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2757,10 +2757,9 @@ void Capstone2LlvmIrTranslatorX86_impl::translateNeg(cs_insn* i, cs_x86* xi, llv
* IRETD, IRET, STI, CLI, VERR, VERW, LMSW, LTR,
* SMSW, CLTS, INVD, LOCK, RSM, RDMSR, WRMSR, RDPMC, SYSENTER,
* SYSEXIT, XGETBV, LAR, LSL, INVPCID, SLDT, LLDT, SGDT, SIDT, LGDT, LIDT,
* XSAVE, XRSTOR, XSAVEOPT, INVLPG, FBLD, FBSTP, FLDENV, FRSTOR, FNSAVE, FFREE,
* FCMOVE, FCMOVNE, FCMOVB, FCMOVNB, FCMOVBE, FCMOVNBE, FCMOVU, FCMOVNU, ARPL,
* STR, FPREM, FPREM1, FSCALE, FXTRACT, FPTAN, FPATAN, F2XM1, FYL2X,
* FYL2XP1, FNCLEX, FWAIT, FNOP
* XSAVE, XRSTOR, XSAVEOPT, INVLPG, FBLD, FBSTP, FLDENV, FRSTOR, FNSAVE, ARPL,
* STR, FSCALE, FXTRACT, FPTAN, FPATAN,
* FNCLEX, FWAIT, FNOP
*/
void Capstone2LlvmIrTranslatorX86_impl::translateNop(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
Expand Down Expand Up @@ -4319,6 +4318,32 @@ void Capstone2LlvmIrTranslatorX86_impl::translateCMovCc(cs_insn* i, cs_x86* xi,
auto* val = irb.CreateSelect(cond, op1, op0);
storeOp(xi->operands[0], val, irb);
}
/**
* X86_INS_FCMOVB, X86_INS_FCMOVE, X86_INS_FCMOVBE, X86_INS_FCMOVU, X86_INS_FCMOVNB, X86_INS_FCMOVNE,
* X86_INS_FCMOVNBE, X86_INS_FCMOVNU
*/
void Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
EXPECT_IS_BINARY(i, xi, irb);

llvm::Value* cond = nullptr;
switch (i->id)
{
case X86_INS_FCMOVB: cond = generateCcB(irb); break;
case X86_INS_FCMOVE: cond = generateCcE(irb); break;
case X86_INS_FCMOVBE: cond = generateCcBE(irb); break;
case X86_INS_FCMOVU: cond = generateCcP(irb); break;
case X86_INS_FCMOVNB: cond = generateCcAE(irb); break;
case X86_INS_FCMOVNE: cond = generateCcNE(irb); break;
case X86_INS_FCMOVNBE: cond = generateCcA(irb); break;
case X86_INS_FCMOVNU: cond = generateCcNP(irb); break;
default: throw GenericError("Unhandled insn ID in translateSetCc().");
}

std::tie(op0, op1, top, idx) = loadOpFloatingBinaryTop(i, xi, irb);
auto* val = irb.CreateSelect(cond, op1, op0);
storeX87DataReg(irb, top, val);
}

/**
* X86_INS_FLD, X86_INS_FILD
Expand Down Expand Up @@ -4542,6 +4567,20 @@ void Capstone2LlvmIrTranslatorX86_impl::translateFdivr(cs_insn* i, cs_x86* xi, l
}
}

/**
* X86_INS_FPREM, X86_INS_FPREM1
*/
void Capstone2LlvmIrTranslatorX86_impl::translateFprem(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
EXPECT_IS_EXPR(i, xi, irb, (xi->op_count == 0));

std::tie(op0, op1, top, idx) = loadOpFloatingBinaryTop(i, xi, irb);

auto* frem = irb.CreateFRem(op0, op1);

storeX87DataReg(irb, top, frem);
}

/**
* X86_INS_FSUB, X86_INS_FSUBP, X86_INS_FISUB
*/
Expand Down Expand Up @@ -4640,6 +4679,47 @@ void Capstone2LlvmIrTranslatorX86_impl::translateFsqrt(cs_insn* i, cs_x86* xi, l
storeX87DataReg(irb, top, fabs);
}

/**
* X86_INS_F2XM1
*/
void Capstone2LlvmIrTranslatorX86_impl::translateF2xm1(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
EXPECT_IS_NULLARY(i, xi, irb);

auto* top = loadX87Top(irb);
op0 = loadX87DataReg(irb, top);
op1 = llvm::ConstantFP::get(op0->getType(), 1);
auto* f = llvm::Intrinsic::getDeclaration(_module, llvm::Intrinsic::exp2, op0->getType());
auto* exp2 = irb.CreateCall(f, {op0});
auto* res = irb.CreateFSub(exp2, op1);

storeX87DataReg(irb, top, res);
}

/**
* X86_INS_FYL2X, X86_INS_FYL2X1
*/
void Capstone2LlvmIrTranslatorX86_impl::translateFyl2x(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
EXPECT_IS_NULLARY(i, xi, irb);

std::tie(op0, op1, top, idx) = loadOpFloatingBinaryTop(i, xi, irb);

if (i->id == X86_INS_FYL2XP1)
{
op2 = llvm::ConstantFP::get(op0->getType(), 1);
op0 = irb.CreateFAdd(op0, op2);
}

auto* f = llvm::Intrinsic::getDeclaration(_module, llvm::Intrinsic::log2, op0->getType());
auto* log2 = irb.CreateCall(f, {op0});
auto* fmulLog2 = irb.CreateFMul(op1, log2);

storeX87DataReg(irb, idx, fmulLog2);
clearX87TagReg(irb, top); // pop
x87IncTop(irb, top);
}

/**
* X86_INS_FXCH
*/
Expand Down Expand Up @@ -4761,6 +4841,36 @@ void Capstone2LlvmIrTranslatorX86_impl::translateFdecstp(cs_insn* i, cs_x86* xi,
storeRegister(X87_REG_C1, irb.getFalse(), irb);
}

/**
* X86_INS_FFREE
*/
void Capstone2LlvmIrTranslatorX86_impl::translateFfree(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
EXPECT_IS_UNARY(i, xi, irb);

top = loadX87Top(irb);
auto reg = xi->operands[0].reg;
unsigned regOff = reg - X86_REG_ST0;
idx = regOff
? irb.CreateAdd(top, llvm::ConstantInt::get(top->getType(), regOff))
: top;

//storeX87TagReg(irb, idx, llvm::ConstantInt::get(irb.getIntNTy(2), 0x11B)); // 0x11B
clearX87TagReg(irb, idx);

}

/**
* X86_INS_FNSTSW
*/
void Capstone2LlvmIrTranslatorX86_impl::translateFnstsw(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
EXPECT_IS_UNARY(i, xi, irb);

auto* fpsw = loadRegister(X86_REG_FPSW, irb);
storeOp(xi->operands[0], fpsw, irb);
}

/**
* X86_INS_FUCOM, X86_INS_FUCOMP, X86_INS_FUCOMPP
* X86_INS_FCOM, X86_INS_FCOMP, X86_INS_FCOMPP
Expand Down Expand Up @@ -4841,7 +4951,7 @@ void Capstone2LlvmIrTranslatorX86_impl::translateFucomPop(cs_insn* i, cs_x86* xi
}

/**
* X86_INS_FIST, X86_INS_FISTP
* X86_INS_FIST, X86_INS_FISTP, X86_INS_FISTPP
*/
void Capstone2LlvmIrTranslatorX86_impl::translateFist(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb)
{
Expand All @@ -4850,16 +4960,18 @@ void Capstone2LlvmIrTranslatorX86_impl::translateFist(cs_insn* i, cs_x86* xi, ll
auto* topNum = loadX87Top(irb);
auto* top = loadX87DataReg(irb, topNum);
auto* t = getIntegerTypeFromByteSize(_module, xi->operands[0].size);
auto* fptosi = irb.CreateFPToSI(top, t);

auto *fptosi = irb.CreateFPToSI(top, t);
storeOp(xi->operands[0], fptosi, irb);

if (i->id == X86_INS_FISTP)
if (i->id == X86_INS_FISTP or i->id == X86_INS_FISTTP) // pop
{
clearX87TagReg(irb, topNum); // pop
x87IncTop(irb, topNum);
}
}


/**
* X86_INS_FRNDINT
*/
Expand Down
9 changes: 8 additions & 1 deletion src/capstone2llvmir/x86/x86_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,11 @@ class Capstone2LlvmIrTranslatorX86_impl :
void translateFdecstp(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFdiv(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFdivr(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFprem(cs_insn *i, cs_x86 *xi, llvm::IRBuilder<> &irb);
void translateFincstp(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFist(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFld(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFCMovCc(cs_insn *i, cs_x86 *xi, llvm::IRBuilder<> &irb);
void translateFloadConstant(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFmul(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFninit(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
Expand All @@ -301,6 +303,10 @@ class Capstone2LlvmIrTranslatorX86_impl :
void translateFsubr(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFucomPop(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFxch(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateF2xm1(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFyl2x(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFfree(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateFnstsw(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateImul(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateInc(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateIns(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
Expand Down Expand Up @@ -352,7 +358,8 @@ class Capstone2LlvmIrTranslatorX86_impl :
void translateXchg(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateXlatb(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
void translateXor(cs_insn* i, cs_x86* xi, llvm::IRBuilder<>& irb);
};

};

} // namespace capstone2llvmir
} // namespace retdec
Expand Down
32 changes: 16 additions & 16 deletions src/capstone2llvmir/x86/x86_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,25 +703,25 @@ Capstone2LlvmIrTranslatorX86_impl::_i2fm =
{X86_INS_CMOVAE, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVB, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVBE, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_FCMOVBE, nullptr},
{X86_INS_FCMOVB, nullptr},
{X86_INS_FCMOVBE, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_FCMOVB, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_CMOVE, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_FCMOVE, nullptr},
{X86_INS_FCMOVE, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_CMOVG, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVGE, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVL, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVLE, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_FCMOVNBE, nullptr},
{X86_INS_FCMOVNB, nullptr},
{X86_INS_FCMOVNBE, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_FCMOVNB, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_CMOVNE, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_FCMOVNE, nullptr},
{X86_INS_FCMOVNE, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_CMOVNO, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVNP, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_FCMOVNU, nullptr},
{X86_INS_FCMOVNU, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_CMOVNS, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVO, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMOVP, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_FCMOVU, nullptr},
{X86_INS_FCMOVU, &Capstone2LlvmIrTranslatorX86_impl::translateFCMovCc},
{X86_INS_CMOVS, &Capstone2LlvmIrTranslatorX86_impl::translateCMovCc},
{X86_INS_CMP, &Capstone2LlvmIrTranslatorX86_impl::translateSub},
{X86_INS_CMPSB, &Capstone2LlvmIrTranslatorX86_impl::translateCompareString},
Expand Down Expand Up @@ -781,15 +781,15 @@ Capstone2LlvmIrTranslatorX86_impl::_i2fm =
{X86_INS_ENTER, &Capstone2LlvmIrTranslatorX86_impl::translateEnter},
{X86_INS_EXTRACTPS, nullptr},
{X86_INS_EXTRQ, nullptr},
{X86_INS_F2XM1, nullptr},
{X86_INS_F2XM1, &Capstone2LlvmIrTranslatorX86_impl::translateF2xm1},
{X86_INS_LCALL, &Capstone2LlvmIrTranslatorX86_impl::translateLcall},
{X86_INS_LJMP, &Capstone2LlvmIrTranslatorX86_impl::translateLjmp},
{X86_INS_FBLD, nullptr},
{X86_INS_FBSTP, nullptr},
{X86_INS_FCOMPP, &Capstone2LlvmIrTranslatorX86_impl::translateFucomPop},
{X86_INS_FDECSTP, &Capstone2LlvmIrTranslatorX86_impl::translateFdecstp},
{X86_INS_FEMMS, nullptr},
{X86_INS_FFREE, nullptr},
{X86_INS_FFREE, &Capstone2LlvmIrTranslatorX86_impl::translateFfree},
{X86_INS_FICOM, &Capstone2LlvmIrTranslatorX86_impl::translateFucomPop},
{X86_INS_FICOMP, &Capstone2LlvmIrTranslatorX86_impl::translateFucomPop},
{X86_INS_FINCSTP, &Capstone2LlvmIrTranslatorX86_impl::translateFincstp},
Expand All @@ -804,10 +804,10 @@ Capstone2LlvmIrTranslatorX86_impl::_i2fm =
{X86_INS_FNINIT, &Capstone2LlvmIrTranslatorX86_impl::translateFninit},
{X86_INS_FNOP, &Capstone2LlvmIrTranslatorX86_impl::translateNop},
{X86_INS_FNSTCW, &Capstone2LlvmIrTranslatorX86_impl::translateNop},
{X86_INS_FNSTSW, nullptr},
{X86_INS_FNSTSW, &Capstone2LlvmIrTranslatorX86_impl::translateFnstsw},
{X86_INS_FPATAN, nullptr},
{X86_INS_FPREM, nullptr},
{X86_INS_FPREM1, nullptr},
{X86_INS_FPREM, &Capstone2LlvmIrTranslatorX86_impl::translateFprem},
{X86_INS_FPREM1, &Capstone2LlvmIrTranslatorX86_impl::translateFprem},
{X86_INS_FPTAN, nullptr},
{X86_INS_FFREEP, nullptr},
{X86_INS_FRNDINT, &Capstone2LlvmIrTranslatorX86_impl::translateFrndint},
Expand All @@ -823,8 +823,8 @@ Capstone2LlvmIrTranslatorX86_impl::_i2fm =
{X86_INS_FXSAVE, nullptr},
{X86_INS_FXSAVE64, nullptr},
{X86_INS_FXTRACT, nullptr},
{X86_INS_FYL2X, nullptr},
{X86_INS_FYL2XP1, nullptr},
{X86_INS_FYL2X, &Capstone2LlvmIrTranslatorX86_impl::translateFyl2x},
{X86_INS_FYL2XP1, &Capstone2LlvmIrTranslatorX86_impl::translateFyl2x},
{X86_INS_MOVAPD, nullptr},
{X86_INS_MOVAPS, nullptr},
{X86_INS_ORPD, nullptr},
Expand Down Expand Up @@ -862,7 +862,7 @@ Capstone2LlvmIrTranslatorX86_impl::_i2fm =
{X86_INS_IRET, nullptr},
{X86_INS_IRETD, nullptr},
{X86_INS_IRETQ, nullptr},
{X86_INS_FISTTP, nullptr},
{X86_INS_FISTTP, &Capstone2LlvmIrTranslatorX86_impl::translateFist},
{X86_INS_FIST, &Capstone2LlvmIrTranslatorX86_impl::translateFist},
{X86_INS_FISTP, &Capstone2LlvmIrTranslatorX86_impl::translateFist},
{X86_INS_UCOMISD, nullptr},
Expand Down
Loading