This is an archive of the discontinued LLVM Phabricator instance.

Differential D48313

[XRay] Fix error message. NFC
ClosedPublic

Authored by MaskRay on Jun 19 2018, 12:15 AM.

Details

Reviewers
dberris
Commits
rG6fa3bf95886f: [XRay] Fix error message. NFC
rCRT335055: [XRay] Fix error message. NFC
rL335055: [XRay] Fix error message. NFC

Diff Detail

Repository
rL LLVM

Event Timeline

MaskRay created this revision.Jun 19 2018, 12:15 AM
Herald added subscribers: Restricted Project, llvm-commits, delcypher. · View Herald TranscriptJun 19 2018, 12:15 AM
dberris accepted this revision.Jun 19 2018, 12:15 AM

LGTM

This revision is now accepted and ready to land.Jun 19 2018, 12:15 AM
Closed by commit rL335055: [XRay] Fix error message. NFC (authored by MaskRay). · Explain WhyJun 19 2018, 8:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
trunk/
lib/
xray/
4 lines

Diff 151927

compiler-rt/trunk/lib/xray/xray_x86_64.cc

Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines
bool patchFunctionTailExit(const bool Enable, const uint32_t FuncId, bool patchFunctionTailExit(const bool Enable, const uint32_t FuncId,
const XRaySledEntry &Sled) XRAY_NEVER_INSTRUMENT { const XRaySledEntry &Sled) XRAY_NEVER_INSTRUMENT {
// Here we do the dance of replacing the tail call sled with a similar // Here we do the dance of replacing the tail call sled with a similar
// sequence as the entry sled, but calls the tail exit sled instead. // sequence as the entry sled, but calls the tail exit sled instead.
int64_t TrampolineOffset = int64_t TrampolineOffset =
reinterpret_cast<int64_t>(__xray_FunctionTailExit) - reinterpret_cast<int64_t>(__xray_FunctionTailExit) -
(static_cast<int64_t>(Sled.Address) + 11); (static_cast<int64_t>(Sled.Address) + 11);
if (TrampolineOffset < MinOffset || TrampolineOffset > MaxOffset) { if (TrampolineOffset < MinOffset || TrampolineOffset > MaxOffset) {
Report("XRay Exit trampoline (%p) too far from sled (%p)\n", Report("XRay Tail Exit trampoline (%p) too far from sled (%p)\n",
__xray_FunctionExit, reinterpret_cast<void *>(Sled.Address)); __xray_FunctionTailExit, reinterpret_cast<void *>(Sled.Address));
return false; return false;
} }
if (Enable) { if (Enable) {
*reinterpret_cast<uint32_t *>(Sled.Address + 2) = FuncId; *reinterpret_cast<uint32_t *>(Sled.Address + 2) = FuncId;
*reinterpret_cast<uint8_t *>(Sled.Address + 6) = CallOpCode; *reinterpret_cast<uint8_t *>(Sled.Address + 6) = CallOpCode;
*reinterpret_cast<uint32_t *>(Sled.Address + 7) = TrampolineOffset; *reinterpret_cast<uint32_t *>(Sled.Address + 7) = TrampolineOffset;
std::atomic_store_explicit( std::atomic_store_explicit(
reinterpret_cast<std::atomic<uint16_t> *>(Sled.Address), MovR10Seq, reinterpret_cast<std::atomic<uint16_t> *>(Sled.Address), MovR10Seq,
▲ Show 20 Lines • Show All 112 Lines • Show Last 20 Lines