This is an archive of the discontinued LLVM Phabricator instance.

Differential D19358

[PowerPC] [SSP] Fix stack guard load for 32-bit.
ClosedPublic

Authored by • koriakin on Apr 21 2016, 4:12 AM.

Details

Reviewers
echristo
timshen
hfinkel
Commits
rG48d72342ffd5: [PowerPC] [SSP] Fix stack guard load for 32-bit.
rL267017: [PowerPC] [SSP] Fix stack guard load for 32-bit.
Summary

r266809 incorrectly used LD to load the stack guard, it should be LWZ.

Diff Detail

Repository
rL LLVM

Event Timeline

• koriakin updated this revision to Diff 54483.Apr 21 2016, 4:12 AM
• koriakin retitled this revision from to [PowerPC] [SSP] Fix stack guard load for 32-bit..
• koriakin updated this object.
• koriakin added reviewers: hfinkel, timshen, echristo.
• koriakin set the repository for this revision to rL LLVM.
• koriakin added a subscriber: llvm-commits.
Herald added a subscriber: mehdi_amini. · View Herald TranscriptApr 21 2016, 4:12 AM
timshen accepted this revision.Apr 21 2016, 10:04 AM
timshen edited edge metadata.

Sorry, my bad. Thanks!

This revision is now accepted and ready to land.Apr 21 2016, 10:04 AM
Closed by commit rL267017: [PowerPC] [SSP] Fix stack guard load for 32-bit. (authored by • koriakin). · Explain WhyApr 21 2016, 10:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Target/
PowerPC/
2 lines
test/
CodeGen/
PowerPC/
2 lines

Diff 54535

llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.cpp

Show First 20 Lines • Show All 1,858 Lines • ▼ Show 20 Lines
bool PPCInstrInfo::expandPostRAPseudo(MachineBasicBlock::iterator MI) const { bool PPCInstrInfo::expandPostRAPseudo(MachineBasicBlock::iterator MI) const {
switch (MI->getOpcode()) { switch (MI->getOpcode()) {
case TargetOpcode::LOAD_STACK_GUARD: { case TargetOpcode::LOAD_STACK_GUARD: {
assert(Subtarget.isTargetLinux() && assert(Subtarget.isTargetLinux() &&
"Only Linux target is expected to contain LOAD_STACK_GUARD"); "Only Linux target is expected to contain LOAD_STACK_GUARD");
const int64_t Offset = Subtarget.isPPC64() ? -0x7010 : -0x7008; const int64_t Offset = Subtarget.isPPC64() ? -0x7010 : -0x7008;
const unsigned Reg = Subtarget.isPPC64() ? PPC::X13 : PPC::R2; const unsigned Reg = Subtarget.isPPC64() ? PPC::X13 : PPC::R2;
MI->setDesc(get(PPC::LD)); MI->setDesc(get(Subtarget.isPPC64() ? PPC::LD : PPC::LWZ));
MachineInstrBuilder(*MI->getParent()->getParent(), MI) MachineInstrBuilder(*MI->getParent()->getParent(), MI)
.addImm(Offset) .addImm(Offset)
.addReg(Reg); .addReg(Reg);
return true; return true;
} }
} }
return false; return false;
} }

llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll

; RUN: llc -mtriple=powerpc-apple-darwin8 < %s | FileCheck -check-prefix=DARWIN32 %s ; RUN: llc -mtriple=powerpc-apple-darwin8 < %s | FileCheck -check-prefix=DARWIN32 %s
; RUN: llc -mtriple=powerpc64-apple-darwin < %s | FileCheck -check-prefix=DARWIN64 %s ; RUN: llc -mtriple=powerpc64-apple-darwin < %s | FileCheck -check-prefix=DARWIN64 %s
; RUN: llc -mtriple=ppc32-unknown-linux < %s | FileCheck -check-prefix=LINUX32 %s ; RUN: llc -mtriple=ppc32-unknown-linux < %s | FileCheck -check-prefix=LINUX32 %s
; RUN: llc -mtriple=powerpc64le-unknown-linux < %s | FileCheck -check-prefix=LINUX64 %s ; RUN: llc -mtriple=powerpc64le-unknown-linux < %s | FileCheck -check-prefix=LINUX64 %s
; DARWIN32: __stack_chk_guard ; DARWIN32: __stack_chk_guard
; DARWIN64: __stack_chk_guard ; DARWIN64: __stack_chk_guard
; LINUX32: ld {{[0-9]+}}, -28680(2) ; LINUX32: lwz {{[0-9]+}}, -28680(2)
; LINUX64: ld {{[0-9]+}}, -28688(13) ; LINUX64: ld {{[0-9]+}}, -28688(13)
; DARWIN32: __stack_chk_fail ; DARWIN32: __stack_chk_fail
; DARWIN64: __stack_chk_fail ; DARWIN64: __stack_chk_fail
; LINUX32: __stack_chk_fail ; LINUX32: __stack_chk_fail
; LINUX64: __stack_chk_fail ; LINUX64: __stack_chk_fail
@"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00" ; <[11 x i8]*> [#uses=1] @"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00" ; <[11 x i8]*> [#uses=1]
Show All 21 Lines