projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r257648:
[oota-llvm.git]
/
lib
/
Target
/
AMDGPU
/
AMDGPUFrameLowering.cpp
diff --git
a/lib/Target/AMDGPU/AMDGPUFrameLowering.cpp
b/lib/Target/AMDGPU/AMDGPUFrameLowering.cpp
index 8175786fb9b13b10b2119a3722f69e88d0aa038b..4d84d281d998f05de22543f2e1000a56249ee8ee 100644
(file)
--- a/
lib/Target/AMDGPU/AMDGPUFrameLowering.cpp
+++ b/
lib/Target/AMDGPU/AMDGPUFrameLowering.cpp
@@
-71,9
+71,15
@@
unsigned AMDGPUFrameLowering::getStackWidth(const MachineFunction &MF) const {
}
/// \returns The number of registers allocated for \p FI.
}
/// \returns The number of registers allocated for \p FI.
-int AMDGPUFrameLowering::getFrameIndexOffset(const MachineFunction &MF,
- int FI) const {
+int AMDGPUFrameLowering::getFrameIndexReference(const MachineFunction &MF,
+ int FI,
+ unsigned &FrameReg) const {
const MachineFrameInfo *MFI = MF.getFrameInfo();
const MachineFrameInfo *MFI = MF.getFrameInfo();
+ const TargetRegisterInfo *RI = MF.getSubtarget().getRegisterInfo();
+
+ // Fill in FrameReg output argument.
+ FrameReg = RI->getFrameRegister(MF);
+
// Start the offset at 2 so we don't overwrite work group information.
// XXX: We should only do this when the shader actually uses this
// information.
// Start the offset at 2 so we don't overwrite work group information.
// XXX: We should only do this when the shader actually uses this
// information.