[llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.cpp X86RegisterInfo.h
Chris Lattner
lattner at cs.uiuc.edu
Sun Dec 15 14:07:01 PST 2002
Changes in directory llvm/lib/Target/X86:
X86RegisterInfo.cpp updated: 1.13 -> 1.14
X86RegisterInfo.h updated: 1.9 -> 1.10
---
Log message:
Simplify interfaces used by regalloc to insert code
---
Diffs of the changes:
Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.13 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.14
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.13 Fri Dec 13 06:00:06 2002
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp Sun Dec 15 14:06:11 2002
@@ -10,6 +10,7 @@
#include "llvm/Constants.h"
#include "llvm/Type.h"
#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineFunction.h"
// X86Regs - Turn the X86RegisterInfo.def file into a bunch of register
// descriptors
@@ -35,7 +36,7 @@
}
MachineBasicBlock::iterator
-X86RegisterInfo::storeReg2RegOffset(MachineBasicBlock *MBB,
+X86RegisterInfo::storeReg2RegOffset(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned SrcReg, unsigned DestReg,
unsigned ImmOffset, unsigned dataSize)
@@ -44,11 +45,11 @@
static const unsigned Opcode[] = { X86::MOVrm8, X86::MOVrm16, X86::MOVrm32 };
MachineInstr *MI = addRegOffset(BuildMI(Opcode[getIdx(dataSize)], 5),
DestReg, ImmOffset).addReg(SrcReg);
- return ++(MBB->insert(MBBI, MI));
+ return ++MBB.insert(MBBI, MI);
}
MachineBasicBlock::iterator
-X86RegisterInfo::loadRegOffset2Reg(MachineBasicBlock *MBB,
+X86RegisterInfo::loadRegOffset2Reg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned DestReg, unsigned SrcReg,
unsigned ImmOffset, unsigned dataSize)
@@ -57,11 +58,11 @@
static const unsigned Opcode[] = { X86::MOVmr8, X86::MOVmr16, X86::MOVmr32 };
MachineInstr *MI = addRegOffset(BuildMI(Opcode[getIdx(dataSize)], 5)
.addReg(DestReg), SrcReg, ImmOffset);
- return ++(MBB->insert(MBBI, MI));
+ return ++MBB.insert(MBBI, MI);
}
MachineBasicBlock::iterator
-X86RegisterInfo::moveReg2Reg(MachineBasicBlock *MBB,
+X86RegisterInfo::moveReg2Reg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned DestReg, unsigned SrcReg,
unsigned dataSize) const
@@ -69,11 +70,11 @@
static const unsigned Opcode[] = { X86::MOVrr8, X86::MOVrr16, X86::MOVrr32 };
MachineInstr *MI =
BuildMI(Opcode[getIdx(dataSize)], 2).addReg(DestReg).addReg(SrcReg);
- return ++(MBB->insert(MBBI, MI));
+ return ++MBB.insert(MBBI, MI);
}
MachineBasicBlock::iterator
-X86RegisterInfo::moveImm2Reg(MachineBasicBlock *MBB,
+X86RegisterInfo::moveImm2Reg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned DestReg, unsigned Imm, unsigned dataSize)
const
@@ -81,7 +82,7 @@
static const unsigned Opcode[] = { X86::MOVir8, X86::MOVir16, X86::MOVir32 };
MachineInstr *MI =
BuildMI(Opcode[getIdx(dataSize)], 2).addReg(DestReg).addReg(Imm);
- return ++(MBB->insert(MBBI, MI));
+ return ++MBB.insert(MBBI, MI);
}
@@ -106,55 +107,47 @@
return CallerSaveRegs;
}
-MachineBasicBlock::iterator
-X86RegisterInfo::emitPrologue(MachineBasicBlock *MBB,
- MachineBasicBlock::iterator MBBI,
- unsigned numBytes) const
-{
- MachineInstr *MI;
+void X86RegisterInfo::emitPrologue(MachineFunction &MF,
+ unsigned numBytes) const {
+ MachineBasicBlock &MBB = MF.front(); // Prolog goes in entry BB
+ MachineBasicBlock::iterator MBBI = MBB.begin();
// PUSH ebp
- MI = BuildMI (X86::PUSHr32, 1).addReg(X86::EBP);
- MBBI = ++(MBB->insert(MBBI, MI));
+ MachineInstr *MI = BuildMI (X86::PUSHr32, 1).addReg(X86::EBP);
+ MBBI = ++MBB.insert(MBBI, MI);
// MOV ebp, esp
MI = BuildMI (X86::MOVrr32, 2).addReg(X86::EBP).addReg(X86::ESP);
- MBBI = ++(MBB->insert(MBBI, MI));
+ MBBI = ++MBB.insert(MBBI, MI);
// adjust stack pointer
MI = BuildMI(X86::SUBri32, 2).addReg(X86::ESP).addZImm(numBytes);
- MBBI = ++(MBB->insert(MBBI, MI));
+ MBBI = ++MBB.insert(MBBI, MI);
// PUSH all callee-save registers
const unsigned* regs = getCalleeSaveRegs();
while (*regs) {
MI = BuildMI(X86::PUSHr32, 1).addReg(*regs);
- MBBI = ++(MBB->insert(MBBI, MI));
+ MBBI = ++MBB.insert(MBBI, MI);
++regs;
}
-
- return MBBI;
}
-MachineBasicBlock::iterator
-X86RegisterInfo::emitEpilogue(MachineBasicBlock *MBB,
- MachineBasicBlock::iterator MBBI,
- unsigned numBytes) const
-{
- MachineInstr *MI;
+void X86RegisterInfo::emitEpilogue(MachineBasicBlock &MBB,
+ unsigned numBytes) const {
+ MachineBasicBlock::iterator MBBI = --MBB.end();
+ assert((*MBBI)->getOpcode() == X86::RET &&
+ "Can only insert epilog into returning blocks");
// POP all callee-save registers in REVERSE ORDER
static const unsigned regs[] = { X86::EBX, X86::EDI, X86::ESI,
MRegisterInfo::NoRegister };
unsigned idx = 0;
while (regs[idx]) {
- MI = BuildMI(X86::POPr32, 1).addReg(regs[idx++]);
- MBBI = ++(MBB->insert(MBBI, MI));
+ MachineInstr *MI = BuildMI(X86::POPr32, 1).addReg(regs[idx++]);
+ MBBI = ++(MBB.insert(MBBI, MI));
}
// insert LEAVE
- MI = BuildMI(X86::LEAVE, 0);
- MBBI = ++(MBB->insert(MBBI, MI));
-
- return MBBI;
+ MBB.insert(MBBI, BuildMI(X86::LEAVE, 0));
}
Index: llvm/lib/Target/X86/X86RegisterInfo.h
diff -u llvm/lib/Target/X86/X86RegisterInfo.h:1.9 llvm/lib/Target/X86/X86RegisterInfo.h:1.10
--- llvm/lib/Target/X86/X86RegisterInfo.h:1.9 Sun Dec 15 12:40:36 2002
+++ llvm/lib/Target/X86/X86RegisterInfo.h Sun Dec 15 14:06:11 2002
@@ -18,24 +18,24 @@
MRegisterInfo::const_iterator regclass_end() const;
MachineBasicBlock::iterator
- storeReg2RegOffset(MachineBasicBlock *MBB,
+ storeReg2RegOffset(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned DestReg, unsigned SrcReg,
unsigned ImmOffset, unsigned dataSize) const;
MachineBasicBlock::iterator
- loadRegOffset2Reg(MachineBasicBlock *MBB,
+ loadRegOffset2Reg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned DestReg, unsigned SrcReg,
unsigned ImmOffset, unsigned dataSize) const;
MachineBasicBlock::iterator
- moveReg2Reg(MachineBasicBlock *MBB,
+ moveReg2Reg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned DestReg, unsigned SrcReg, unsigned dataSize) const;
MachineBasicBlock::iterator
- moveImm2Reg(MachineBasicBlock *MBB,
+ moveImm2Reg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
unsigned DestReg, unsigned Imm, unsigned dataSize) const;
@@ -45,13 +45,8 @@
const unsigned* getCalleeSaveRegs() const;
const unsigned* getCallerSaveRegs() const;
- MachineBasicBlock::iterator emitPrologue(MachineBasicBlock *MBB,
- MachineBasicBlock::iterator MBBI,
- unsigned numBytes) const;
-
- MachineBasicBlock::iterator emitEpilogue(MachineBasicBlock *MBB,
- MachineBasicBlock::iterator MBBI,
- unsigned numBytes) const;
+ void emitPrologue(MachineFunction &MF, unsigned numBytes) const;
+ void emitEpilogue(MachineBasicBlock &MBB, unsigned numBytes) const;
/// Returns register class appropriate for input SSA register
///
More information about the llvm-commits
mailing list