diff options
| author | Akira Hatanaka <ahatanaka@mips.com> | 2011-11-15 18:44:44 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@mips.com> | 2011-11-15 18:44:44 +0000 |
| commit | ac20aad81c8444b3f3901d805d62627df5b8cacc (patch) | |
| tree | b6f59df3f3f470dddc6164701300b0e0edf978d4 /lib/Target/Mips/MipsFrameLowering.cpp | |
| parent | 160408546cce8243ea5d8e2e447eeafcf94539af (diff) | |
| download | llvm-ac20aad81c8444b3f3901d805d62627df5b8cacc.tar.gz llvm-ac20aad81c8444b3f3901d805d62627df5b8cacc.tar.bz2 llvm-ac20aad81c8444b3f3901d805d62627df5b8cacc.tar.xz | |
Set nomacro before emitting the sequence of instructions that set global pointer
register.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144665 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Mips/MipsFrameLowering.cpp')
| -rw-r--r-- | lib/Target/Mips/MipsFrameLowering.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Target/Mips/MipsFrameLowering.cpp b/lib/Target/Mips/MipsFrameLowering.cpp index 19bb1a55e6..4e977e9080 100644 --- a/lib/Target/Mips/MipsFrameLowering.cpp +++ b/lib/Target/Mips/MipsFrameLowering.cpp @@ -169,13 +169,14 @@ void MipsFrameLowering::emitPrologue(MachineFunction &MF) const { MFI->setStackSize(StackSize); BuildMI(MBB, MBBI, dl, TII.get(Mips::NOREORDER)); + BuildMI(MBB, MBBI, dl, TII.get(Mips::NOMACRO)); // Emit instructions that set $gp using the the value of $t9. // O32 uses the directive .cpload while N32/64 requires three instructions to // do this. // TODO: Do not emit these instructions if no instructions use $gp. if (isPIC && STI.isABI_O32()) - BuildMI(MBB, MBBI, dl, TII.get(Mips::CPLOAD)) + BuildMI(MBB, llvm::prior(MBBI), dl, TII.get(Mips::CPLOAD)) .addReg(RegInfo->getPICCallReg()); else if (STI.isABI_N64() || (isPIC && STI.isABI_N32())) { // lui $28,%hi(%neg(%gp_rel(fname))) @@ -189,8 +190,6 @@ void MipsFrameLowering::emitPrologue(MachineFunction &MF) const { .addGlobalAddress(FName, 0, MipsII::MO_GPOFF_LO); } - BuildMI(MBB, MBBI, dl, TII.get(Mips::NOMACRO)); - // No need to allocate space on the stack. if (StackSize == 0 && !MFI->adjustsStack()) return; |