[llvm-commits] CVS: llvm/lib/Target/MRegisterInfo.cpp

[Jim Laskey]

Changes in directory llvm/lib/Target:

MRegisterInfo.cpp updated: 1.15 -> 1.16
---
Log message:

Get darwin intel debugging up and running.


---
Diffs of the changes:  (+6 -1)

 MRegisterInfo.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/MRegisterInfo.cpp
diff -u llvm/lib/Target/MRegisterInfo.cpp:1.15 llvm/lib/Target/MRegisterInfo.cpp:1.16
--- llvm/lib/Target/MRegisterInfo.cpp:1.15	Mon Apr 10 18:09:19 2006
+++ llvm/lib/Target/MRegisterInfo.cpp	Thu Aug  3 12:27:09 2006
@@ -11,7 +11,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/MRegisterInfo.h"
+#include "llvm/Target/TargetFrameInfo.h"
 
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
@@ -50,9 +52,12 @@
 /// variables and then call MRegisterInfo::getLocation for the default action.
 void MRegisterInfo::getLocation(MachineFunction &MF, unsigned Index,
                         MachineLocation &ML) const {
+  const TargetFrameInfo &TFI = *MF.getTarget().getFrameInfo();
   MachineFrameInfo *MFI = MF.getFrameInfo();
   ML.set(getFrameRegister(MF),
-         MFI->getObjectOffset(Index) + MFI->getStackSize());
+         MFI->getObjectOffset(Index) +
+         MFI->getStackSize() -
+         TFI.getOffsetOfLocalArea());
 }
 
 /// getInitialFrameState - Returns a list of machine moves that are assumed