6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-29 13:24:25 +00:00
Code Issues Projects Releases Wiki Activity

AsmPrinter::doFinalization is at the module level and so doesn't

Browse Source 
have access to a target specific subtarget info. Grab the module
level MCSubtargetInfo for the JumpInstrTable output stubs.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229974 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher
2015-02-20 06:59:48 +00:00
parent 4dedd90c76
commit 02a610a9a9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -44,6 +44,7 @@
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Format.h" #include "llvm/Support/Format.h"
#include "llvm/Support/MathExtras.h" #include "llvm/Support/MathExtras.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/Timer.h" #include "llvm/Support/Timer.h"
#include "llvm/Target/TargetFrameLowering.h" #include "llvm/Target/TargetFrameLowering.h"
#include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetInstrInfo.h"
@ -911,6 +912,10 @@ bool AsmPrinter::doFinalization(Module &M) {
JumpInstrTableInfo *JITI = getAnalysisIfAvailable<JumpInstrTableInfo>(); JumpInstrTableInfo *JITI = getAnalysisIfAvailable<JumpInstrTableInfo>();
if (JITI && !JITI->getTables().empty()) { if (JITI && !JITI->getTables().empty()) {
// Since we're at the module level we can't use a function specific
// MCSubtargetInfo - instead create one with the module defaults.
std::unique_ptr<MCSubtargetInfo> STI(TM.getTarget().createMCSubtargetInfo(
TM.getTargetTriple(), TM.getTargetCPU(), TM.getTargetFeatureString()));
unsigned Arch = Triple(getTargetTriple()).getArch(); unsigned Arch = Triple(getTargetTriple()).getArch();
bool IsThumb = (Arch == Triple::thumb || Arch == Triple::thumbeb); bool IsThumb = (Arch == Triple::thumb || Arch == Triple::thumbeb);
const TargetInstrInfo *TII = TM.getSubtargetImpl()->getInstrInfo(); const TargetInstrInfo *TII = TM.getSubtargetImpl()->getInstrInfo();
@ -942,7 +947,7 @@ bool AsmPrinter::doFinalization(Module &M) {
MCSymbolRefExpr::Create(TargetSymbol, MCSymbolRefExpr::VK_PLT, MCSymbolRefExpr::Create(TargetSymbol, MCSymbolRefExpr::VK_PLT,
OutContext); OutContext);
TII->getUnconditionalBranch(JumpToFun, TargetSymRef); TII->getUnconditionalBranch(JumpToFun, TargetSymRef);
OutStreamer.EmitInstruction(JumpToFun, getSubtargetInfo()); OutStreamer.EmitInstruction(JumpToFun, *STI);
++Count; ++Count;
} }
@ -950,7 +955,7 @@ bool AsmPrinter::doFinalization(Module &M) {
uint64_t Remaining = NextPowerOf2(Count) - Count; uint64_t Remaining = NextPowerOf2(Count) - Count;
for (uint64_t C = 0; C < Remaining; ++C) { for (uint64_t C = 0; C < Remaining; ++C) {
EmitAlignment(LogAlignment); EmitAlignment(LogAlignment);
OutStreamer.EmitInstruction(TrapInst, getSubtargetInfo()); OutStreamer.EmitInstruction(TrapInst, *STI);
} }
} }