This is an archive of the discontinued LLVM Phabricator instance.

Differential D42397

Fix retpoline PLT header size for i386.
ClosedPublic

Authored by ruiu on Jan 22 2018, 3:03 PM.

Details

Reviewers
chandlerc
Commits
rG7df017020f91: Merging r323288: --------------------------------------------------------------…
rG0e39460d5ee3: Merging r323288: --------------------------------------------------------------…
rG971f87a806de: Fix retpoline PLT header size for i386.
rL324070: Merging r323288:
rL324026: Merging r323288:
rLLD323288: Fix retpoline PLT header size for i386.
rL323288: Fix retpoline PLT header size for i386.
Summary

Fix retpoline PLT header size for i386.

Diff Detail

Repository
rL LLVM

Event Timeline

ruiu created this revision.Jan 22 2018, 3:03 PM
Herald added a subscriber: emaste. · View Herald TranscriptJan 22 2018, 3:03 PM
Harbormaster completed remote builds in B14102: Diff 130969.Jan 22 2018, 3:05 PM
chandlerc accepted this revision.Jan 22 2018, 7:15 PM

LGTM!

This revision is now accepted and ready to land.Jan 22 2018, 7:15 PM
Closed by commit rL323288: Fix retpoline PLT header size for i386. (authored by ruiu). · Explain WhyJan 23 2018, 4:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
Arch/
2 lines
test/
ELF/
68 lines

Diff 131169

lld/trunk/ELF/Arch/X86.cpp

