[llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.cpp X86RegisterInfo.h

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86RegisterInfo.cpp updated: 1.45 -> 1.46
X86RegisterInfo.h updated: 1.20 -> 1.21

---
Log message:

The prologue/epilogue related method calls have no reason to return a value,
make them return void.

This allows us to avoid some costly MBB.size() calls



---
Diffs of the changes:  (+23 -33)

Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.45 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.46
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.45	Sat Feb 14 00:00:36 2004
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Sat Feb 14 13:49:54 2004
@@ -25,7 +25,6 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "Support/CommandLine.h"
 #include "Support/STLExtras.h"
-
 using namespace llvm;
 
 namespace {
@@ -92,14 +91,14 @@
   return NoFPElim || MF.getFrameInfo()->hasVarSizedObjects();
 }
 
-int X86RegisterInfo::eliminateCallFramePseudoInstr(MachineFunction &MF,
-                                                   MachineBasicBlock &MBB,
-                                                   MachineBasicBlock::iterator I) const {
-  MachineInstr *New = 0, *Old = I;
+void X86RegisterInfo::
+eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                              MachineBasicBlock::iterator I) const {
   if (hasFP(MF)) {
     // If we have a frame pointer, turn the adjcallstackup instruction into a
     // 'sub ESP, <amt>' and the adjcallstackdown instruction into 'add ESP,
     // <amt>'
+    MachineInstr *Old = I;
     unsigned Amount = Old->getOperand(0).getImmedValue();
     if (Amount != 0) {
       // We need to keep the stack aligned properly.  To do this, we round the
@@ -108,26 +107,23 @@
       unsigned Align = MF.getTarget().getFrameInfo().getStackAlignment();
       Amount = (Amount+Align-1)/Align*Align;
 
+      MachineInstr *New;
       if (Old->getOpcode() == X86::ADJCALLSTACKDOWN) {
 	New=BuildMI(X86::SUBri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(Amount);
       } else {
 	assert(Old->getOpcode() == X86::ADJCALLSTACKUP);
 	New=BuildMI(X86::ADDri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(Amount);
       }
+
+      // Replace the pseudo instruction with a new instruction...
+      MBB.insert(I, New);
     }
   }
 
-  if (New) {
-    // Replace the pseudo instruction with a new instruction...
-    MBB.insert(MBB.erase(I), New);
-    return 0;
-  } else {
-    MBB.erase(I);
-    return -1;
-  }
+  MBB.erase(I);
 }
 
-int X86RegisterInfo::eliminateFrameIndex(MachineFunction &MF,
+void X86RegisterInfo::eliminateFrameIndex(MachineFunction &MF,
                                          MachineBasicBlock::iterator II) const {
   unsigned i = 0;
   MachineInstr &MI = *II;
@@ -150,27 +146,24 @@
     Offset += MF.getFrameInfo()->getStackSize();
 
   MI.SetMachineOperandConst(i+3, MachineOperand::MO_SignExtendedImmed, Offset);
-  return 0;
 }
 
-int X86RegisterInfo::processFunctionBeforeFrameFinalized(MachineFunction &MF)
-  const {
+void
+X86RegisterInfo::processFunctionBeforeFrameFinalized(MachineFunction &MF) const{
   if (hasFP(MF)) {
     // Create a frame entry for the EBP register that must be saved.
     int FrameIdx = MF.getFrameInfo()->CreateStackObject(4, 4);
     assert(FrameIdx == MF.getFrameInfo()->getObjectIndexEnd()-1 &&
 	   "Slot for EBP register must be last in order to be found!");
   }
-  return 0;
 }
 
-int X86RegisterInfo::emitPrologue(MachineFunction &MF) const {
+void X86RegisterInfo::emitPrologue(MachineFunction &MF) const {
   MachineBasicBlock &MBB = MF.front();   // Prolog goes in entry BB
   MachineBasicBlock::iterator MBBI = MBB.begin();
   MachineFrameInfo *MFI = MF.getFrameInfo();
   MachineInstr *MI;
 
-  unsigned oldSize = MBB.size();
   // Get the number of bytes to allocate from the FrameInfo
   unsigned NumBytes = MFI->getStackSize();
   if (hasFP(MF)) {
@@ -217,12 +210,10 @@
       MBB.insert(MBBI, MI);
     }
   }
-  return MBB.size() - oldSize;
 }
 
-int X86RegisterInfo::emitEpilogue(MachineFunction &MF,
-                                  MachineBasicBlock &MBB) const {
-  unsigned oldSize = MBB.size();
+void X86RegisterInfo::emitEpilogue(MachineFunction &MF,
+                                   MachineBasicBlock &MBB) const {
   const MachineFrameInfo *MFI = MF.getFrameInfo();
   MachineBasicBlock::iterator MBBI = prior(MBB.end());
   MachineInstr *MI;
@@ -250,7 +241,6 @@
       MBB.insert(MBBI, MI);
     }
   }
-  return MBB.size() - oldSize;
 }
 
 #include "X86GenRegisterInfo.inc"


Index: llvm/lib/Target/X86/X86RegisterInfo.h
diff -u llvm/lib/Target/X86/X86RegisterInfo.h:1.20 llvm/lib/Target/X86/X86RegisterInfo.h:1.21
--- llvm/lib/Target/X86/X86RegisterInfo.h:1.20	Thu Feb 12 02:10:44 2004
+++ llvm/lib/Target/X86/X86RegisterInfo.h	Sat Feb 14 13:49:54 2004
@@ -42,17 +42,17 @@
 		   unsigned DestReg, unsigned SrcReg,
 		   const TargetRegisterClass *RC) const;
 
-  int eliminateCallFramePseudoInstr(MachineFunction &MF,
-                                    MachineBasicBlock &MBB,
-                                    MachineBasicBlock::iterator MI) const;
+  void eliminateCallFramePseudoInstr(MachineFunction &MF,
+                                     MachineBasicBlock &MBB,
+                                     MachineBasicBlock::iterator MI) const;
 
-  int eliminateFrameIndex(MachineFunction &MF,
-                          MachineBasicBlock::iterator MI) const;
+  void eliminateFrameIndex(MachineFunction &MF,
+                           MachineBasicBlock::iterator MI) const;
 
-  int processFunctionBeforeFrameFinalized(MachineFunction &MF) const;
+  void processFunctionBeforeFrameFinalized(MachineFunction &MF) const;
 
-  int emitPrologue(MachineFunction &MF) const;
-  int emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const;
+  void emitPrologue(MachineFunction &MF) const;
+  void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const;
 };
 
 } // End llvm namespace