diff options
| author | Misha Brukman <brukman+llvm@gmail.com> | 2004-06-28 18:20:59 +0000 |
|---|---|---|
| committer | Misha Brukman <brukman+llvm@gmail.com> | 2004-06-28 18:20:59 +0000 |
| commit | 2f0cda8b2a1d50a9530c07236d8dd5ac98f6ec34 (patch) | |
| tree | be9ed39e9d2304b1d32db23b2bca6a1a9e2f1944 | |
| parent | 75985d725c2e3a28430d71a1c139834f71d4c38d (diff) | |
| download | bcm5719-llvm-2f0cda8b2a1d50a9530c07236d8dd5ac98f6ec34.tar.gz bcm5719-llvm-2f0cda8b2a1d50a9530c07236d8dd5ac98f6ec34.zip | |
Fix loading and storing PC-relative static variables, courtesy of Nate Begeman.
llvm-svn: 14468
| -rw-r--r-- | llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp | 13 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/PowerPCISelSimple.cpp | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp b/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp index 4302beb79b3..6d7b585106d 100644 --- a/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp +++ b/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp @@ -365,10 +365,19 @@ unsigned ISel::getReg(Value *V, MachineBasicBlock *MBB, copyConstantToRegister(MBB, IPt, C, Reg); return Reg; } else if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) { + // GV is located at PC + distance + unsigned LRsave = makeAnotherReg(Type::IntTy); + unsigned CurPC = makeAnotherReg(Type::IntTy); unsigned Reg1 = makeAnotherReg(V->getType()); unsigned Reg2 = makeAnotherReg(V->getType()); - // Move the address of the global into the register - BuildMI(*MBB, IPt, PPC32::LOADHiAddr, 2, Reg1).addReg(PPC32::R0) + // Save the old LR + BuildMI(*MBB, IPt, PPC32::MFLR, 0, LRsave); + // Move PC to destination reg + BuildMI(*MBB, IPt, PPC32::MovePCtoLR, 0, CurPC); + // Restore the old LR + BuildMI(*MBB, IPt, PPC32::MTLR, 1).addReg(LRsave); + // Move value at PC + distance into return reg + BuildMI(*MBB, IPt, PPC32::LOADHiAddr, 2, Reg1).addReg(CurPC) .addGlobalAddress(GV); BuildMI(*MBB, IPt, PPC32::LOADLoAddr, 2, Reg2).addReg(Reg1) .addGlobalAddress(GV); diff --git a/llvm/lib/Target/PowerPC/PowerPCISelSimple.cpp b/llvm/lib/Target/PowerPC/PowerPCISelSimple.cpp index 4302beb79b3..6d7b585106d 100644 --- a/llvm/lib/Target/PowerPC/PowerPCISelSimple.cpp +++ b/llvm/lib/Target/PowerPC/PowerPCISelSimple.cpp @@ -365,10 +365,19 @@ unsigned ISel::getReg(Value *V, MachineBasicBlock *MBB, copyConstantToRegister(MBB, IPt, C, Reg); return Reg; } else if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) { + // GV is located at PC + distance + unsigned LRsave = makeAnotherReg(Type::IntTy); + unsigned CurPC = makeAnotherReg(Type::IntTy); unsigned Reg1 = makeAnotherReg(V->getType()); unsigned Reg2 = makeAnotherReg(V->getType()); - // Move the address of the global into the register - BuildMI(*MBB, IPt, PPC32::LOADHiAddr, 2, Reg1).addReg(PPC32::R0) + // Save the old LR + BuildMI(*MBB, IPt, PPC32::MFLR, 0, LRsave); + // Move PC to destination reg + BuildMI(*MBB, IPt, PPC32::MovePCtoLR, 0, CurPC); + // Restore the old LR + BuildMI(*MBB, IPt, PPC32::MTLR, 1).addReg(LRsave); + // Move value at PC + distance into return reg + BuildMI(*MBB, IPt, PPC32::LOADHiAddr, 2, Reg1).addReg(CurPC) .addGlobalAddress(GV); BuildMI(*MBB, IPt, PPC32::LOADLoAddr, 2, Reg2).addReg(Reg1) .addGlobalAddress(GV); |
