[llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp SparcV9PrologEpilogInserter.cpp SparcV9BurgISel.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/SparcV9:

SparcV9RegInfo.cpp updated: 1.133 -> 1.134
SparcV9PrologEpilogInserter.cpp updated: 1.42 -> 1.43
SparcV9BurgISel.cpp updated: 1.4 -> 1.5
---
Log message:

Instead of a virtual method call, lets try a direct constant reference


---
Diffs of the changes:  (+8 -7)

Index: llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.133 llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.134
--- llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp:1.133	Wed Aug  4 02:29:53 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegInfo.cpp	Thu Aug 12 13:29:05 2004
@@ -25,6 +25,7 @@
 #include "SparcV9Internals.h"
 #include "SparcV9RegClassInfo.h"
 #include "SparcV9RegInfo.h"
+#include "SparcV9FrameInfo.h"
 #include "SparcV9TargetMachine.h"
 #include "SparcV9TmpInstr.h"
 #include <iostream>
@@ -492,7 +493,7 @@
         // a full double-word so the offset does not need to be adjusted.
         if (regType == FPSingleRegType) {
           unsigned argSize = target.getTargetData().getTypeSize(LR->getType());
-          unsigned slotSize = frameInfo.getSizeOfEachArgOnStack();
+          unsigned slotSize = SparcV9FrameInfo::SizeOfEachArgOnStack;
           assert(argSize <= slotSize && "Insufficient slot size!");
           offsetFromFP += slotSize - argSize;
         }
@@ -550,7 +551,7 @@
         // a full double-word so the offset does not need to be adjusted.
         if (regType == FPSingleRegType) {
           unsigned argSize = target.getTargetData().getTypeSize(LR->getType());
-          unsigned slotSize = frameInfo.getSizeOfEachArgOnStack();
+          unsigned slotSize = SparcV9FrameInfo::SizeOfEachArgOnStack;
           assert(argSize <= slotSize && "Insufficient slot size!");
           offsetFromFP += slotSize - argSize;
         }


Index: llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp:1.42 llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp:1.43
--- llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp:1.42	Thu Aug 12 13:20:55 2004
+++ llvm/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp	Thu Aug 12 13:29:05 2004
@@ -58,8 +58,8 @@
 
   unsigned staticStackSize = MF.getInfo()->getStaticStackSize();
 
-  if (staticStackSize < (unsigned) frameInfo.getMinStackFrameSize())
-    staticStackSize = (unsigned) frameInfo.getMinStackFrameSize();
+  if (staticStackSize < SparcV9FrameInfo::MinStackFrameSize)
+    staticStackSize = SparcV9FrameInfo::MinStackFrameSize;
   if (unsigned padsz = staticStackSize % 
                        SparcV9FrameInfo::StackFrameSizeAlignment)
     staticStackSize += SparcV9FrameInfo::StackFrameSizeAlignment - padsz;


Index: llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.4 llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.5
--- llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.4	Thu Aug 12 13:20:41 2004
+++ llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp	Thu Aug 12 13:29:05 2004
@@ -2575,7 +2575,7 @@
                                                                 paddedSize,
                                                          tsize * numElements);
 
-  if (((int)paddedSize) > 8 * target.getFrameInfo()->getSizeOfEachArgOnStack()||
+  if (((int)paddedSize) > 8 * SparcV9FrameInfo::SizeOfEachArgOnStack ||
       !target.getInstrInfo()->constantFitsInImmedField(V9::LDXi,offsetFromFP)) {
     CreateCodeForVariableSizeAlloca(target, result, tsize, 
 				    ConstantSInt::get(Type::IntTy,numElements),
@@ -3992,7 +3992,7 @@
               // not need to be adjusted.
               int argOffset = frameInfo.getOutgoingArgOffset(MF, argNo);
               if (argType->isFloatingPoint()) {
-                unsigned slotSize = frameInfo.getSizeOfEachArgOnStack();
+                unsigned slotSize = SparcV9FrameInfo::SizeOfEachArgOnStack;
                 assert(argSize <= slotSize && "Insufficient slot size!");
                 argOffset += slotSize - argSize;
               }
@@ -4132,7 +4132,7 @@
         Instruction* vaNextI = subtreeRoot->getInstruction();
         assert(target.getTargetData().getTypeSize(vaNextI->getType()) <= 8 &&
                "We assumed that all LLVM parameter types <= 8 bytes!");
-        int argSize = target.getFrameInfo()->getSizeOfEachArgOnStack();
+        unsigned argSize = SparcV9FrameInfo::SizeOfEachArgOnStack;
         mvec.push_back(BuildMI(V9::ADDi, 3).addReg(vaNextI->getOperand(0)).
                        addSImm(argSize).addRegDef(vaNextI));
         break;