mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 20:32:21 +00:00
Fix a regression on the disassembling C API.
The fix is easy. Unfortunately, we had 0 tests, so adding one was somewhat complicated. Thanks to Kevin Enderby for the report. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221899 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
511fa66c69
commit
961f1bb09e
@ -253,7 +253,7 @@ size_t LLVMDisasmInstruction(LLVMDisasmContextRef DCR, uint8_t *Bytes,
|
||||
MCDisassembler::DecodeStatus S;
|
||||
SmallVector<char, 64> InsnStr;
|
||||
raw_svector_ostream Annotations(InsnStr);
|
||||
S = DisAsm->getInstruction(Inst, Size, Data, 0,
|
||||
S = DisAsm->getInstruction(Inst, Size, Data, PC,
|
||||
/*REMOVE*/ nulls(), Annotations);
|
||||
switch (S) {
|
||||
case MCDisassembler::Fail:
|
||||
|
@ -1,9 +1,12 @@
|
||||
set(LLVM_LINK_COMPONENTS
|
||||
${LLVM_TARGETS_TO_BUILD}
|
||||
MC
|
||||
MCDisassembler
|
||||
Support
|
||||
)
|
||||
|
||||
add_llvm_unittest(MCTests
|
||||
Disassembler.cpp
|
||||
StringTableBuilderTest.cpp
|
||||
YAMLTest.cpp
|
||||
)
|
||||
|
62
unittests/MC/Disassembler.cpp
Normal file
62
unittests/MC/Disassembler.cpp
Normal file
@ -0,0 +1,62 @@
|
||||
//===- llvm/unittest/Object/Disassembler.cpp ------------------------------===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm-c/Disassembler.h"
|
||||
#include "llvm/Support/TargetSelect.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
using namespace llvm;
|
||||
|
||||
static const char *symbolLookupCallback(void *DisInfo, uint64_t ReferenceValue,
|
||||
uint64_t *ReferenceType,
|
||||
uint64_t ReferencePC,
|
||||
const char **ReferenceName) {
|
||||
*ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
TEST(Disassembler, Test1) {
|
||||
llvm::InitializeAllTargetInfos();
|
||||
llvm::InitializeAllTargetMCs();
|
||||
llvm::InitializeAllDisassemblers();
|
||||
|
||||
uint8_t Bytes[] = {0x90, 0x90, 0xeb, 0xfd};
|
||||
uint8_t *BytesP = Bytes;
|
||||
const char OutStringSize = 100;
|
||||
char OutString[OutStringSize];
|
||||
LLVMDisasmContextRef DCR = LLVMCreateDisasm("x86_64-pc-linux", nullptr, 0,
|
||||
nullptr, symbolLookupCallback);
|
||||
if (!DCR)
|
||||
return;
|
||||
|
||||
size_t InstSize;
|
||||
unsigned NumBytes = sizeof(Bytes);
|
||||
unsigned PC = 0;
|
||||
|
||||
InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
|
||||
OutStringSize);
|
||||
EXPECT_EQ(InstSize, 1U);
|
||||
EXPECT_EQ(StringRef(OutString), "\tnop");
|
||||
PC += InstSize;
|
||||
BytesP += InstSize;
|
||||
NumBytes -= InstSize;
|
||||
|
||||
InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
|
||||
OutStringSize);
|
||||
EXPECT_EQ(InstSize, 1U);
|
||||
EXPECT_EQ(StringRef(OutString), "\tnop");
|
||||
PC += InstSize;
|
||||
BytesP += InstSize;
|
||||
NumBytes -= InstSize;
|
||||
|
||||
InstSize = LLVMDisasmInstruction(DCR, BytesP, NumBytes, PC, OutString,
|
||||
OutStringSize);
|
||||
EXPECT_EQ(InstSize, 2U);
|
||||
EXPECT_EQ(StringRef(OutString), "\tjmp\t0x1");
|
||||
}
|
Loading…
Reference in New Issue
Block a user