commit 3d2148f5ace1292dcc12c37e9d0e13dee5220a5a
author Wesley Peck <peckw@wesleypeck.com> Wed Jan 05 17:34:20 2011 +0000
committer Wesley Peck <peckw@wesleypeck.com> Wed Jan 05 17:34:20 2011 +0000
tree 8014aa6af6bbb93647385952bf1abe140dd0ea75
parent 31ff1333e0651192212cee6e090df2ff57d19b53

Commit 122778 broke DWARF debug output when using the MBlaze backend. Fixed by overriding TargetFrameInfo::getFrameIndexOffset to take into account the new frame index information.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122889 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/MBlaze/MBlazeFrameInfo.cpp

diff --git a/lib/Target/MBlaze/MBlazeFrameInfo.cpp b/lib/Target/MBlaze/MBlazeFrameInfo.cpp
index 1e4f337..ab888c9 100644
--- a/lib/Target/MBlaze/MBlazeFrameInfo.cpp
+++ b/lib/Target/MBlaze/MBlazeFrameInfo.cpp
@@ -43,6 +43,7 @@
 static void replaceFrameIndexes(MachineFunction &MF, 
                                 SmallVector<std::pair<int,int64_t>, 16> &FR) {
   MachineFrameInfo *MFI = MF.getFrameInfo();
+  MBlazeFunctionInfo *MBlazeFI = MF.getInfo<MBlazeFunctionInfo>();
   const SmallVector<std::pair<int,int64_t>, 16>::iterator FRB = FR.begin();
   const SmallVector<std::pair<int,int64_t>, 16>::iterator FRE = FR.end();
 
@@ -50,6 +51,7 @@
   for (; FRI != FRE; ++FRI) {
     MFI->RemoveStackObject(FRI->first);
     int NFI = MFI->CreateFixedObject(4, FRI->second, true);
+    MBlazeFI->recordReplacement(FRI->first, NFI);
 
     for (MachineFunction::iterator MB=MF.begin(), ME=MF.end(); MB!=ME; ++MB) {
       MachineBasicBlock::iterator MBB = MB->begin();
@@ -321,6 +323,14 @@
   DEBUG(dbgs() << "Aligned Frame Size: " << FrameSize << "\n" );
 }
 
+int MBlazeFrameInfo::getFrameIndexOffset(const MachineFunction &MF, int FI) 
+  const {
+  const MBlazeFunctionInfo *MBlazeFI = MF.getInfo<MBlazeFunctionInfo>();
+  if (MBlazeFI->hasReplacement(FI))
+    FI = MBlazeFI->getReplacement(FI);
+  return TargetFrameInfo::getFrameIndexOffset(MF,FI);
+}
+
 // hasFP - Return true if the specified function should have a dedicated frame
 // pointer register.  This is true if the function has variable sized allocas or
 // if frame pointer elimination is disabled.