mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-17 05:29:24 +00:00
Revert r56675 - it breaks unwinding runtime everywhere.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57048 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
c8a07733d3
commit
c4e8bec703
@ -1833,49 +1833,39 @@ void X86InstrInfo::loadRegFromAddr(MachineFunction &MF, unsigned DestReg,
|
||||
}
|
||||
|
||||
bool X86InstrInfo::spillCalleeSavedRegisters(MachineBasicBlock &MBB,
|
||||
MachineBasicBlock::iterator MI,
|
||||
MachineBasicBlock::iterator MI,
|
||||
const std::vector<CalleeSavedInfo> &CSI) const {
|
||||
if (CSI.empty())
|
||||
return false;
|
||||
|
||||
MachineFunction &MF = *MBB.getParent();
|
||||
bool is64Bit = TM.getSubtarget<X86Subtarget>().is64Bit();
|
||||
unsigned FrameReg = is64Bit ? X86::RBP : X86::EBP;
|
||||
unsigned SlotSize = is64Bit ? 8 : 4;
|
||||
|
||||
MachineFunction &MF = *MBB.getParent();
|
||||
X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
|
||||
X86FI->setCalleeSavedFrameSize(CSI.size() * SlotSize);
|
||||
|
||||
unsigned Opc = is64Bit ? X86::PUSH64r : X86::PUSH32r;
|
||||
unsigned CSSize = 0;
|
||||
for (unsigned i = CSI.size(); i != 0; --i) {
|
||||
unsigned Reg = CSI[i-1].getReg();
|
||||
if (Reg == FrameReg && RI.hasFP(MF))
|
||||
// It will be saved as part of the prologue.
|
||||
continue;
|
||||
// Add the callee-saved register as live-in. It's killed at the spill.
|
||||
MBB.addLiveIn(Reg);
|
||||
BuildMI(MBB, MI, get(Opc)).addReg(Reg);
|
||||
++CSSize;
|
||||
}
|
||||
|
||||
X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
|
||||
unsigned SlotSize = is64Bit ? 8 : 4;
|
||||
X86FI->setCalleeSavedFrameSize(CSSize * SlotSize);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool X86InstrInfo::restoreCalleeSavedRegisters(MachineBasicBlock &MBB,
|
||||
MachineBasicBlock::iterator MI,
|
||||
MachineBasicBlock::iterator MI,
|
||||
const std::vector<CalleeSavedInfo> &CSI) const {
|
||||
if (CSI.empty())
|
||||
return false;
|
||||
|
||||
MachineFunction &MF = *MBB.getParent();
|
||||
bool is64Bit = TM.getSubtarget<X86Subtarget>().is64Bit();
|
||||
unsigned FrameReg = is64Bit ? X86::RBP : X86::EBP;
|
||||
|
||||
unsigned Opc = is64Bit ? X86::POP64r : X86::POP32r;
|
||||
for (unsigned i = 0, e = CSI.size(); i != e; ++i) {
|
||||
unsigned Reg = CSI[i].getReg();
|
||||
if (Reg == FrameReg && RI.hasFP(MF))
|
||||
// It will be restored as part of the epilogue.
|
||||
continue;
|
||||
BuildMI(MBB, MI, get(Opc), Reg);
|
||||
}
|
||||
return true;
|
||||
|
@ -1,5 +1,5 @@
|
||||
; Check that eh_return & unwind_init were properly lowered
|
||||
; RUN: llvm-as < %s | llc | grep %ebp | count 7
|
||||
; RUN: llvm-as < %s | llc | grep %ebp | count 9
|
||||
; RUN: llvm-as < %s | llc | grep %ecx | count 5
|
||||
|
||||
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
|
||||
|
@ -1,5 +1,5 @@
|
||||
; Check that eh_return & unwind_init were properly lowered
|
||||
; RUN: llvm-as < %s | llc | grep %rbp | count 5
|
||||
; RUN: llvm-as < %s | llc | grep %rbp | count 7
|
||||
; RUN: llvm-as < %s | llc | grep %rcx | count 3
|
||||
|
||||
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
|
||||
|
Loading…
Reference in New Issue
Block a user