6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-12 03:32:10 +00:00
Code Issues Projects Releases Wiki Activity

[Objdump] Pass the correct subtarget to printInst.

Browse Source 
This fixes a bug I introduced in r233411.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233484 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Akira Hatanaka 2015-03-28 20:44:05 +00:00
parent 2eaf50f5fb
commit 0de206d8d6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/tools/llvm-objdump/AArch64/Inputs/print-mrs.obj.macho-aarch64 Normal file
View File

Binary file not shown.

3
test/tools/llvm-objdump/AArch64/macho-print-mrs.test Normal file
View File

@ -0,0 +1,3 @@
RUN: llvm-objdump -d -m -no-show-raw-insn %p/Inputs/print-mrs.obj.macho-aarch64 | FileCheck %s
CHECK: 0: mrs x0, S3_7_C15_C2_0

4
tools/llvm-objdump/MachODump.cpp
View File

@ -3349,7 +3349,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
if (isThumb) if (isThumb)
ThumbIP->printInst(&Inst, FormattedOS, AnnotationsStr, *ThumbSTI); ThumbIP->printInst(&Inst, FormattedOS, AnnotationsStr, *ThumbSTI);
else else
IP->printInst(&Inst, FormattedOS, AnnotationsStr, *ThumbSTI); IP->printInst(&Inst, FormattedOS, AnnotationsStr, *STI);
emitComments(CommentStream, CommentsToEmit, FormattedOS, *AsmInfo); emitComments(CommentStream, CommentsToEmit, FormattedOS, *AsmInfo);
// Print debug info. // Print debug info.
@ -3408,7 +3408,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
outs() << "\t"; outs() << "\t";
DumpBytes(ArrayRef<uint8_t>(Bytes.data() + Index, InstSize)); DumpBytes(ArrayRef<uint8_t>(Bytes.data() + Index, InstSize));
} }
IP->printInst(&Inst, outs(), "", *ThumbSTI); IP->printInst(&Inst, outs(), "", *STI);
outs() << "\n"; outs() << "\n";
} else { } else {
unsigned int Arch = MachOOF->getArch(); unsigned int Arch = MachOOF->getArch();