forked from OSchip/llvm-project
t2ldrpci_pic can be used for blockaddress as well.
llvm-svn: 86400
This commit is contained in:
parent
63ffdc748a
commit
8b5278a466
|
@ -16,6 +16,8 @@
|
|||
#include "ARMConstantPoolValue.h"
|
||||
#include "ARMGenInstrInfo.inc"
|
||||
#include "ARMMachineFunctionInfo.h"
|
||||
#include "llvm/Constants.h"
|
||||
#include "llvm/Function.h"
|
||||
#include "llvm/GlobalValue.h"
|
||||
#include "llvm/CodeGen/MachineConstantPool.h"
|
||||
#include "llvm/CodeGen/MachineFrameInfo.h"
|
||||
|
@ -290,10 +292,19 @@ void Thumb1InstrInfo::reMaterialize(MachineBasicBlock &MBB,
|
|||
"Expecting a machine constantpool entry!");
|
||||
ARMConstantPoolValue *ACPV =
|
||||
static_cast<ARMConstantPoolValue*>(MCPE.Val.MachineCPVal);
|
||||
assert(ACPV->isGlobalValue() && "Expecting a GV!");
|
||||
unsigned PCLabelId = AFI->createConstPoolEntryUId();
|
||||
ARMConstantPoolValue *NewCPV =
|
||||
new ARMConstantPoolValue(ACPV->getGV(), PCLabelId, ARMCP::CPValue, 4);
|
||||
ARMConstantPoolValue *NewCPV = 0;
|
||||
if (ACPV->isGlobalValue())
|
||||
NewCPV = new ARMConstantPoolValue(ACPV->getGV(), PCLabelId,
|
||||
ARMCP::CPValue, 4);
|
||||
else if (ACPV->isExtSymbol())
|
||||
NewCPV = new ARMConstantPoolValue(MF.getFunction()->getContext(),
|
||||
ACPV->getSymbol(), PCLabelId, 4);
|
||||
else if (ACPV->isBlockAddress())
|
||||
NewCPV = new ARMConstantPoolValue(ACPV->getBlockAddress(), PCLabelId,
|
||||
ARMCP::CPBlockAddress, 4);
|
||||
else
|
||||
llvm_unreachable("Unexpected ARM constantpool value type!!");
|
||||
CPI = MCP->getConstantPoolIndex(NewCPV, MCPE.getAlignment());
|
||||
MachineInstrBuilder MIB = BuildMI(MBB, I, Orig->getDebugLoc(), get(Opcode),
|
||||
DestReg)
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
#include "ARMAddressingModes.h"
|
||||
#include "ARMGenInstrInfo.inc"
|
||||
#include "ARMMachineFunctionInfo.h"
|
||||
#include "llvm/Constants.h"
|
||||
#include "llvm/Function.h"
|
||||
#include "llvm/GlobalValue.h"
|
||||
#include "llvm/CodeGen/MachineConstantPool.h"
|
||||
#include "llvm/CodeGen/MachineFrameInfo.h"
|
||||
|
@ -158,10 +160,19 @@ void Thumb2InstrInfo::reMaterialize(MachineBasicBlock &MBB,
|
|||
"Expecting a machine constantpool entry!");
|
||||
ARMConstantPoolValue *ACPV =
|
||||
static_cast<ARMConstantPoolValue*>(MCPE.Val.MachineCPVal);
|
||||
assert(ACPV->isGlobalValue() && "Expecting a GV!");
|
||||
unsigned PCLabelId = AFI->createConstPoolEntryUId();
|
||||
ARMConstantPoolValue *NewCPV =
|
||||
new ARMConstantPoolValue(ACPV->getGV(), PCLabelId, ARMCP::CPValue, 4);
|
||||
ARMConstantPoolValue *NewCPV = 0;
|
||||
if (ACPV->isGlobalValue())
|
||||
NewCPV = new ARMConstantPoolValue(ACPV->getGV(), PCLabelId,
|
||||
ARMCP::CPValue, 4);
|
||||
else if (ACPV->isExtSymbol())
|
||||
NewCPV = new ARMConstantPoolValue(MF.getFunction()->getContext(),
|
||||
ACPV->getSymbol(), PCLabelId, 4);
|
||||
else if (ACPV->isBlockAddress())
|
||||
NewCPV = new ARMConstantPoolValue(ACPV->getBlockAddress(), PCLabelId,
|
||||
ARMCP::CPBlockAddress, 4);
|
||||
else
|
||||
llvm_unreachable("Unexpected ARM constantpool value type!!");
|
||||
CPI = MCP->getConstantPoolIndex(NewCPV, MCPE.getAlignment());
|
||||
MachineInstrBuilder MIB = BuildMI(MBB, I, Orig->getDebugLoc(), get(Opcode),
|
||||
DestReg)
|
||||
|
|
Loading…
Reference in New Issue