Show First 20 Lines • Show All 469 Lines • ▼ Show 20 Linesvoid RetpolinePic::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
write32le(Buf + 3, GotPltEntryAddr - Ebx); write32le(Buf + 3, GotPltEntryAddr - Ebx);
write32le(Buf + 8, -Index * PltEntrySize - PltHeaderSize - 12 + 32); write32le(Buf + 8, -Index * PltEntrySize - PltHeaderSize - 12 + 32);
write32le(Buf + 13, -Index * PltEntrySize - PltHeaderSize - 17 + 18); write32le(Buf + 13, -Index * PltEntrySize - PltHeaderSize - 17 + 18);
write32le(Buf + 18, RelOff); write32le(Buf + 18, RelOff);
write32le(Buf + 23, -Index * PltEntrySize - PltHeaderSize - 27); write32le(Buf + 23, -Index * PltEntrySize - PltHeaderSize - 27);
} }
RetpolineNoPic::RetpolineNoPic() { RetpolineNoPic::RetpolineNoPic() {
PltHeaderSize = 64; PltHeaderSize = 48;
PltEntrySize = 32; PltEntrySize = 32;
} }
void RetpolineNoPic::writeGotPlt(uint8_t *Buf, const Symbol &S) const { void RetpolineNoPic::writeGotPlt(uint8_t *Buf, const Symbol &S) const {
write32le(Buf, S.getPltVA() + 16); write32le(Buf, S.getPltVA() + 16);
} }
void RetpolineNoPic::writePltHeader(uint8_t *Buf) const { void RetpolineNoPic::writePltHeader(uint8_t *Buf) const {
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

lld/trunk/test/ELF/i386-retpoline-nopic.s

Show All 24 Lines
// CHECK-NEXT: 1102f: cc int3 // CHECK-NEXT: 1102f: cc int3
// CHECK-NEXT: 11030: 89 0c 24 movl %ecx, (%esp) // CHECK-NEXT: 11030: 89 0c 24 movl %ecx, (%esp)
// CHECK-NEXT: 11033: 8b 4c 24 04 movl 4(%esp), %ecx // CHECK-NEXT: 11033: 8b 4c 24 04 movl 4(%esp), %ecx
// CHECK-NEXT: 11037: 89 44 24 04 movl %eax, 4(%esp) // CHECK-NEXT: 11037: 89 44 24 04 movl %eax, 4(%esp)
// CHECK-NEXT: 1103b: 89 c8 movl %ecx, %eax // CHECK-NEXT: 1103b: 89 c8 movl %ecx, %eax
// CHECK-NEXT: 1103d: 59 popl %ecx // CHECK-NEXT: 1103d: 59 popl %ecx
// CHECK-NEXT: 1103e: c3 retl // CHECK-NEXT: 1103e: c3 retl
// CHECK-NEXT: 1103f: cc int3 // CHECK-NEXT: 1103f: cc int3
// CHECK-NEXT: 11040: cc int3 // CHECK-NEXT: 11040: 50 pushl %eax
// CHECK-NEXT: 11041: cc int3 // CHECK-NEXT: 11041: a1 0c 20 01 00 movl 73740, %eax
// CHECK-NEXT: 11042: cc int3 // CHECK-NEXT: 11046: e8 e5 ff ff ff calll -27 <.plt+0x20>
// CHECK-NEXT: 11043: cc int3 // CHECK-NEXT: 1104b: e9 d1 ff ff ff jmp -47 <.plt+0x11>
// CHECK-NEXT: 11044: cc int3 // CHECK-NEXT: 11050: 68 00 00 00 00 pushl $0
// CHECK-NEXT: 11045: cc int3 // CHECK-NEXT: 11055: e9 b6 ff ff ff jmp -74 <.plt>
// CHECK-NEXT: 11046: cc int3 // CHECK-NEXT: 1105a: cc int3
// CHECK-NEXT: 11047: cc int3 // CHECK-NEXT: 1105b: cc int3
// CHECK-NEXT: 11048: cc int3 // CHECK-NEXT: 1105c: cc int3
// CHECK-NEXT: 11049: cc int3 // CHECK-NEXT: 1105d: cc int3
// CHECK-NEXT: 1104a: cc int3 // CHECK-NEXT: 1105e: cc int3
// CHECK-NEXT: 1104b: cc int3 // CHECK-NEXT: 1105f: cc int3
// CHECK-NEXT: 1104c: cc int3 // CHECK-NEXT: 11060: 50 pushl %eax
// CHECK-NEXT: 1104d: cc int3 // CHECK-NEXT: 11061: a1 10 20 01 00 movl 73744, %eax
// CHECK-NEXT: 1104e: cc int3 // CHECK-NEXT: 11066: e8 c5 ff ff ff calll -59 <.plt+0x20>
// CHECK-NEXT: 1104f: cc int3 // CHECK-NEXT: 1106b: e9 b1 ff ff ff jmp -79 <.plt+0x11>
// CHECK-NEXT: 11050: 50 pushl %eax // CHECK-NEXT: 11070: 68 08 00 00 00 pushl $8
// CHECK-NEXT: 11051: a1 0c 20 01 00 movl 73740, %eax // CHECK-NEXT: 11075: e9 96 ff ff ff jmp -106 <.plt>
// CHECK-NEXT: 11056: e8 d5 ff ff ff calll -43 <.plt+0x20> // CHECK-NEXT: 1107a: cc int3
// CHECK-NEXT: 1105b: e9 c1 ff ff ff jmp -63 <.plt+0x11> // CHECK-NEXT: 1107b: cc int3
// CHECK-NEXT: 11060: 68 00 00 00 00 pushl $0 // CHECK-NEXT: 1107c: cc int3
// CHECK-NEXT: 11065: e9 a6 ff ff ff jmp -90 <.plt> // CHECK-NEXT: 1107d: cc int3
// CHECK-NEXT: 1106a: cc int3 // CHECK-NEXT: 1107e: cc int3
// CHECK-NEXT: 1106b: cc int3 // CHECK-NEXT: 1107f: cc int3
// CHECK-NEXT: 1106c: cc int3
// CHECK-NEXT: 1106d: cc int3
// CHECK-NEXT: 1106e: cc int3
// CHECK-NEXT: 1106f: cc int3
// CHECK-NEXT: 11070: 50 pushl %eax
// CHECK-NEXT: 11071: a1 10 20 01 00 movl 73744, %eax
// CHECK-NEXT: 11076: e8 b5 ff ff ff calll -75 <.plt+0x20>
// CHECK-NEXT: 1107b: e9 a1 ff ff ff jmp -95 <.plt+0x11>
// CHECK-NEXT: 11080: 68 08 00 00 00 pushl $8
// CHECK-NEXT: 11085: e9 86 ff ff ff jmp -122 <.plt>
// CHECK-NEXT: 1108a: cc int3
// CHECK-NEXT: 1108b: cc int3
// CHECK-NEXT: 1108c: cc int3
// CHECK-NEXT: 1108d: cc int3
// CHECK-NEXT: 1108e: cc int3
// CHECK-NEXT: 1108f: cc int3
// CHECK: Contents of section .got.plt: // CHECK: Contents of section .got.plt:
// CHECK-NEXT: 00300100 00000000 00000000 60100100 // CHECK-NEXT: 00300100 00000000 00000000 50100100
// CHECK-NEXT: 80100100 // CHECK-NEXT: 70100100
.global _start .global _start
_start: _start:
jmp bar@PLT jmp bar@PLT
jmp zed@PLT jmp zed@PLT