mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

interface_x64: Amend LLVM disassembly code

Browse source 
This would previously attempt to perform pointer arithmetic on void pointers,
which would cause compilation errors.
This commit is contained in:
Lioncash 2017-03-06 18:29:36 -05:00 committed by Merry
parent d0efbb9348
commit d85137ed65
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/backend_x64/interface_x64.cpp
View file

@ -58,20 +58,21 @@ struct Jit::Impl {
std::string result = fmt::format("address: {}\nsize: {} bytes\n", block.code_ptr, block.size);
#ifdef DYNARMIC_USE_LLVM
CodePtr end = block.code_ptr + block.size;
size_t remaining = block.size;
LLVMInitializeX86TargetInfo();
LLVMInitializeX86TargetMC();
LLVMInitializeX86Disassembler();
LLVMDisasmContextRef llvm_ctx = LLVMCreateDisasm("x86_64", nullptr, 0, nullptr, nullptr);
LLVMSetDisasmOptions(llvm_ctx, LLVMDisassembler_Option_AsmPrinterVariant);
for (CodePtr pos = block.code_ptr; pos < end;) {
const u8* pos = static_cast<const u8*>(block.code_ptr);
const u8* end = pos + block.size;
size_t remaining = block.size;
while (pos < end) {
char buffer[80];
size_t inst_size = LLVMDisasmInstruction(llvm_ctx, const_cast<u8*>(pos), remaining, (u64)pos, buffer, sizeof(buffer));
ASSERT(inst_size);
for (CodePtr i = pos; i < pos + inst_size; i++)
for (const u8* i = pos; i < pos + inst_size; i++)
result += fmt::format("{:02x} ", *i);
for (size_t i = inst_size; i < 10; i++)
result += " ";