Skip to content

Fixes for LLVM 13/14 compatibility #1395

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 1 commit into from
Jan 10, 2022
Merged

Fixes for LLVM 13/14 compatibility #1395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions lib/bap_llvm/llvm_disasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@
#include <llvm/MC/MCRegisterInfo.h>
#include <llvm/Support/DataTypes.h>
#include <llvm/Support/FormattedStream.h>
#include <llvm/Support/TargetRegistry.h>
#include <llvm/Support/CommandLine.h>
#if LLVM_VERSION_MAJOR >= 12
#include <llvm/Support/Process.h>
#include <llvm/Support/StringSaver.h>
#endif
#include <llvm-c/Target.h>

#if LLVM_VERSION_MAJOR >= 14
#include <llvm/MC/TargetRegistry.h>
#else
#include <llvm/Support/TargetRegistry.h>
#endif

#if LLVM_VERSION_MAJOR >= 10
#include "llvm/MC/MCTargetOptions.h"
#endif
Expand Down Expand Up @@ -258,8 +263,11 @@ class llvm_disassembler : public disassembler_interface {
}

shared_ptr<llvm::MCContext> ctx
#if LLVM_VERSION_MAJOR >= 13
(new llvm::MCContext(t, &*asm_info, &*reg_info, 0));
#else
(new llvm::MCContext(&*asm_info, &*reg_info, 0));

#endif
if (!ctx) {
if (debug_level > 0)
output_error(triple, cpu, "failed to create disassembly context");
Expand Down Expand Up @@ -522,11 +530,19 @@ class llvm_disassembler : public disassembler_interface {
op.imm_val = mcop.getImm();
return op;
}
#if LLVM_VERSION_MAJOR >= 13
if (mcop.isDFPImm()) {
op.type = bap_disasm_op_fmm;
op.fmm_val = bit_cast<double>(mcop.getDFPImm());
return op;
}
#else
if (mcop.isFPImm()) {
op.type = bap_disasm_op_fmm;
op.fmm_val = mcop.getFPImm();
return op;
}
#endif
if (mcop.isInst()) {
std::cerr << "got subinst\n";
abort();
Expand Down